From: Roland Stigge Date: Tue, 13 Mar 2012 20:15:40 +0000 (+0100) Subject: Merge branch 'lpc32xx/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... X-Git-Tag: upstream/snapshot3+hdmi~7850^2~3^2^3~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7e4c6a7145ee375a688e1701ae4c975d6c6419a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge branch 'lpc32xx/drivers' of git://git./linux/kernel/git/arm/arm-soc into lpc32xx/tmp Conflicts: arch/arm/mach-lpc32xx/clock.c --- a7e4c6a7145ee375a688e1701ae4c975d6c6419a diff --cc arch/arm/mach-lpc32xx/clock.c index 0e01bf4,473015a..ab8c216 --- a/arch/arm/mach-lpc32xx/clock.c +++ b/arch/arm/mach-lpc32xx/clock.c @@@ -1055,10 -1110,11 +1090,11 @@@ static struct clk_lookup lookups[] = _REGISTER_CLOCK("dev:ssp1", NULL, clk_ssp1) _REGISTER_CLOCK("lpc32xx_keys.0", NULL, clk_kscan) _REGISTER_CLOCK("lpc32xx-nand.0", "nand_ck", clk_nand) + _REGISTER_CLOCK(NULL, "i2s0_ck", clk_i2s0) + _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1) + _REGISTER_CLOCK("lpc32xx-adc", NULL, clk_adc) - _REGISTER_CLOCK("tbd", "i2s0_ck", clk_i2s0) - _REGISTER_CLOCK("tbd", "i2s1_ck", clk_i2s1) _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc) - _REGISTER_CLOCK("dev:mmc0", "MCLK", clk_mmc) + _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc) _REGISTER_CLOCK("lpc-net.0", NULL, clk_net) _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd)