summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-v6.S
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-02-15 15:07:40 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-15 15:07:40 +0000
commit4ba9dcbeba042b7a1a1366f0dc683a2947ca5577 (patch)
treea99a7e26eb4c30a477d70b035b5a90f2dfd45566 /arch/arm/mm/proc-v6.S
parent382266ad5ad4119ec12df889afa5062a0a0cd6ae (diff)
parent4b17244c133689ad0cbdca37ce3e15068f120428 (diff)
downloadop-kernel-dev-4ba9dcbeba042b7a1a1366f0dc683a2947ca5577.zip
op-kernel-dev-4ba9dcbeba042b7a1a1366f0dc683a2947ca5577.tar.gz
Merge Realview GIC code
Diffstat (limited to 'arch/arm/mm/proc-v6.S')
-rw-r--r--arch/arm/mm/proc-v6.S8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index d78c0ae..eb42e5b 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -14,10 +14,13 @@
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
#include <asm/elf.h>
-#include <asm/hardware/arm_scu.h>
#include <asm/pgtable-hwdef.h>
#include <asm/pgtable.h>
+#ifdef CONFIG_SMP
+#include <asm/hardware/arm_scu.h>
+#endif
+
#include "proc-macros.S"
#define D_CACHE_LINE_SIZE 32
@@ -187,8 +190,7 @@ __v6_setup:
/* Set up the SCU on core 0 only */
mrc p15, 0, r0, c0, c0, 5 @ CPU core number
ands r0, r0, #15
- moveq r0, #0x10000000 @ SCU_BASE
- orreq r0, r0, #0x00100000
+ ldreq r0, =SCU_BASE
ldreq r5, [r0, #SCU_CTRL]
orreq r5, r5, #1
streq r5, [r0, #SCU_CTRL]
OpenPOWER on IntegriCloud