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

Pull ARM SoC driver updates from Olof Johansson:
 "Driver updates for v4.1.  Some of these are for drivers/soc, where we
  find more and more SoC-specific drivers these days.  Some are for
  other driver subsystems where we have received acks from the
  appropriate maintainers.

  The larger parts of this branch are:

   - MediaTek support for their PMIC wrapper interface, a high-level
     interface for talking to the system PMIC over a dedicated I2C
     interface.

   - Qualcomm SCM driver has been moved to drivers/firmware.  It's used
     for CPU up/down and needs to be in a shared location for arm/arm64
     common code.

   - cleanup of ARM-CCI PMU code.

   - another set of cleanusp to the OMAP GPMC code"

* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  soc/mediatek: Remove unused variables
  clocksource: atmel-st: select MFD_SYSCON
  soc: mediatek: Add PMIC wrapper for MT8135 and MT8173 SoCs
  arm-cci: Fix CCI PMU event validation
  arm-cci: Split the code for PMU vs driver support
  arm-cci: Get rid of secure transactions for PMU driver
  arm-cci: Abstract the CCI400 PMU specific definitions
  arm-cci: Rearrange code for splitting PMU vs driver code
  drivers: cci: reject groups spanning multiple HW PMUs
  ARM: at91: remove useless include
  clocksource: atmel-st: remove mach/hardware dependency
  clocksource: atmel-st: use syscon/regmap
  ARM: at91: time: move the system timer driver to drivers/clocksource
  ARM: at91: properly initialize timer
  ARM: at91: at91rm9200: remove deprecated arm_pm_restart
  watchdog: at91rm9200: implement restart handler
  watchdog: at91rm9200: use the system timer syscon
  mfd: syscon: Add atmel system timer registers definition
  ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
  soc: qcom: gsbi: Add support for ADM CRCI muxing
  ...

diff --cc MAINTAINERS
index fadb73c40e28f0a15e80a9147fda5fa9136ebb85,7b4f760e441455ea1dc72ecb2e6eac534cf8697b..39fb0435362ce121a2e106a69491b130eb757bbd
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1323,10 -1328,7 +1323,11 @@@ L:    linux-soc@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-qcom/
  F:    drivers/soc/qcom/
 +F:    drivers/tty/serial/msm_serial.h
 +F:    drivers/tty/serial/msm_serial.c
 +F:    drivers/*/pm8???-*
 +F:    drivers/mfd/ssbi.c
+ F:    drivers/firmware/qcom_scm.c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-vexpress/Kconfig
Simple merge

diff --cc drivers/bus/Kconfig
Simple merge

diff --cc drivers/bus/Makefile
index 807dd17ef2f822ee98cc2e96916ffe55177f03ad,e023a2bec664d90035c7227725ee777f0cd69fd6..790e7b933fb2f9b2a266d43ecfec16620605fe2f
--- 1/drivers/bus/Makefile
--- 2/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@@ -2,11 -2,13 +2,14 @@@
  # Makefile for the bus drivers.
  #
  
+ # Interconnect bus drivers for ARM platforms
+ obj-$(CONFIG_ARM_CCI)         += arm-cci.o
+ obj-$(CONFIG_ARM_CCN)         += arm-ccn.o
+ 
  obj-$(CONFIG_BRCMSTB_GISB_ARB)        += brcmstb_gisb.o
- obj-$(CONFIG_IMX_WEIM)        += imx-weim.o
- obj-$(CONFIG_MIPS_CDMM) += mips_cdmm.o
- obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o
- obj-$(CONFIG_OMAP_OCP2SCP)    += omap-ocp2scp.o
+ obj-$(CONFIG_IMX_WEIM)                += imx-weim.o
++obj-$(CONFIG_MIPS_CDMM)               += mips_cdmm.o
+ obj-$(CONFIG_MVEBU_MBUS)      += mvebu-mbus.o
  
  # Interconnect bus driver for OMAP SoCs.
  obj-$(CONFIG_OMAP_INTERCONNECT)       += omap_l3_smx.o omap_l3_noc.o

diff --cc drivers/clocksource/Kconfig
Simple merge