Merge tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull late ARM soc platform updates from Olof Johansson:
 "This branch contains updates to OMAP and Marvell platforms (kirkwood,
  dove, mvebu) that came in after we had done the big multiplatform
  merges, so they were kept separate from the rest, and not separated
  into the traditional topics of cleanup/driver/platform features.

  For OMAP, the updates are:
   - Runtime PM conversions for the GPMC and RNG IP blocks
   - Preparation patches for the OMAP common clock framework conversion
   - clkdev alias additions required by other drivers
   - Performance Monitoring Unit (PMU) support for OMAP2, 3, and
     non-4430 OMAP4
   - OMAP hwmod code and data improvements
   - Preparation patches for the IOMMU runtime PM conversion
   - Preparation patches for OMAP4 full-chip retention support

  For Kirkwood/Dove/mvebu:
   - New driver for "address decoder controller" for mvebu, which is a
     piece of hardware that configures addressable devices and
     peripherals.  First user is the boot rom aperture on armada XP
     since it is needed for SMP support.
   - New device tree bindings for peripherals such as gpio-fan, iconnect
     nand, mv_cesa and the above address decoder controller.
   - Some defconfig updates, mostly to enable new DT boards and a few
     drivers.
   - New drivers using the pincontrol subsystem for dove, kirkwood and
     mvebu
   - New clean gpio driver for mvebu"

* tag 'soc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (98 commits)
  ARM: mvebu: fix build breaks from multi-platform conversion
  ARM: OMAP4460/4470: PMU: Enable PMU for OMAP4460/70
  ARM: OMAP2+: PMU: Add runtime PM support
  ARM: OMAP4430: PMU: prepare to create PMU device via HWMOD
  ARM: OMAP2+: PMU: Convert OMAP2/3 devices to use HWMOD
  ARM: OMAP3: hwmod data: Add debugss HWMOD data
  ARM: OMAP2+: clockdomain/hwmod: add workaround for EMU clockdomain idle problems
  ARM: OMAP: Add a timer attribute for timers that can interrupt the DSP
  hwrng: OMAP: remove SoC restrictions from driver registration
  ARM: OMAP: split OMAP1, OMAP2+ RNG device registration
  hwrng: OMAP: convert to use runtime PM
  hwrng: OMAP: store per-device data in per-device variables, not file statics
  ARM: OMAP2xxx: hwmod/CM: add RNG integration data
  ARM: OMAP2+: gpmc: minimal driver support
  ARM: OMAP2+: gpmc: Adapt to HWMOD
  ARM: OMAP2/3: hwmod data: add gpmc
  ARM: OMAP4: hwmod data: add mmu hwmod for ipu and dsp
  ARM: OMAP3: hwmod data: add mmu data for iva and isp
  ARM: OMAP: iommu: fix including iommu.h without IOMMU_API selected
  ARM: OMAP4: hwmod data: add missing HWMOD_NO_IDLEST flags to some PRCM IP blocks
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/Makefile
index 4745c1f68b4983468e2e23b724deffe0085afacb,d4ad2df089204cf42fc3c89407b0317f15baa247..29f541f0e6530dde50cea5006cd2bbffc99ccfbf
--- 1/arch/arm/boot/dts/Makefile
--- 2/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -17,9 -17,11 +17,12 @@@ dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb 
        usb_a9263.dtb \
        usb_a9g20.dtb
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
+ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
+       dove-cubox.dtb \
+       dove-dove-db.dtb
  dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
        exynos4210-smdkv310.dtb \
 +      exynos4210-trats.dtb \
        exynos5250-smdk5250.dtb
  dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
  dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \

diff --cc arch/arm/mach-omap2/Makefile
index 7d6abda3b74e7d2bd16abc4c5e49d71bbf5a4505,b807deb0f5216fd0553dea4c6daa6fe4745944ad..fe40d9e488c96cdf1c68ba1d6dd7acc9631b360b
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -179,7 -179,13 +179,8 @@@ obj-$(CONFIG_ARCH_OMAP4)          += omap_hwmod
  
  # EMU peripherals
  obj-$(CONFIG_OMAP3_EMU)                       += emu.o
+ obj-$(CONFIG_HW_PERF_EVENTS)          += pmu.o
  
 -# L3 interconnect
 -obj-$(CONFIG_ARCH_OMAP3)              += omap_l3_smx.o
 -obj-$(CONFIG_ARCH_OMAP4)              += omap_l3_noc.o
 -obj-$(CONFIG_SOC_OMAP5)                       += omap_l3_noc.o
 -
  obj-$(CONFIG_OMAP_MBOX_FWK)           += mailbox_mach.o
  mailbox_mach-objs                     := mailbox.o
  

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/display.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c7dcb606cd0c566b0ef710dd6fa2ce2df75f7946,ae0acaf506ede163f429d902d2e667bc5de5b913..8d7a93525bc6f8f13a10df61964596ca0aac18e1
--- 1/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
--- 2/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@@ -5886,15 -6107,9 +6107,15 @@@ static struct omap_hwmod_ocp_if omap44x
  static struct omap_hwmod_addr_space omap44xx_usb_otg_hs_addrs[] = {
        {
                .pa_start       = 0x4a0ab000,
-               .pa_end         = 0x4a0ab003,
+               .pa_end         = 0x4a0ab7ff,
                .flags          = ADDR_TYPE_RT
        },
 +      {
 +              /* XXX: Remove this once control module driver is in place */
 +              .pa_start       = 0x4a00233c,
 +              .pa_end         = 0x4a00233f,
 +              .flags          = ADDR_TYPE_RT
 +      },
        { }
  };
  

diff --cc arch/arm/mach-orion5x/common.c
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/pinctrl/Kconfig
index 1ef6e1e8c6c6dac902c486414c164446cc97b290,a7541449636916fd2c2ca28140769b0310ad8928..33e3df9e39cadf6929e64b9438972a1f84a9fa94
--- 1/drivers/pinctrl/Kconfig
--- 2/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@@ -166,15 -145,28 +166,37 @@@ config PINCTRL_COH90
          COH 901 335 and COH 901 571/3. They contain 3, 5 or 7
          ports of 8 GPIO pins each.
  
 +config PINCTRL_SAMSUNG
 +      bool "Samsung pinctrl driver"
 +      select PINMUX
 +      select PINCONF
 +
 +config PINCTRL_EXYNOS4
 +      bool "Pinctrl driver data for Exynos4 SoC"
 +      select PINCTRL_SAMSUNG
 +
+ config PINCTRL_MVEBU
+       bool
+       depends on ARCH_MVEBU
+       select PINMUX
+       select PINCONF
+ 
+ config PINCTRL_DOVE
+       bool
+       select PINCTRL_MVEBU
+ 
+ config PINCTRL_KIRKWOOD
+       bool
+       select PINCTRL_MVEBU
+ 
+ config PINCTRL_ARMADA_370
+       bool
+       select PINCTRL_MVEBU
+ 
+ config PINCTRL_ARMADA_XP
+       bool
+       select PINCTRL_MVEBU
+ 
  source "drivers/pinctrl/spear/Kconfig"
  
  endmenu

diff --cc drivers/pinctrl/Makefile
index 698527dce29dba381062a3425b04dc006b296682,f2ea0504efc7aa2067e6f8c39dc0bfa851ac3e6d..f162e01963006ff6f33070844f50644cf2eaf09e
--- 1/drivers/pinctrl/Makefile
--- 2/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@@ -33,7 -29,10 +33,12 @@@ obj-$(CONFIG_PINCTRL_TEGRA20)       += pinctr
  obj-$(CONFIG_PINCTRL_TEGRA30) += pinctrl-tegra30.o
  obj-$(CONFIG_PINCTRL_U300)    += pinctrl-u300.o
  obj-$(CONFIG_PINCTRL_COH901)  += pinctrl-coh901.o
 +obj-$(CONFIG_PINCTRL_SAMSUNG) += pinctrl-samsung.o
 +obj-$(CONFIG_PINCTRL_EXYNOS4) += pinctrl-exynos.o
+ obj-$(CONFIG_PINCTRL_MVEBU)   += pinctrl-mvebu.o
+ obj-$(CONFIG_PINCTRL_DOVE)    += pinctrl-dove.o
+ obj-$(CONFIG_PINCTRL_KIRKWOOD)        += pinctrl-kirkwood.o
+ obj-$(CONFIG_PINCTRL_ARMADA_370) += pinctrl-armada-370.o
+ obj-$(CONFIG_PINCTRL_ARMADA_XP)  += pinctrl-armada-xp.o
  
  obj-$(CONFIG_PLAT_SPEAR)      += spear/

diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge