Merge branch 'ux500/dt' into next/dt2
authorArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:51:30 +0000 (19:51 +0000)
committerArnd Bergmann <arnd@arndb.de>
Fri, 16 Mar 2012 19:51:30 +0000 (19:51 +0000)
commitd4ef467aea0fdcd5e75a4bbfaf97e579bbe532f3
tree5b91923fb5031c6963a60ee33ee7671d178f26b2
parent4acf18232f80c29906356f0f35b2d5f800b5953d
parent71de5c46e0600b72df58269e80da343e354ddbd7
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>
12 files changed:
arch/arm/kernel/smp_twd.c
arch/arm/mach-imx/Makefile
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mach-realview/realview_pbx.c
arch/arm/mach-shmobile/smp-sh73a0.c
arch/arm/mach-ux500/devices-common.c
arch/arm/mach-vexpress/ct-ca9x4.c
arch/x86/Kconfig
scripts/mod/file2alias.c