• Linus Torvalds's avatar
    Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 903a9f77
    Linus Torvalds authored
    Pull ARM SoC board updates from Olof Johansson:
     "This branch is reducing in size for every release since most
      board-related changes have started happening in devicetrees now.
      Still, we have some things going on here.
    
       * Renesas platforms are still adding a bit more legacy device
         support, something that should trail off shortly as they move to
         full DT
       * We group most defconfig updates into this branch out of old habits
       * Removal of legacy OMAP2 platforms over to DT continues, and a
         handful of old code is being removed here"
    
    * tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
      ARM: dts: OMAP2: fix interrupt number for rng
      ARM: dts: Split omap3 pinmux core device
      ARM: dts: Add omap specific pinctrl defines to use padconf addresses
      ARM: bcm2835: bcm2835_defconfig updates
      ARM: msm_defconfig: Enable restart driver
      defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
      ARM: msm: Add support for APQ8074 Dragonboard
      ARM: exynos_defconfig: Enable S2MPS11 voltage regulator
      ARM: tegra: Enable DRM panel support
      ARM: shmobile: mackerel: Fix USBHS pinconf entry
      ARM: shmobile: Let Koelsch multiplatform boot with Koelsch DTB
      ARM: shmobile: Let Lager multiplatform boot with Lager DTB
      ARM: shmobile: Remove non-multiplatform Koelsch reference support
      ARM: shmobile: Remove non-multiplatform Lager reference support
      ARM: shmobile: koelsch-reference: Instantiate clkdevs for SCIF and CMT
      ARM: shmobile: lager-reference: Instantiate clkdevs for SCIF and CMT
      ARM: shmobile: koelsch-reference: Remove duplicate CCF initialization
      ARM: shmobile: lager-reference: Enable multiplaform kernel support
      ARM: shmobile: armadillo: Set backlight enable GPIO
      ARM: shmobile: Koelsch: add Ether support
      ...
    
    Conflicts:
    	arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c
    903a9f77
board-armadillo800eva.c 31 KB