From: Roland Stigge <stigge@antcom.de>
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-Url: https://git.stricted.de/?a=commitdiff_plain;h=a7e4c6a7145ee375a688e1701ae4c975d6c6419a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.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 0e01bf44479c,473015ac07bd..ab8c21647422
--- 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)