summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx25
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-10-11 15:04:53 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2010-10-11 15:31:41 +0200
commit0d0e9cbf815a78d62889554826f7d06b323c2d06 (patch)
tree7532fd3a89ad18e662636737beb53f83e210c8da /arch/arm/mach-mx25
parentmxc/gpio: make _set_value work with values != 0/1 (diff)
downloadlinux-0d0e9cbf815a78d62889554826f7d06b323c2d06.tar.xz
linux-0d0e9cbf815a78d62889554826f7d06b323c2d06.zip
mx25/clocks: match esdhc-clocks to platform device
So the correct clock will be taken for each of the two independent controllers. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Cc: Eric BĂ©nard <eric@eukrea.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx25')
-rw-r--r--arch/arm/mach-mx25/clock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c
index 25f37a9a0422..2179713873c2 100644
--- a/arch/arm/mach-mx25/clock.c
+++ b/arch/arm/mach-mx25/clock.c
@@ -299,8 +299,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("imx-wdt.0", NULL, wdt_clk)
_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)
_REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk)
- _REGISTER_CLOCK(NULL, "sdhc", esdhc1_clk)
- _REGISTER_CLOCK(NULL, "sdhc", esdhc2_clk)
+ _REGISTER_CLOCK("sdhci-esdhc-imx.0", NULL, esdhc1_clk)
+ _REGISTER_CLOCK("sdhci-esdhc-imx.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)