diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-09-18 18:02:25 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-25 05:25:34 -0400 |
commit | 98954df6917cb8f7e65f4f0f79ed641112fcf6b6 (patch) | |
tree | 64c6d17b7f05b8b1d7322f9d05201e374d779c6b /include/asm-arm/arch-iop3xx/iop331.h | |
parent | cdf3f8e0387e81477dee72ecb2e3be28feac05c8 (diff) |
[ARM] 3816/1: iop3xx: rename config symbols
Rename CONFIG_ARCH_IOP321 to CONFIG_ARCH_IOP32X and
CONFIG_ARCH_IOP331 to CONFIG_ARCH_IOP33X.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm/arch-iop3xx/iop331.h')
-rw-r--r-- | include/asm-arm/arch-iop3xx/iop331.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/arch-iop3xx/iop331.h b/include/asm-arm/arch-iop3xx/iop331.h index fbf0cc11bdd..4d7bcc62cb3 100644 --- a/include/asm-arm/arch-iop3xx/iop331.h +++ b/include/asm-arm/arch-iop3xx/iop331.h | |||
@@ -20,7 +20,7 @@ | |||
20 | * IOP3xx variants but behave slightly differently on each. | 20 | * IOP3xx variants but behave slightly differently on each. |
21 | */ | 21 | */ |
22 | #ifndef __ASSEMBLY__ | 22 | #ifndef __ASSEMBLY__ |
23 | #ifdef CONFIG_ARCH_IOP331 | 23 | #ifdef CONFIG_ARCH_IOP33X |
24 | /*#define iop_is_331() ((processor_id & 0xffffffb0) == 0x69054090) */ | 24 | /*#define iop_is_331() ((processor_id & 0xffffffb0) == 0x69054090) */ |
25 | #define iop_is_331() ((processor_id & 0xffffff30) == 0x69054010) | 25 | #define iop_is_331() ((processor_id & 0xffffff30) == 0x69054010) |
26 | #else | 26 | #else |
@@ -257,7 +257,7 @@ | |||
257 | #define IOP331_TU_TISR (volatile u32 *)IOP331_REG_ADDR(0x000007E8) | 257 | #define IOP331_TU_TISR (volatile u32 *)IOP331_REG_ADDR(0x000007E8) |
258 | #define IOP331_TU_WDTCR (volatile u32 *)IOP331_REG_ADDR(0x000007EC) | 258 | #define IOP331_TU_WDTCR (volatile u32 *)IOP331_REG_ADDR(0x000007EC) |
259 | 259 | ||
260 | #if defined(CONFIG_ARCH_IOP331) | 260 | #if defined(CONFIG_ARCH_IOP33X) |
261 | #define IOP331_TICK_RATE 266000000 /* 266 MHz IB clock */ | 261 | #define IOP331_TICK_RATE 266000000 /* 266 MHz IB clock */ |
262 | #endif | 262 | #endif |
263 | 263 | ||