• Linus Torvalds's avatar
    Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · db5b0ae0
    Linus Torvalds authored
    Pull ARM SoC device tree conversions and enablement from Olof Johansson:
     "Continued device tree conversion and enablement across a number of
      platforms; Kirkwood, tegra, i.MX, Exynos, zynq and a couple of other
      smaller series as well.
    
      ux500 has seen continued conversion for platforms.  Several platforms
      have seen pinctrl-via-devicetree conversions for simpler
      multiplatform.  Tegra is adding data for new devices/drivers, and
      Exynos has a bunch of new bindings and devices added as well.
    
      So, pretty much the same progression in the right direction as the
      last few releases."
    
    Fix up conflicts as per Olof.
    
    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (185 commits)
      ARM: ux500: Rename dbx500 cpufreq code to be more generic
      ARM: dts: add missing ux500 device trees
      ARM: ux500: Stop registering the PCM driver from platform code
      ARM: ux500: Move board specific GPIO info out to subordinate DTS files
      ARM: ux500: Disable the MMCI gpio-regulator by default
      ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
      ARM: Kirkwood: Add support LED of OpenBlocks A6
      ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
      ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
      ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
      ARM: kirkwood: Add support DT of second I2C bus
      ARM: kirkwood: Convert mplcec4 board to pinctrl
      ARM: Kirkwood: Convert km_kirkwood to pinctrl
      ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
      ARM: Kirkwood: Convert IX2-200 to pinctrl.
      ARM: Kirkwood: Convert lsxl boards to pinctrl.
      ARM: Kirkwood: Convert ib62x0 to pinctrl.
      ARM: Kirkwood: Convert GoFlex Net to pinctrl.
      ARM: Kirkwood: Convert dreamplug to pinctrl.
      ARM: Kirkwood: Convert dockstar to pinctrl.
      ...
    db5b0ae0
mach-nuri.c 35.6 KB