summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorSuzuki K. Poulose <suzuki.poulose@arm.com>2015-05-26 10:53:10 +0100
committerArnd Bergmann <arnd@arndb.de>2015-05-29 16:43:48 +0200
commit85bbba709d766685613c61fd1dbc5e74f28b1ee7 (patch)
treef81ec98a09d04ec9dce71384954f36b10bef05bb /drivers/bus
parent7f05a7612e299c0aef8156e70a546ba7e5d5f947 (diff)
downloadlinux-stable-85bbba709d766685613c61fd1dbc5e74f28b1ee7.tar.gz
linux-stable-85bbba709d766685613c61fd1dbc5e74f28b1ee7.tar.bz2
linux-stable-85bbba709d766685613c61fd1dbc5e74f28b1ee7.zip
arm-cci: Do not enable CCI-400 PMU by default
Do not enable CCI-400 PMU by default and fix the dependency on PERF_EVENTS than HW_PERF_EVENTS. Reported-by: Russell King <rmk+kernel@arm.linux.org.uk> Cc: Will Deacon <will.deacon@arm.com> Cc: arm@kernel.org Cc: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Suzuki K. Poulose <suzuki.poulose@arm.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/Kconfig12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig
index a1d4af6df3f5..a6b37d497347 100644
--- a/drivers/bus/Kconfig
+++ b/drivers/bus/Kconfig
@@ -13,15 +13,13 @@ config ARM_CCI400_COMMON
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
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