From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 May 2012 16:30:52 +0000 (-0700)
Subject: Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b324c67d4800e59171f48d9ddab6cbfb59110482;p=~shefty%2Frdma-dev.git

Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull device tree conversions for arm-soc, part 1, from Olof Johansson:
 "The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game
  of booting using device trees, which is a great step forward for them.
  at91 and spear have pretty much completed this process with a huge
  amount of work being put into at91.  The other platforms are
  continuing the process.

  We finally start to see the payback on this investment, as new
  machines are getting supported purely by adding a .dts source file
  that can be completely independent of the kernel source."

Fix up trivial conflict in arch/arm/Kconfig

* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
  arm/dts: omap4-panda: Add LEDs support
  arm/dts: omap4-sdp: Add LEDs support
  arm/dts: twl4030: Add twl4030-gpio node
  OMAP4: devices: Do not create mcpdm device if the dtb has been provided
  OMAP4: devices: Do not create dmic device if the dtb has been provided
  Documentation: update docs for mmp dt
  ARM: dts: refresh dts file for arch mmp
  ARM: mmp: support pxa910 with device tree
  ARM: mmp: support mmp2 with device tree
  gpio: pxa: parse gpio from DTS file
  ARM: mmp: support DT in timer
  ARM: mmp: support DT in irq
  ARM: mmp: append CONFIG_MACH_MMP2_DT
  ARM: mmp: fix build issue on mmp with device tree
  ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
  ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
  ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
  ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
  ARM: SPEAr3xx: Correct keyboard data passed from DT
  ...
---

b324c67d4800e59171f48d9ddab6cbfb59110482
diff --cc arch/arm/Kconfig
index 64ae22c4fce,f10b86495fe..82936f63cf1
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -606,6 -633,8 +607,7 @@@ config ARCH_MM
  	select CLKDEV_LOOKUP
  	select GENERIC_CLOCKEVENTS
  	select GPIO_PXA
+ 	select IRQ_DOMAIN
 -	select TICK_ONESHOT
  	select PLAT_PXA
  	select SPARSE_IRQ
  	select GENERIC_ALLOCATOR
diff --cc arch/arm/mach-shmobile/include/mach/common.h
index c85e6ecda60,cc1d73514ff..ff5f12fd742
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@@ -3,7 -3,10 +3,9 @@@
  
  extern void shmobile_earlytimer_init(void);
  extern struct sys_timer shmobile_timer;
+ extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
+ 				 unsigned int mult, unsigned int div);
  struct twd_local_timer;
 -void shmobile_twd_init(struct twd_local_timer *twd_local_timer);
  extern void shmobile_setup_console(void);
  extern void shmobile_secondary_vector(void);
  extern int shmobile_platform_cpu_kill(unsigned int cpu);
diff --cc arch/arm/mach-ux500/timer.c
index 52e55337aa9,885c74231b8..bd8e110cbcc
--- a/arch/arm/mach-ux500/timer.c
+++ b/arch/arm/mach-ux500/timer.c
@@@ -45,8 -53,13 +51,10 @@@ static void __init ux500_timer_init(voi
  {
  	void __iomem *mtu_timer_base;
  	void __iomem *prcmu_timer_base;
+ 	void __iomem *tmp_base;
+ 	struct device_node *np;
  
 -	if (cpu_is_u5500()) {
 -		mtu_timer_base = __io_address(U5500_MTU0_BASE);
 -		prcmu_timer_base = __io_address(U5500_PRCMU_TIMER_3_BASE);
 -	} else if (cpu_is_u8500()) {
 +	if (cpu_is_u8500()) {
  		mtu_timer_base = __io_address(U8500_MTU0_BASE);
  		prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE);
  	} else {