From: Wolfram Sang Date: Mon, 11 Oct 2010 13:04:53 +0000 (+0200) Subject: mx25/clocks: match esdhc-clocks to platform device X-Git-Tag: v2.6.37-rc1~184^2~5^2~5^2~4 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=0d0e9cbf815a78d62889554826f7d06b323c2d06 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 Cc: Eric Bénard Signed-off-by: Sascha Hauer --- 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)