• Linus Torvalds's avatar
    Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 09893ee8
    Linus Torvalds authored
    Pull "ARM: More device tree support updates" from Olof Johansson:
     "This branch contains a number of updates for device tree support on
      several ARM platforms, in particular:
    
       * AT91 continues the device tree conversion adding support for a
         number of on-chip drivers and other functionality
       * ux500 adds probing of some of the core SoC blocks through device
         tree
       * Initial device tree support for ST SPEAr600 platforms
       * kirkwood continues the conversion to device-tree probing"
    
    Manually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and
    drivers/usb/gadget/at91_udc.c due to header file include cleanups.
    
    Also do an "evil merge" for the MACH_U8500 config option rename that the
    affected RMI4 touchscreen driver in staging.  It's called MACH_MOP500
    now, and it was missed during previous merges.
    
    * tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
      ARM: SPEAr600: Add device-tree support to SPEAr600 boards
      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: kirkwood: use devicetree for rtc-mv
      ARM: kirkwood: rtc-mv devicetree bindings
      ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
      ARM: kirkwood: fdt: facilitate new boards during fdt migration
      ARM: kirkwood: fdt: absorb kirkwood_init()
      ARM: kirkwood: fdt: use mrvl ticker symbol
      ARM: orion: wdt: use resource vice direct access
      ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.
      ARM: orion: spi: remove enable_clock_fix which is not used
      ...
    09893ee8
board-mop500.c 21.4 KB