aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx5
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-07-01 06:11:22 -0400
committerShawn Guo <shawn.guo@linaro.org>2011-07-26 21:30:50 -0400
commit0ca1e290b7c517300bf6cc4f14ebcedb5dfea5cc (patch)
treed66e2af8bd869ed6be022419354d2e6def93adc5 /arch/arm/mach-mx5
parent22698aa252e5e10f5b6d171bf82669deeab3bee1 (diff)
net/fec: gasket needs to be enabled for some i.mx
On the recent i.mx (mx25/50/53), there is a gasket inside fec controller which needs to be enabled no matter phy works in MII or RMII mode. The current code enables the gasket only when phy interface is RMII. It's broken when the driver works with a MII phy. The patch uses platform_device_id to distinguish the SoCs that have the gasket and enables it on these SoCs for both MII and RMII mode. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Reported-by: Troy Kisky <troy.kisky@boundarydevices.com> Cc: David S. Miller <davem@davemloft.net> Cc: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-mx5')
-rw-r--r--arch/arm/mach-mx5/clock-mx51-mx53.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c
index b8119e8fb519..76e450ba8589 100644
--- a/arch/arm/mach-mx5/clock-mx51-mx53.c
+++ b/arch/arm/mach-mx5/clock-mx51-mx53.c
@@ -1427,7 +1427,8 @@ static struct clk_lookup mx51_lookups[] = {
1427 _REGISTER_CLOCK("imx21-uart.1", NULL, uart2_clk) 1427 _REGISTER_CLOCK("imx21-uart.1", NULL, uart2_clk)
1428 _REGISTER_CLOCK("imx21-uart.2", NULL, uart3_clk) 1428 _REGISTER_CLOCK("imx21-uart.2", NULL, uart3_clk)
1429 _REGISTER_CLOCK(NULL, "gpt", gpt_clk) 1429 _REGISTER_CLOCK(NULL, "gpt", gpt_clk)
1430 _REGISTER_CLOCK("fec.0", NULL, fec_clk) 1430 /* i.mx51 has the i.mx27 type fec */
1431 _REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)
1431 _REGISTER_CLOCK("mxc_pwm.0", "pwm", pwm1_clk) 1432 _REGISTER_CLOCK("mxc_pwm.0", "pwm", pwm1_clk)
1432 _REGISTER_CLOCK("mxc_pwm.1", "pwm", pwm2_clk) 1433 _REGISTER_CLOCK("mxc_pwm.1", "pwm", pwm2_clk)
1433 _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) 1434 _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk)
@@ -1478,7 +1479,8 @@ static struct clk_lookup mx53_lookups[] = {
1478 _REGISTER_CLOCK("imx21-uart.3", NULL, uart4_clk) 1479 _REGISTER_CLOCK("imx21-uart.3", NULL, uart4_clk)
1479 _REGISTER_CLOCK("imx21-uart.4", NULL, uart5_clk) 1480 _REGISTER_CLOCK("imx21-uart.4", NULL, uart5_clk)
1480 _REGISTER_CLOCK(NULL, "gpt", gpt_clk) 1481 _REGISTER_CLOCK(NULL, "gpt", gpt_clk)
1481 _REGISTER_CLOCK("fec.0", NULL, fec_clk) 1482 /* i.mx53 has the i.mx25 type fec */
1483 _REGISTER_CLOCK("imx25-fec.0", NULL, fec_clk)
1482 _REGISTER_CLOCK(NULL, "iim_clk", iim_clk) 1484 _REGISTER_CLOCK(NULL, "iim_clk", iim_clk)
1483 _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk) 1485 _REGISTER_CLOCK("imx-i2c.0", NULL, i2c1_clk)
1484 _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk) 1486 _REGISTER_CLOCK("imx-i2c.1", NULL, i2c2_clk)