Merge branch 'ux500/dt' into next/dt2

* ux500/dt:
  ARM: ux500: Provide local timer support for Device Tree
  ARM: ux500: Enable PL022 SSP Controller in Device Tree
  ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree
  ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree
  ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree
  ARM: ux500: db8500: list most devices in the snowball device tree
  ARM: ux500: split dts file for snowball into generic part
  ARM: ux500: combine the board init functions for DT boot
  ARM: ux500: Initial Device Tree support for Snowball
  ARM: ux500: CONFIG: Enable Device Tree support for future endeavours
  ARM: ux500: fix compilation after local timer rework

(adds dependency on localtimer branch, irqdomain branch and ux500/soc
branch)

Conflicts:
	arch/arm/mach-ux500/devices-common.c

This adds patches from Lee Jones, Niklas Hernaeus and myself to provide
initial device tree support on the ux500 platform. The pull request from
Lee contained some other changes, so I rebased the patches on top of
the branches that are actually dependencies for this.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/kernel/smp_twd.c
Simple merge

diff --cc arch/arm/mach-imx/Makefile
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge

diff --cc arch/arm/mach-realview/realview_eb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb11mp.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pbx.c
Simple merge

diff --cc arch/arm/mach-shmobile/smp-sh73a0.c
Simple merge

diff --cc arch/arm/mach-ux500/devices-common.c
index 898a64517b09ecc1386bd1e2e23d938cc4b6e72c,c3bc094c27e53845751f71df4bc91ca21bf62fc8..c5312a4b49f5487a229166de8c28acb3994d6c52
--- 1/arch/arm/mach-ux500/devices-common.c
--- 2/arch/arm/mach-ux500/devices-common.c
+++ b/arch/arm/mach-ux500/devices-common.c
@@@ -39,9 -47,11 +40,11 @@@ dbx500_add_amba_device(struct device *p
  
        dev->dev.platform_data = pdata;
  
 -      ret = amba_device_register(dev, &iomem_resource);
+       dev->dev.parent = parent;
+ 
 +      ret = amba_device_add(dev, &iomem_resource);
        if (ret) {
 -              kfree(dev);
 +              amba_device_put(dev);
                return ERR_PTR(ret);
        }
  

diff --cc arch/arm/mach-vexpress/ct-ca9x4.c
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc scripts/mod/file2alias.c
Simple merge