summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clk-imx1.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-09-16 13:59:53 +0200
committerShawn Guo <shawn.guo@linaro.org>2012-10-15 04:05:42 +0200
commite69dc9a91eeb0387e08d8e1d0e576c88b28902fc (patch)
tree4b4ef12b66ae33e79b77528f7e9568a62743f43a /arch/arm/mach-imx/clk-imx1.c
parentmmc: mxcmmc: remove cpu_is_xxx by using platform_device_id (diff)
downloadlinux-e69dc9a91eeb0387e08d8e1d0e576c88b28902fc.tar.xz
linux-e69dc9a91eeb0387e08d8e1d0e576c88b28902fc.zip
video: imxfb: 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: Florian Tobias Schandinat <FlorianSchandinat@gmx.de> Cc: linux-fbdev@vger.kernel.org
Diffstat (limited to 'arch/arm/mach-imx/clk-imx1.c')
-rw-r--r--arch/arm/mach-imx/clk-imx1.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/clk-imx1.c b/arch/arm/mach-imx/clk-imx1.c
index 49a74440bc48..796d8b86e8b6 100644
--- a/arch/arm/mach-imx/clk-imx1.c
+++ b/arch/arm/mach-imx/clk-imx1.c
@@ -102,9 +102,9 @@ int __init mx1_clocks_init(unsigned long fref)
clk_register_clkdev(clk[per2], "per", "imx1-cspi.1");
clk_register_clkdev(clk[dummy], "ipg", "imx1-cspi.1");
clk_register_clkdev(clk[per2], NULL, "imx-mmc.0");
- clk_register_clkdev(clk[per2], "per", "imx-fb.0");
- clk_register_clkdev(clk[dummy], "ipg", "imx-fb.0");
- clk_register_clkdev(clk[dummy], "ahb", "imx-fb.0");
+ clk_register_clkdev(clk[per2], "per", "imx1-fb.0");
+ clk_register_clkdev(clk[dummy], "ipg", "imx1-fb.0");
+ clk_register_clkdev(clk[dummy], "ahb", "imx1-fb.0");
clk_register_clkdev(clk[hclk], "mshc", NULL);
clk_register_clkdev(clk[per3], "ssi", NULL);
clk_register_clkdev(clk[clk32], NULL, "imx1-rtc.0");