projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
886ab3d
)
mx25/clocks: match esdhc-clocks to platform device
author
Wolfram Sang
<w.sang@pengutronix.de>
Mon, 11 Oct 2010 13:04:53 +0000
(15:04 +0200)
committer
Sascha Hauer
<s.hauer@pengutronix.de>
Mon, 11 Oct 2010 13:31:41 +0000
(15:31 +0200)
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>
arch/arm/mach-mx25/clock.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/arm/mach-mx25/clock.c
b/arch/arm/mach-mx25/clock.c
index 25f37a9a0422ff35977dc1c6773a42488a7f9e9c..2179713873c2adffc872cdfd9e115e0a0b15d9b0 100644
(file)
--- 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)