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

4 files changed, 410 insertions, 255 deletions

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index cbddbaddb347..a1d4af6df3f5 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -4,6 +4,41 @@
 
 menu "Bus devices"
 
+config ARM_CCI
+        bool
+
+config ARM_CCI400_COMMON
+        bool
+        select ARM_CCI
+
+config ARM_CCI400_PMU
+        bool "ARM CCI400 PMU support"
+        default y
+        depends on ARM || ARM64
+        depends on HW_PERF_EVENTS
+        select ARM_CCI400_COMMON
+        help
+          Support for PMU events monitoring on the ARM CCI cache coherent
+          interconnect.
+
+          If unsure, say Y
+
+config ARM_CCI400_PORT_CTRL
+        bool
+        depends on ARM && OF && CPU_V7
+        select ARM_CCI400_COMMON
+        help
+          Low level power management driver for CCI400 cache coherent
+          interconnect for ARM platforms.
+
+config ARM_CCN
+        bool "ARM CCN driver support"
+        depends on ARM || ARM64
+        depends on PERF_EVENTS
+        help
+          PMU (perf) driver supporting the ARM CCN (Cache Coherent Network)
+          interconnect.
+
 config BRCMSTB_GISB_ARB
         bool "Broadcom STB GISB bus arbiter"
         depends on ARM || MIPS
@@ -40,15 +75,6 @@ config MVEBU_MBUS
           Driver needed for the MBus configuration on Marvell EBU SoCs
           (Kirkwood, Dove, Orion5x, MV78XX0 and Armada 370/XP).
 
-config OMAP_OCP2SCP
-        tristate "OMAP OCP2SCP DRIVER"
-        depends on ARCH_OMAP2PLUS
-        help
-          Driver to enable ocp2scp module which transforms ocp interface
-          protocol to scp protocol. In OMAP4, USB PHY is connected via
-          OCP2SCP and in OMAP5, both USB PHY and SATA PHY is connected via
-          OCP2SCP.
-
 config OMAP_INTERCONNECT
         tristate "OMAP INTERCONNECT DRIVER"
         depends on ARCH_OMAP2PLUS
@@ -56,20 +82,27 @@ config OMAP_INTERCONNECT
         help
           Driver to enable OMAP interconnect error handling driver.
 
-config ARM_CCI
-        bool "ARM CCI driver support"
-        depends on ARM && OF && CPU_V7
+config OMAP_OCP2SCP
+        tristate "OMAP OCP2SCP DRIVER"
+        depends on ARCH_OMAP2PLUS
         help
-          Driver supporting the CCI cache coherent interconnect for ARM
-          platforms.
+          Driver to enable ocp2scp module which transforms ocp interface
+          protocol to scp protocol. In OMAP4, USB PHY is connected via
+          OCP2SCP and in OMAP5, both USB PHY and SATA PHY is connected via
+          OCP2SCP.
 
-config ARM_CCN
-        bool "ARM CCN driver support"
-        depends on ARM || ARM64
-        depends on PERF_EVENTS
+config SIMPLE_PM_BUS
+        bool "Simple Power-Managed Bus Driver"
+        depends on OF && PM
+        depends on ARCH_SHMOBILE || COMPILE_TEST
         help
-          PMU (perf) driver supporting the ARM CCN (Cache Coherent Network)
-          interconnect.
+          Driver for transparent busses that don't need a real driver, but
+          where the bus controller is part of a PM domain, or under the control
+          of a functional clock, and thus relies on runtime PM for managing
+          this PM domain and/or clock.
+          An example of such a bus controller is the Renesas Bus State
+          Controller (BSC, sometimes called "LBSC within Bus Bridge", or
+          "External Bus Interface") as found on several Renesas ARM SoCs.
 
 config VEXPRESS_CONFIG
         bool "Versatile Express configuration bus"
diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile
index 807dd17ef2f8..790e7b933fb2 100644
--- a/drivers/bus/Makefile
+++ b/drivers/bus/Makefile
@@ -2,17 +2,18 @@
 # 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
 
-# Interconnect bus drivers for ARM platforms
-obj-$(CONFIG_ARM_CCI)           += arm-cci.o
-obj-$(CONFIG_ARM_CCN)           += arm-ccn.o
-
+obj-$(CONFIG_OMAP_OCP2SCP)      += omap-ocp2scp.o
+obj-$(CONFIG_SIMPLE_PM_BUS)     += simple-pm-bus.o
 obj-$(CONFIG_VEXPRESS_CONFIG)   += vexpress-config.o
diff --git a/drivers/bus/arm-cci.c b/drivers/bus/arm-cci.c
index 84fd66057dad..b854125e4831 100644
--- a/drivers/bus/arm-cci.c
+++ b/drivers/bus/arm-cci.c
@@ -29,41 +29,36 @@
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 
-#define DRIVER_NAME             "CCI-400"
-#define DRIVER_NAME_PMU         DRIVER_NAME " PMU"
-
-#define CCI_PORT_CTRL           0x0
-#define CCI_CTRL_STATUS         0xc
-
-#define CCI_ENABLE_SNOOP_REQ    0x1
-#define CCI_ENABLE_DVM_REQ      0x2
-#define CCI_ENABLE_REQ          (CCI_ENABLE_SNOOP_REQ | CCI_ENABLE_DVM_REQ)
+static void __iomem *cci_ctrl_base;
+static unsigned long cci_ctrl_phys;
 
+#ifdef CONFIG_ARM_CCI400_PORT_CTRL
 struct cci_nb_ports {
         unsigned int nb_ace;
         unsigned int nb_ace_lite;
 };
 
-enum cci_ace_port_type {
-        ACE_INVALID_PORT = 0x0,
-        ACE_PORT,
-        ACE_LITE_PORT,
+static const struct cci_nb_ports cci400_ports = {
+        .nb_ace = 2,
+        .nb_ace_lite = 3
 };
 
-struct cci_ace_port {
-        void __iomem *base;
-        unsigned long phys;
-        enum cci_ace_port_type type;
-        struct device_node *dn;
-};
+#define CCI400_PORTS_DATA       (&cci400_ports)
+#else
+#define CCI400_PORTS_DATA       (NULL)
+#endif
 
-static struct cci_ace_port *ports;
-static unsigned int nb_cci_ports;
+static const struct of_device_id arm_cci_matches[] = {
+#ifdef CONFIG_ARM_CCI400_COMMON