diff options
| author | Will Deacon <will.deacon@arm.com> | 2010-06-21 16:32:54 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-01 11:13:58 +0200 |
| commit | 8954bb0da99b76c7ce5edf2f314807cff68b6ea8 (patch) | |
| tree | e49721e0ff9e451fad2550d4aad4b38e176a0c85 /arch/arm/Kconfig | |
| parent | ARM: 6194/1: change definition of cpu_relax() for ARM11MPCore (diff) | |
| download | linux-8954bb0da99b76c7ce5edf2f314807cff68b6ea8.tar.xz linux-8954bb0da99b76c7ce5edf2f314807cff68b6ea8.zip | |
ARM: 6195/1: OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU
CPU performance event counters on v7 cores will only operate
if either the NIDEN or DBGEN signals are driven high.
For the OMAP3 platform, these signals are driven low by default
but DBGEN can be asserted by selecting the OMAP3_EMU Kconfig option,
which enables the virtual clock for hardware debugging peripherals.
Acked-by: Jean Pihet <jpihet@mvista.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1f254bd6c937..98922f7d2d12 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -955,7 +955,8 @@ config XSCALE_PMU default y config CPU_HAS_PMU - depends on CPU_V6 || CPU_V7 || XSCALE_PMU + depends on (CPU_V6 || CPU_V7 || XSCALE_PMU) && \ + (!ARCH_OMAP3 || OMAP3_EMU) default y bool |