summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/clock-imx25.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2011-06-30 09:24:26 +0800
committerShawn Guo <shawn.guo@linaro.org>2011-07-27 09:31:27 +0800
commit57ed3314e0bfa90ea63c63b8d3038814e9d98a20 (patch)
treece82f977d851c5cb2b0d6c28da0ef7270f3be848 /arch/arm/mach-imx/clock-imx25.c
parent842afc02cf04f0474392b4c5efd808996a804fa6 (diff)
mmc: sdhci-esdhc-imx: get rid of the uses of cpu_is_mx()
The patch removes all the uses of cpu_is_mx(). Instead, it utilizes platform_device_id to distinguish the esdhc differences among SoCs. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Cc: Wolfram Sang <w.sang@pengutronix.de> Cc: Chris Ball <cjb@laptop.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch/arm/mach-imx/clock-imx25.c')
-rw-r--r--arch/arm/mach-imx/clock-imx25.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/clock-imx25.c b/arch/arm/mach-imx/clock-imx25.c
index 13d61f34bd3..991ccc94d6f 100644
--- a/arch/arm/mach-imx/clock-imx25.c
+++ b/arch/arm/mach-imx/clock-imx25.c
@@ -302,8 +302,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("imx2-wdt.0", NULL, wdt_clk)
_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
- _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk)
- _REGISTER_CLOCK("sdhci-esdhc-imx.1", NULL, esdhc2_clk)
+ _REGISTER_CLOCK("sdhci-esdhc-imx25.0", NULL, esdhc1_clk)
+ _REGISTER_CLOCK("sdhci-esdhc-imx25.1", NULL, esdhc2_clk)
_REGISTER_CLOCK("mx2-camera.0", NULL, csi_clk)
_REGISTER_CLOCK(NULL, "audmux", audmux_clk)
_REGISTER_CLOCK("flexcan.0", NULL, can1_clk)