diff options
Diffstat (limited to 'include/asm-arm/arch-iop32x')
-rw-r--r-- | include/asm-arm/arch-iop32x/iop321.h | 21 | ||||
-rw-r--r-- | include/asm-arm/arch-iop32x/timex.h | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/include/asm-arm/arch-iop32x/iop321.h b/include/asm-arm/arch-iop32x/iop321.h index bd96b8d55a76..34fe07f0a44e 100644 --- a/include/asm-arm/arch-iop32x/iop321.h +++ b/include/asm-arm/arch-iop32x/iop321.h | |||
@@ -151,10 +151,6 @@ | |||
151 | #define IOP321_FINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007DC) | 151 | #define IOP321_FINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007DC) |
152 | 152 | ||
153 | /* Timers */ | 153 | /* Timers */ |
154 | |||
155 | #define IOP321_TU_TMR0 (volatile u32 *)IOP321_REG_ADDR(0x000007E0) | ||
156 | #define IOP321_TU_TMR1 (volatile u32 *)IOP321_REG_ADDR(0x000007E4) | ||
157 | |||
158 | #ifdef CONFIG_ARCH_IQ80321 | 154 | #ifdef CONFIG_ARCH_IQ80321 |
159 | #define IOP321_TICK_RATE 200000000 /* 200 MHz clock */ | 155 | #define IOP321_TICK_RATE 200000000 /* 200 MHz clock */ |
160 | #elif defined(CONFIG_ARCH_IQ31244) | 156 | #elif defined(CONFIG_ARCH_IQ31244) |
@@ -166,23 +162,6 @@ | |||
166 | #define IOP321_TICK_RATE 200000000 /* 33.333333 Mhz crystal */ | 162 | #define IOP321_TICK_RATE 200000000 /* 33.333333 Mhz crystal */ |
167 | #endif | 163 | #endif |
168 | 164 | ||
169 | #define IOP321_TMR_TC 0x01 | ||
170 | #define IOP321_TMR_EN 0x02 | ||
171 | #define IOP321_TMR_RELOAD 0x04 | ||
172 | #define IOP321_TMR_PRIVILEGED 0x09 | ||
173 | |||
174 | #define IOP321_TMR_RATIO_1_1 0x00 | ||
175 | #define IOP321_TMR_RATIO_4_1 0x10 | ||
176 | #define IOP321_TMR_RATIO_8_1 0x20 | ||
177 | #define IOP321_TMR_RATIO_16_1 0x30 | ||
178 | |||
179 | #define IOP321_TU_TCR0 (volatile u32 *)IOP321_REG_ADDR(0x000007E8) | ||
180 | #define IOP321_TU_TCR1 (volatile u32 *)IOP321_REG_ADDR(0x000007EC) | ||
181 | #define IOP321_TU_TRR0 (volatile u32 *)IOP321_REG_ADDR(0x000007F0) | ||
182 | #define IOP321_TU_TRR1 (volatile u32 *)IOP321_REG_ADDR(0x000007F4) | ||
183 | #define IOP321_TU_TISR (volatile u32 *)IOP321_REG_ADDR(0x000007F8) | ||
184 | #define IOP321_TU_WDTCR (volatile u32 *)IOP321_REG_ADDR(0x000007FC) | ||
185 | |||
186 | /* Application accelerator unit 0x00000800 - 0x000008FF */ | 165 | /* Application accelerator unit 0x00000800 - 0x000008FF */ |
187 | #define IOP321_AAU_ACR (volatile u32 *)IOP321_REG_ADDR(0x00000800) | 166 | #define IOP321_AAU_ACR (volatile u32 *)IOP321_REG_ADDR(0x00000800) |
188 | #define IOP321_AAU_ASR (volatile u32 *)IOP321_REG_ADDR(0x00000804) | 167 | #define IOP321_AAU_ASR (volatile u32 *)IOP321_REG_ADDR(0x00000804) |
diff --git a/include/asm-arm/arch-iop32x/timex.h b/include/asm-arm/arch-iop32x/timex.h index 08badde2e820..328f37282c3e 100644 --- a/include/asm-arm/arch-iop32x/timex.h +++ b/include/asm-arm/arch-iop32x/timex.h | |||
@@ -5,4 +5,4 @@ | |||
5 | */ | 5 | */ |
6 | #include <asm/hardware.h> | 6 | #include <asm/hardware.h> |
7 | 7 | ||
8 | #define CLOCK_TICK_RATE IOP321_TICK_RATE | 8 | #define CLOCK_TICK_RATE (100 * HZ) |