Merge tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux...

Merge "arm-cci PMU updates for 4.1" from Will Deacon:

CCI-400 PMU updates

This series reworks some of the CCI-400 PMU code so that it can be used
on both ARM and ARM64-based systems, without the need to boot in secure
mode on the latter. This paves the way for CCI-500 support in future.

* tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  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
  + Linux 4.0-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/bus/Kconfig
index 7e9c2674af81d6e9704aa7e35cda8bec73844809,79e297b1f221c1dd1b2464f53bffb54d00a8b4cd..ea816ef23537c02fa0d8d75613859a18168f829f
--- 1/drivers/bus/Kconfig
--- 2/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@@ -4,21 -4,6 +4,41 @@@
  
  menu "Bus devices"
  
-       bool "ARM CCI driver support"
 +config ARM_CCI
-         Driver supporting the CCI cache coherent interconnect for ARM
-         platforms.
++      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