From: Olof Johansson Date: Fri, 3 Apr 2015 20:38:43 +0000 (-0700) Subject: Merge tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=47f36e4921ae11dccf3163f75f70bb55686780f1;p=linux-beck.git Merge tag 'arm-perf-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into next/drivers 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 --- 47f36e4921ae11dccf3163f75f70bb55686780f1 diff --cc drivers/bus/Kconfig index 7e9c2674af81,79e297b1f221..ea816ef23537 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@@ -4,21 -4,6 +4,41 @@@ menu "Bus devices" +config ARM_CCI - bool "ARM CCI driver support" ++ 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 - Driver supporting the CCI cache coherent interconnect for ARM - platforms. ++ 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