From 85bbba709d766685613c61fd1dbc5e74f28b1ee7 Mon Sep 17 00:00:00 2001 From: "Suzuki K. Poulose" Date: Tue, 26 May 2015 10:53:10 +0100 Subject: 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 Cc: Will Deacon Cc: arm@kernel.org Cc: Russell King Signed-off-by: Suzuki K. Poulose Signed-off-by: Arnd Bergmann --- drivers/bus/Kconfig | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'drivers/bus/Kconfig') 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 -- cgit v1.2.3