• Linus Torvalds's avatar
    Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b324c67d
    Linus Torvalds authored
    Pull device tree conversions for arm-soc, part 1, from Olof Johansson:
     "The spear3xx, lpc32xx, shmobile and mmp platforms are joining the game
      of booting using device trees, which is a great step forward for them.
      at91 and spear have pretty much completed this process with a huge
      amount of work being put into at91.  The other platforms are
      continuing the process.
    
      We finally start to see the payback on this investment, as new
      machines are getting supported purely by adding a .dts source file
      that can be completely independent of the kernel source."
    
    Fix up trivial conflict in arch/arm/Kconfig
    
    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
      ARM: at91: Add ADC driver to at91sam9260/at91sam9g20 dtsi files
      arm/dts: omap4-panda: Add LEDs support
      arm/dts: omap4-sdp: Add LEDs support
      arm/dts: twl4030: Add twl4030-gpio node
      OMAP4: devices: Do not create mcpdm device if the dtb has been provided
      OMAP4: devices: Do not create dmic device if the dtb has been provided
      Documentation: update docs for mmp dt
      ARM: dts: refresh dts file for arch mmp
      ARM: mmp: support pxa910 with device tree
      ARM: mmp: support mmp2 with device tree
      gpio: pxa: parse gpio from DTS file
      ARM: mmp: support DT in timer
      ARM: mmp: support DT in irq
      ARM: mmp: append CONFIG_MACH_MMP2_DT
      ARM: mmp: fix build issue on mmp with device tree
      ARM: ux500: Enable PRCMU Timer 4 (clocksource) for Device Tree
      ARM: ux500: Disable SMSC911x platform code registration when DT is enabled
      ARM: ux500: Fork cpu-db8500 platform_devs for sequential DT enablement
      ARM: ux500: Do not attempt to register non-existent i2c devices on Snowball
      ARM: SPEAr3xx: Correct keyboard data passed from DT
      ...
    b324c67d
timer.c 2.06 KB