From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Jan 2014 02:48:28 +0000 (-0800)
Subject: Merge tag 'boards-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.14-rc1~111
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=903a9f77d1d00c8621bc37afd959ac45a4b3ebec;p=linux-2.6-block.git

Merge tag 'boards-for-linus' of git://git./linux/kernel/git/arm/arm-soc

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
---

903a9f77d1d00c8621bc37afd959ac45a4b3ebec
diff --cc arch/arm/boot/dts/Makefile
index faa38bcc7001,8cafefa44a7e..ede21c16fdc0
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -117,9 -104,9 +117,10 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
  	kirkwood-ts219-6281.dtb \
  	kirkwood-ts219-6282.dtb
  dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb
 +dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb
  dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \
- 	qcom-msm8960-cdp.dtb
+ 	qcom-msm8960-cdp.dtb \
+ 	qcom-apq8074-dragonboard.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
  	armada-370-mirabox.dtb \
  	armada-370-netgear-rn102.dtb \
diff --cc arch/arm/configs/msm_defconfig
index b2671e5c8bd3,c5698b7ce444..0219c65cefd5
--- a/arch/arm/configs/msm_defconfig
+++ b/arch/arm/configs/msm_defconfig
@@@ -17,9 -17,10 +17,10 @@@ CONFIG_MODULE_UNLOAD=
  CONFIG_MODULE_FORCE_UNLOAD=y
  CONFIG_MODVERSIONS=y
  CONFIG_PARTITION_ADVANCED=y
 -CONFIG_ARCH_MSM=y
 +CONFIG_ARCH_MSM_DT=y
  CONFIG_ARCH_MSM8X60=y
  CONFIG_ARCH_MSM8960=y
+ CONFIG_ARCH_MSM8974=y
  CONFIG_SMP=y
  CONFIG_PREEMPT=y
  CONFIG_AEABI=y