From: Olof Johansson Date: Wed, 28 Mar 2012 04:21:44 +0000 (-0700) Subject: Merge branch 'fixes-non-critical' into next/drivers2 X-Git-Tag: v3.4-rc1~73^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544;p=platform%2Fupstream%2Fkernel-adaptation-pc.git Merge branch 'fixes-non-critical' into next/drivers2 fixes-non-critical has already been merged upstream, and there are a handful of annoying context conflicts that it makes sense to resolve before sending up. Part of this is because there was parallel development going on between more urgent fixes and general driver fixups, it should settle down once the lpc32xx platform reaches a more steady state. Conflicts: arch/arm/mach-lpc32xx/clock.c arch/arm/mach-lpc32xx/common.h Signed-off-by: Olof Johansson --- 1f5b7dcfdad3840d4bce27ab0b3cc8f376b81544 diff --cc arch/arm/mach-lpc32xx/clock.c index 47639f3,0e01bf4..b7ef511 --- a/arch/arm/mach-lpc32xx/clock.c +++ b/arch/arm/mach-lpc32xx/clock.c @@@ -1129,12 -1055,11 +1129,12 @@@ 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("lpc32xx-adc", NULL, clk_adc) _REGISTER_CLOCK(NULL, "i2s0_ck", clk_i2s0) _REGISTER_CLOCK(NULL, "i2s1_ck", clk_i2s1) - _REGISTER_CLOCK("lpc32xx-adc", NULL, clk_adc) _REGISTER_CLOCK("ts-lpc32xx", NULL, clk_tsc) _REGISTER_CLOCK("dev:mmc0", NULL, clk_mmc) - _REGISTER_CLOCK("lpc-eth.0", NULL, clk_net) + _REGISTER_CLOCK("lpc-net.0", NULL, clk_net) _REGISTER_CLOCK("dev:clcd", NULL, clk_lcd) _REGISTER_CLOCK("lpc32xx_udc", "ck_usbd", clk_usbd) _REGISTER_CLOCK("lpc32xx_rtc", NULL, clk_rtc) diff --cc arch/arm/mach-lpc32xx/common.h index 23c2190,75640bfb..68e45e8 --- a/arch/arm/mach-lpc32xx/common.h +++ b/arch/arm/mach-lpc32xx/common.h @@@ -69,6 -65,8 +69,7 @@@ extern u32 clk_get_pclk_div(void) */ extern void lpc32xx_get_uid(u32 devid[4]); + extern u32 lpc32xx_return_iram_size(void); - /* * Pointers used for sizing and copying suspend function data */