• Arnd Bergmann's avatar
    Merge branch 'ux500/dt' into next/dt2 · d4ef467a
    Arnd Bergmann authored
    * 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: default avatarArnd Bergmann <arnd@arndb.de>
    d4ef467a
Kconfig 70 KB