aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx
diff options
context:
space:
mode:
authorRoland Stigge <stigge@antcom.de>2012-02-08 15:41:03 -0500
committerOlof Johansson <olof@lixom.net>2012-02-09 18:55:50 -0500
commitd35dfa59a3101095228e0a5ed2dda33fc870b50d (patch)
treee9e4b475c924e828e4973c14206c6e959b2bffff /arch/arm/mach-lpc32xx
parentf40a6818857e00c1d0ecec9af832f46a83f12f53 (diff)
ARM: LPC32xx: clock.c: Clock registration fixes
This patch adjusts the clock registration list, ported from the latest version of Kevin Wells' latest version of clock.c: i2s0_ck, i2s1_ck and dev:mmc0 have NULL pointers associated as the .dev_id and .con_id, respectively. The old values were not useful. Signed-off-by: Roland Stigge <stigge@antcom.de> Acked-by: Kevin Wells <kevin.wells@nxp.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
-rw-r--r--arch/arm/mach-lpc32xx/clock.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-lpc32xx/clock.c b/arch/arm/mach-lpc32xx/clock.c
index 6a15e3655a57..0e01bf44479c 100644
--- a/arch/arm/mach-lpc32xx/clock.c
+++ b/arch/arm/mach-lpc32xx/clock.c
@@ -1055,10 +1055,10 @@ static struct clk_lookup lookups[] = {
1055 _REGISTER_CLOCK("dev:ssp1", NULL, clk_ssp1) 1055 _REGISTER_CLOCK("dev:ssp1", NULL, clk_ssp1)
1056 _REGISTER_CLOCK("lpc32xx_keys.0", NULL, clk_kscan) 1056 _REGISTER_CLOCK("lpc32xx_keys.0", NULL, clk_kscan)
1057 _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand) 1057 _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand)
1058 _REGISTER_CLOCK("tbd", "i2s0_ck", clk_i2s0) 1058 _REGISTER_CLOCK(NULL, "i2s0_ck", clk_i2s0)
1059 _REGISTER_CLOCK("tbd", "i2s1_ck", clk_i2s1) 1059 _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1)
1060 _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc) 1060 _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc)
1061 _REGISTER_CLOCK("dev:mmc0", "MCLK", clk_mmc) 1061 _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc)
1062 _REGISTER_CLOCK("lpc-net.0", NULL, clk_net) 1062 _REGISTER_CLOCK("lpc-net.0", NULL, clk_net)
1063 _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) 1063 _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd)
1064 _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd) 1064 _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd)