diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-10-25 19:13:47 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-10-31 19:46:50 +0100 |
| commit | 7a2848d369b2b9281400e6c9f08e21ec71cd1dcb (patch) | |
| tree | abb8983696264faee745f49a8132589134f0e791 /arch/arm/mach-highbank/hotplug.c | |
| parent | ARM: smp_twd: don't warn on no DT node (diff) | |
| download | linux-7a2848d369b2b9281400e6c9f08e21ec71cd1dcb.tar.xz linux-7a2848d369b2b9281400e6c9f08e21ec71cd1dcb.zip | |
ARM: highbank: abstract out SCU usage
In preparation for A15 support on ECX-2000, the direct calls to SCU
registers must be conditional. The SCU power mode register is replaced by
a custom register on ECX-2000.
Rather than read the number of cores from the SCU, just hardcode it to 4.
This removes one use of SCU and removes the need for the SCU to be
statically mapped. The cpu initialization will ultimately come from DT.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-highbank/hotplug.c')
| -rw-r--r-- | arch/arm/mach-highbank/hotplug.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-highbank/hotplug.c b/arch/arm/mach-highbank/hotplug.c index 2c1b8c3c8e45..7b60faccd551 100644 --- a/arch/arm/mach-highbank/hotplug.c +++ b/arch/arm/mach-highbank/hotplug.c @@ -14,13 +14,11 @@ * this program. If not, see <http://www.gnu.org/licenses/>. */ #include <linux/kernel.h> -#include <linux/errno.h> -#include <linux/smp.h> -#include <asm/smp_scu.h> #include <asm/cacheflush.h> #include "core.h" +#include "sysregs.h" extern void secondary_startup(void); @@ -33,7 +31,7 @@ void __ref highbank_cpu_die(unsigned int cpu) flush_cache_all(); highbank_set_cpu_jump(cpu, secondary_startup); - scu_power_mode(scu_base_addr, SCU_PM_POWEROFF); + highbank_set_core_pwr(); cpu_do_idle(); |