[PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support
From: Uwe Kleine-König <hidden>
Date: 2011-01-13 15:06:22
Also in:
netdev
Hi Shawn, On Thu, Jan 06, 2011 at 03:13:14PM +0800, Shawn Guo wrote:
quoted hunk ↗ jump to hunk
Change device name from "fec" to "imx28-fec", so that fec driver can distinguish mx28. Signed-off-by: Shawn Guo <redacted> --- Changes for v4: - Use "imx28-fec" as fec device name Changes for v3: - Change device name to "enet-mac" arch/arm/mach-mxs/clock-mx28.c | 3 ++- arch/arm/mach-mxs/devices/platform-fec.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index f20b254..e2a8b0f 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c@@ -606,7 +606,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("duart", "apb_pclk", xbus_clk) /* for amba-pl011 driver */ _REGISTER_CLOCK("duart", NULL, uart_clk) - _REGISTER_CLOCK("fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.1", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk) _REGISTER_CLOCK(NULL, "hclk", hbus_clk)diff --git a/arch/arm/mach-mxs/devices/platform-fec.c b/arch/arm/mach-mxs/devices/platform-fec.c index c08168c..c42dff7 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,
IMHO "imx28-fec" shouldn't be hard coded here but come from data. See imx-spi device registration for an example. Uwe
res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); } -- 1.7.1
-- Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |