Merge tag 'sound-fix-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[firefly-linux-kernel-4.4.55.git] / drivers / bus / Kconfig

diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index a1d4af6df3f57a5e7de71bbdaa79bb5f271d0fef..1a82f3a17681b77926a11c29ba23cbdc27d8b6b5 100644 (file)
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -7,21 +7,24 @@ menu "Bus devices"
 config ARM_CCI
        bool
 
+config ARM_CCI_PMU
+       bool
+       select ARM_CCI
+
 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
+       depends on (ARM && CPU_V7) || ARM64
+       depends on PERF_EVENTS
        select ARM_CCI400_COMMON
+       select ARM_CCI_PMU
        help
-         Support for PMU events monitoring on the ARM CCI cache coherent
-         interconnect.
-
-         If unsure, say Y
+         Support for PMU events monitoring on the ARM CCI-400 (cache coherent
+         interconnect). CCI-400 supports counting events related to the
+         connected slave/master interfaces.
 
 config ARM_CCI400_PORT_CTRL
        bool
@@ -31,6 +34,20 @@ config ARM_CCI400_PORT_CTRL
          Low level power management driver for CCI400 cache coherent
          interconnect for ARM platforms.
 
+config ARM_CCI500_PMU
+       bool "ARM CCI500 PMU support"
+       default y
+       depends on (ARM && CPU_V7) || ARM64
+       depends on PERF_EVENTS
+       select ARM_CCI_PMU
+       help
+         Support for PMU events monitoring on the ARM CCI-500 cache coherent
+         interconnect. CCI-500 provides 8 independent event counters, which
+         can count events pertaining to the slave/master interfaces as well
+         as the internal events to the CCI.
+
+         If unsure, say Y
+
 config ARM_CCN
        bool "ARM CCN driver support"
        depends on ARM || ARM64