linux/arch/arm/mach-nomadik
Arnd Bergmann d4ef467aea 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>
2012-03-16 19:51:30 +00:00
..
include/mach Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
board-nhk8815.c Merge branch 'ux500/dt' into next/dt2 2012-03-16 19:51:30 +00:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
clock.h ARM: 6145/1: ux500 MTU clockrate correction 2010-05-27 10:36:08 +01:00
cpu-8815.c ARM: amba: nomadik: use common amba device initializers 2012-01-26 19:59:29 +00:00
cpu-8815.h ARM: restart: nomadik: use new restart hook 2012-01-05 12:57:16 +00:00
i2c-8815nhk.c ARM: 7032/1: plat-nomadik: break out GPIO driver specifics 2011-08-22 09:12:53 +01:00
Kconfig gpio: move Nomadik GPIO driver to drivers/gpio 2011-05-26 17:30:03 -06:00
Makefile ARM: 5969/1: nomadik: move gpio to plat-nomadik 2010-03-19 18:29:31 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00