diff options
| author | Jason Liu <r64343@freescale.com> | 2013-04-07 09:08:42 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2013-04-07 09:33:34 +0800 |
| commit | 49e57ecf2e9aae6a68a1751b8fa5bd58f0b5b851 (patch) | |
| tree | e6a9a0166215c7c0b27731723cccba3a1345a6ec | |
| parent | 790715dfbc95afe64521f9d7ef60ef85c4a33849 (diff) | |
ENGR00257658 Revert "ENGR00256893-2 MX6Q/DL-Fix Ethernet performance issue
This reverts commit 573bab0be2427d6664420eaf9d8e272dbe9d840f.
i.mx6dl/dq sabreauto/sabresd board will boot up failed
randomly with this patch-set, thus revert it. [Jason]
Signed-off-by: Jason Liu <r64343@freescale.com>
| -rwxr-xr-x | drivers/net/fec.c | 17 | ||||
| -rw-r--r-- | include/linux/fec.h | 3 |
2 files changed, 0 insertions, 20 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index fc65bdc96241..5f0e4e0e3a3e 100755 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -27,7 +27,6 @@ #include <linux/string.h> #include <linux/ptrace.h> #include <linux/errno.h> -#include <linux/gpio.h> #include <linux/ioport.h> #include <linux/slab.h> #include <linux/interrupt.h> @@ -1867,17 +1866,6 @@ fec_probe(struct platform_device *pdev) if (pdata) fep->phy_interface = pdata->phy; -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - gpio_request(pdata->gpio_irq, "gpio_enet_irq"); - gpio_direction_input(pdata->gpio_irq); - - irq = gpio_to_irq(pdata->gpio_irq); - ret = request_irq(irq, fec_enet_interrupt, - IRQF_TRIGGER_RISING, - pdev->name, ndev); - if (ret) - goto failed_irq; -#else /* This device has up to three irqs on some platforms */ for (i = 0; i < 3; i++) { irq = platform_get_irq(pdev, i); @@ -1892,7 +1880,6 @@ fec_probe(struct platform_device *pdev) goto failed_irq; } } -#endif fep->clk = clk_get(&pdev->dev, "fec_clk"); if (IS_ERR(fep->clk)) { @@ -1943,15 +1930,11 @@ failed_init: clk_disable(fep->clk); clk_put(fep->clk); failed_clk: -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - free_irq(irq, ndev); -#else for (i = 0; i < 3; i++) { irq = platform_get_irq(pdev, i); if (irq > 0) free_irq(irq, ndev); } -#endif failed_irq: iounmap(fep->hwp); failed_ioremap: diff --git a/include/linux/fec.h b/include/linux/fec.h index a9d659456eba..97a56d4add74 100644 --- a/include/linux/fec.h +++ b/include/linux/fec.h @@ -21,9 +21,6 @@ struct fec_platform_data { int (*power_hibernate) (struct phy_device *); phy_interface_t phy; unsigned char mac[ETH_ALEN]; -#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO - unsigned int gpio_irq; -#endif }; #endif |