aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2009-03-31 12:16:59 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2009-04-16 12:57:12 +0200
commit289a689b109dfd086c0459fb35b32a1d96bdb8ce (patch)
tree8a5b36db4e5542eb6fa18013ffb4395b79b3cb25 /arch/arm
parent3ee8da87ba6151ec91b2b8bbd27633bb248ea0d5 (diff)
downloadkernel_samsung_aries-289a689b109dfd086c0459fb35b32a1d96bdb8ce.zip
kernel_samsung_aries-289a689b109dfd086c0459fb35b32a1d96bdb8ce.tar.gz
kernel_samsung_aries-289a689b109dfd086c0459fb35b32a1d96bdb8ce.tar.bz2
imx21: fixes some clocknames
Signed-off-by: <hs4233@mail.mn-solutions.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-mx2/clock_imx21.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
index 2dee5c8..cbc5dbb 100644
--- a/arch/arm/mach-mx2/clock_imx21.c
+++ b/arch/arm/mach-mx2/clock_imx21.c
@@ -919,17 +919,17 @@ static struct clk_lookup lookups[] __initdata = {
_REGISTER_CLOCK(NULL, "cspi1", cspi_clk[0])
_REGISTER_CLOCK(NULL, "cspi2", cspi_clk[1])
_REGISTER_CLOCK(NULL, "cspi3", cspi_clk[2])
- _REGISTER_CLOCK(NULL, "lcdc", lcdc_clk[0])
+ _REGISTER_CLOCK("imx-fb.0", NULL, lcdc_clk[0])
_REGISTER_CLOCK(NULL, "csi", csi_clk[0])
_REGISTER_CLOCK(NULL, "usb", usb_clk[0])
_REGISTER_CLOCK(NULL, "ssi1", ssi_clk[0])
_REGISTER_CLOCK(NULL, "ssi2", ssi_clk[1])
- _REGISTER_CLOCK(NULL, "nfc", nfc_clk)
+ _REGISTER_CLOCK("mxc_nand.0", NULL, nfc_clk)
_REGISTER_CLOCK(NULL, "dma", dma_clk[0])
_REGISTER_CLOCK(NULL, "brom", brom_clk)
_REGISTER_CLOCK(NULL, "emma", emma_clk[0])
_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk[0])
- _REGISTER_CLOCK(NULL, "wdog", wdog_clk)
+ _REGISTER_CLOCK("imx-wdt.0", NULL, wdog_clk)
_REGISTER_CLOCK(NULL, "gpio", gpio_clk)
_REGISTER_CLOCK(NULL, "i2c", i2c_clk)
_REGISTER_CLOCK("mxc-keypad", NULL, kpp_clk)