From 8e350ee745db8b97e52e7d9e4f36f7819c056297 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Thu, 6 Jan 2011 15:13:14 +0800 Subject: [PATCH] --- yaml --- r: 231363 b: refs/heads/master c: b2878fa41be8b57fc58f8b53eb0d0183511ef548 h: refs/heads/master i: 231361: f47f0c97038ac0dc522bcdce9b418c038766b252 231359: 7e5f484d632f9482f643f70e77e9a364a1720333 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mxs/clock-mx28.c | 2 ++ trunk/arch/arm/mach-mxs/devices/platform-fec.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 43c97da735fd..f654fd6c679a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92cb33f188e192c3803d6d430ea61151da3e026e +refs/heads/master: b2878fa41be8b57fc58f8b53eb0d0183511ef548 diff --git a/trunk/arch/arm/mach-mxs/clock-mx28.c b/trunk/arch/arm/mach-mxs/clock-mx28.c index 74e2103c6011..fbb8d7424d0c 100644 --- a/trunk/arch/arm/mach-mxs/clock-mx28.c +++ b/trunk/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/trunk/arch/arm/mach-mxs/devices/platform-fec.c b/trunk/arch/arm/mach-mxs/devices/platform-fec.c index c08168cf3dec..c42dff72b46c 100644 --- a/trunk/arch/arm/mach-mxs/devices/platform-fec.c +++ b/trunk/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)); }