From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 16 Mar 2012 19:51:30 +0000 (+0000)
Subject: Merge branch 'ux500/dt' into next/dt2
X-Git-Url: http://git.alex.org.uk

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>
---

d4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3
diff --cc arch/arm/mach-ux500/devices-common.c
index 898a645,c3bc094..c5312a4
--- a/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;
  
+ 	dev->dev.parent = parent;
+ 
 -	ret = amba_device_register(dev, &iomem_resource);
 +	ret = amba_device_add(dev, &iomem_resource);
  	if (ret) {
 -		kfree(dev);
 +		amba_device_put(dev);
  		return ERR_PTR(ret);
  	}