summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clock-imx35.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-07-01 18:11:22 +0800
committerShawn Guo <shawn.guo@linaro.org>2011-07-27 09:30:50 +0800
commit0ca1e290b7c517300bf6cc4f14ebcedb5dfea5cc (patch)
treed66e2af8bd869ed6be022419354d2e6def93adc5 /arch/arm/mach-imx/clock-imx35.c
parent22698aa252e5e10f5b6d171bf82669deeab3bee1 (diff)
downloadlinux-stable-0ca1e290b7c517300bf6cc4f14ebcedb5dfea5cc.tar.gz
linux-stable-0ca1e290b7c517300bf6cc4f14ebcedb5dfea5cc.tar.bz2
linux-stable-0ca1e290b7c517300bf6cc4f14ebcedb5dfea5cc.zip
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-imx/clock-imx35.c')
-rw-r--r--arch/arm/mach-imx/clock-imx35.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clock-imx35.c b/arch/arm/mach-imx/clock-imx35.c
index b44cb065e629..7718101099b7 100644
--- a/arch/arm/mach-imx/clock-imx35.c
+++ b/arch/arm/mach-imx/clock-imx35.c
@@ -461,7 +461,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk)
_REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk)
_REGISTER_CLOCK("sdhci-esdhc-imx.2", NULL, esdhc3_clk)
- _REGISTER_CLOCK("fec.0", NULL, fec_clk)
+ /* i.mx35 has the i.mx27 type fec */
+ _REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)
_REGISTER_CLOCK(NULL, "gpio", gpio1_clk)
_REGISTER_CLOCK(NULL, "gpio", gpio2_clk)
_REGISTER_CLOCK(NULL, "gpio", gpio3_clk)