diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-06-13 15:28:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-06 20:55:15 +0100 |
| commit | 10cdc7e5129ac26aefece4c7a7d5b1a0285237c2 (patch) | |
| tree | 42482ef55f6a6643b1a195c8255e79272fc2c572 /arch | |
| parent | eca5dc2a0028d64229aef1b7839bcbae1d864c5f (diff) | |
| download | linux-3.10-10cdc7e5129ac26aefece4c7a7d5b1a0285237c2.tar.gz linux-3.10-10cdc7e5129ac26aefece4c7a7d5b1a0285237c2.tar.bz2 linux-3.10-10cdc7e5129ac26aefece4c7a7d5b1a0285237c2.zip | |
ARM: 6960/1: allow enabling SCU code on UP
The scu_power_mode function can be used on UP builds as it drives signals
to an SOC power controller. So make it selectable for !SMP.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/smp_scu.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cd8f520dd03..84fda2bebd7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1349,7 +1349,6 @@ config SMP_ON_UP config HAVE_ARM_SCU bool - depends on SMP help This option enables support for the ARM system coherency unit diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index a1e757c3439..79ed5e7f204 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c @@ -20,6 +20,7 @@ #define SCU_INVALIDATE 0x0c #define SCU_FPGA_REVISION 0x10 +#ifdef CONFIG_SMP /* * Get the number of CPU cores from the SCU configuration */ @@ -50,6 +51,7 @@ void __init scu_enable(void __iomem *scu_base) */ flush_cache_all(); } +#endif /* * Set the executing CPUs power mode as defined. This will be in |