diff options
author | Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> | 2007-07-17 17:35:52 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-20 05:00:41 -0400 |
commit | f4ae6413f4d4889c8bf3fb90939d967ced65ece7 (patch) | |
tree | aa90e2d724985bcccf77351b6b2ecb2606521a9d | |
parent | cebfaf5f1c4dcf9456463c8411ae869f3c03619f (diff) |
[ARM] 4486/1: ns9xxx: fix a typo in the register definitions.
Fixed all users.
Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r-- | arch/arm/mach-ns9xxx/board-a9m9750dev.c | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-ns9xxx/regs-mem.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ns9xxx/board-a9m9750dev.c b/arch/arm/mach-ns9xxx/board-a9m9750dev.c index 267c2a1e1188..6eee8084b613 100644 --- a/arch/arm/mach-ns9xxx/board-a9m9750dev.c +++ b/arch/arm/mach-ns9xxx/board-a9m9750dev.c | |||
@@ -178,7 +178,7 @@ void __init board_a9m9750dev_init_machine(void) | |||
178 | 178 | ||
179 | /* setup static CS0: memory configuration */ | 179 | /* setup static CS0: memory configuration */ |
180 | reg = MEM_SMC(0); | 180 | reg = MEM_SMC(0); |
181 | REGSET(reg, MEM_SMC, WSMC, OFF); | 181 | REGSET(reg, MEM_SMC, PSMC, OFF); |
182 | REGSET(reg, MEM_SMC, BSMC, OFF); | 182 | REGSET(reg, MEM_SMC, BSMC, OFF); |
183 | REGSET(reg, MEM_SMC, EW, OFF); | 183 | REGSET(reg, MEM_SMC, EW, OFF); |
184 | REGSET(reg, MEM_SMC, PB, 1); | 184 | REGSET(reg, MEM_SMC, PB, 1); |
diff --git a/include/asm-arm/arch-ns9xxx/regs-mem.h b/include/asm-arm/arch-ns9xxx/regs-mem.h index 8ed8448767b9..fb455a0ed845 100644 --- a/include/asm-arm/arch-ns9xxx/regs-mem.h +++ b/include/asm-arm/arch-ns9xxx/regs-mem.h | |||
@@ -79,9 +79,9 @@ | |||
79 | #define MEM_SMC(x) __REG2(0xa0700200, (x) << 3) | 79 | #define MEM_SMC(x) __REG2(0xa0700200, (x) << 3) |
80 | 80 | ||
81 | /* Static Memory Configuration Register x: Write protect */ | 81 | /* Static Memory Configuration Register x: Write protect */ |
82 | #define MEM_SMC_WSMC __REGBIT(20) | 82 | #define MEM_SMC_PSMC __REGBIT(20) |
83 | #define MEM_SMC_WSMC_OFF __REGVAL(MEM_SMC_WSMC, 0) | 83 | #define MEM_SMC_PSMC_OFF __REGVAL(MEM_SMC_PSMC, 0) |
84 | #define MEM_SMC_WSMC_ON __REGVAL(MEM_SMC_WSMC, 1) | 84 | #define MEM_SMC_PSMC_ON __REGVAL(MEM_SMC_PSMC, 1) |
85 | 85 | ||
86 | /* Static Memory Configuration Register x: Buffer enable */ | 86 | /* Static Memory Configuration Register x: Buffer enable */ |
87 | #define MEM_SMC_BSMC __REGBIT(19) | 87 | #define MEM_SMC_BSMC __REGBIT(19) |