summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clk-imx1.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-15 14:26:14 +0800
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 10:03:16 +0800
commitbb1d34a20d537e2f2342db8b5918512f05b0f852 (patch)
treef98a0ccfd5a959a4638715df601cdd9561765771 /arch/arm/mach-imx/clk-imx1.c
parent4d62435f0601ecec379fdc48749a10353fee8217 (diff)
downloadblackbird-op-linux-bb1d34a20d537e2f2342db8b5918512f05b0f852.tar.gz
blackbird-op-linux-bb1d34a20d537e2f2342db8b5918512f05b0f852.zip
rtc: mxc_rtc: remove cpu_is_xxx by using platform_device_id
It changes the driver to use platform_device_id rather than cpu_is_xxx to determine the controller type, and updates the platform code accordingly. As the result, mach/hardware.h inclusion gets removed from the driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: rtc-linux@googlegroups.com
Diffstat (limited to 'arch/arm/mach-imx/clk-imx1.c')
-rw-r--r--arch/arm/mach-imx/clk-imx1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c
index 198238859446..1cc7a735ed19 100644
--- a/arch/arm/mach-imx/clk-imx1.c
+++ b/arch/arm/mach-imx/clk-imx1.c
@@ -106,7 +106,7 @@ int __init mx1_clocks_init(unsigned long fref)
clk_register_clkdev(clk[dummy], "ahb", "imx-fb.0");
clk_register_clkdev(clk[hclk], "mshc", NULL);
clk_register_clkdev(clk[per3], "ssi", NULL);
- clk_register_clkdev(clk[clk32], NULL, "mxc_rtc.0");
+ clk_register_clkdev(clk[clk32], NULL, "imx1-rtc.0");
clk_register_clkdev(clk[clko], "clko", NULL);
mxc_timer_init(MX1_IO_ADDRESS(MX1_TIM1_BASE_ADDR), MX1_TIM1_INT);
OpenPOWER on IntegriCloud