• Linus Torvalds's avatar
    Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 4f2d658b
    Linus Torvalds authored
    Pull arm-soc device tree description updates from Arnd Bergmann:
     "This branch contains two kinds of updates: Some platforms in the
      process of getting converted to device tree based booting, and the
      platform specific patches necessary for that are included here.
    
      Other platforms are already converted, so we just need to update the
      actual device tree source files and the binding documents to add
      support for new board and new drivers.
    
      In the future we will probably separate those into two branches, and
      in the long run, the plan is to move the device tree source files out
      of the kernel repository, but that has to wait until we have completed
      a much larger portion of the binding documents."
    
    Fix up trivial conflicts in arch/arm/mach-imx/clk-imx6q.c due to newly
    added clkdev registers next to a few removed unnecessary ones.
    
    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (119 commits)
      ARM: LPC32xx: Add PWM to base dts file
      ARM: EXYNOS: mark the DMA channel binding for SPI as preliminary
      ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS5 platforms
      ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOS5
      ARM: EXYNOS: Add spi clock support for EXYNOS5
      ARM: dts: Add nodes for spi controllers for SAMSUNG EXYNOS4 platforms
      ARM: EXYNOS: Enable platform support for SPI controllers for EXYNOX4
      ARM: EXYNOS: Fix the incorrect hierarchy of spi controller bus clock
      ARM: ux500: Remove PMU platform registration when booting with DT
      ARM: ux500: Remove temporary snowball_of_platform_devs enablement structure
      ARM: ux500: Ensure vendor specific properties have the vendor's identifier
      pinctrl: pinctrl-nomadik: Append sleepmode property with vendor specific prefixes
      ARM: ux500: Move rtc-pl031 registration to Device Tree when enabled
      ARM: ux500: Enable the AB8500 RTC for all DT:ed DB8500 based devices
      ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree
      ARM: ux500: Apply ab8500-debug node do the db8500 DT structure
      ARM: ux500: Add a ab8500-usb Device Tree node for db8500 based devices
      ARM: ux500: Add db8500 Device Tree node for misc/ab8500-pwm
      ARM: ux500: Add db8500 Device Tree node for ab8500-sysctrl
      ARM: ux500: Enable LED heartbeat functionality on Snowbal via DT
      ...
    4f2d658b
clk-imx6q.c 29.3 KB