diff options
| author | Shawn Guo <shawn.guo@freescale.com> | 2011-01-06 15:13:14 +0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-11 13:59:39 +0100 |
| commit | b2878fa41be8b57fc58f8b53eb0d0183511ef548 (patch) | |
| tree | 0530d4bc44b71442a3b4ca1cc1fa636933b52224 /arch/arm/mach-mxs | |
| parent | 92cb33f188e192c3803d6d430ea61151da3e026e (diff) | |
| download | blackbird-obmc-linux-b2878fa41be8b57fc58f8b53eb0d0183511ef548.tar.gz blackbird-obmc-linux-b2878fa41be8b57fc58f8b53eb0d0183511ef548.zip | |
ARM: mx28: update clock and device name for dual fec support
Change device name from "fec" to "imx28-fec", so that fec driver
can distinguish mx28.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/clock-mx28.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/devices/platform-fec.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index 74e2103c6011..fbb8d7424d0c 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -603,6 +603,8 @@ _DEFINE_CLOCK(fec_clk, ENET, DISABLE, &hbus_clk); static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxs-duart.0", NULL, uart_clk) + _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) _REGISTER_CLOCK("fec.0", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk) diff --git a/arch/arm/mach-mxs/devices/platform-fec.c b/arch/arm/mach-mxs/devices/platform-fec.c index c08168cf3dec..c42dff72b46c 100644 --- a/arch/arm/mach-mxs/devices/platform-fec.c +++ b/arch/arm/mach-mxs/devices/platform-fec.c @@ -45,6 +45,6 @@ struct platform_device *__init mxs_add_fec( }, }; - return mxs_add_platform_device("fec", data->id, + return mxs_add_platform_device("imx28-fec", data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); } |
