diff options
Diffstat (limited to 'include/asm-arm/arch-iop32x')
-rw-r--r-- | include/asm-arm/arch-iop32x/iop321.h | 12 | ||||
-rw-r--r-- | include/asm-arm/arch-iop32x/iq31244.h | 7 | ||||
-rw-r--r-- | include/asm-arm/arch-iop32x/iq80321.h | 7 | ||||
-rw-r--r-- | include/asm-arm/arch-iop32x/irqs.h | 38 |
4 files changed, 0 insertions, 64 deletions
diff --git a/include/asm-arm/arch-iop32x/iop321.h b/include/asm-arm/arch-iop32x/iop321.h index 1e57e0094767..8042946327ed 100644 --- a/include/asm-arm/arch-iop32x/iop321.h +++ b/include/asm-arm/arch-iop32x/iop321.h | |||
@@ -150,18 +150,6 @@ | |||
150 | #define IOP321_IINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007D8) | 150 | #define IOP321_IINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007D8) |
151 | #define IOP321_FINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007DC) | 151 | #define IOP321_FINTSRC (volatile u32 *)IOP321_REG_ADDR(0x000007DC) |
152 | 152 | ||
153 | /* Timers */ | ||
154 | #ifdef CONFIG_ARCH_IQ80321 | ||
155 | #define IOP321_TICK_RATE 200000000 /* 200 MHz clock */ | ||
156 | #elif defined(CONFIG_ARCH_IQ31244) | ||
157 | #define IOP321_TICK_RATE 198000000 /* 33.000 MHz crystal */ | ||
158 | #endif | ||
159 | |||
160 | #ifdef CONFIG_ARCH_EP80219 | ||
161 | #undef IOP321_TICK_RATE | ||
162 | #define IOP321_TICK_RATE 200000000 /* 33.333333 Mhz crystal */ | ||
163 | #endif | ||
164 | |||
165 | /* Application accelerator unit 0x00000800 - 0x000008FF */ | 153 | /* Application accelerator unit 0x00000800 - 0x000008FF */ |
166 | #define IOP321_AAU_ACR (volatile u32 *)IOP321_REG_ADDR(0x00000800) | 154 | #define IOP321_AAU_ACR (volatile u32 *)IOP321_REG_ADDR(0x00000800) |
167 | #define IOP321_AAU_ASR (volatile u32 *)IOP321_REG_ADDR(0x00000804) | 155 | #define IOP321_AAU_ASR (volatile u32 *)IOP321_REG_ADDR(0x00000804) |
diff --git a/include/asm-arm/arch-iop32x/iq31244.h b/include/asm-arm/arch-iop32x/iq31244.h index f490063d2156..cf2d2343398d 100644 --- a/include/asm-arm/arch-iop32x/iq31244.h +++ b/include/asm-arm/arch-iop32x/iq31244.h | |||
@@ -7,18 +7,11 @@ | |||
7 | #ifndef _IQ31244_H_ | 7 | #ifndef _IQ31244_H_ |
8 | #define _IQ31244_H_ | 8 | #define _IQ31244_H_ |
9 | 9 | ||
10 | #define IQ31244_FLASHBASE 0xf0000000 /* Flash */ | ||
11 | #define IQ31244_FLASHSIZE 0x00800000 | ||
12 | #define IQ31244_FLASHWIDTH 2 | ||
13 | |||
14 | #define IQ31244_UART 0xfe800000 /* UART #1 */ | 10 | #define IQ31244_UART 0xfe800000 /* UART #1 */ |
15 | #define IQ31244_7SEG_1 0xfe840000 /* 7-Segment MSB */ | 11 | #define IQ31244_7SEG_1 0xfe840000 /* 7-Segment MSB */ |
16 | #define IQ31244_7SEG_0 0xfe850000 /* 7-Segment LSB (WO) */ | 12 | #define IQ31244_7SEG_0 0xfe850000 /* 7-Segment LSB (WO) */ |
17 | #define IQ31244_ROTARY_SW 0xfe8d0000 /* Rotary Switch */ | 13 | #define IQ31244_ROTARY_SW 0xfe8d0000 /* Rotary Switch */ |
18 | #define IQ31244_BATT_STAT 0xfe8f0000 /* Battery Status */ | 14 | #define IQ31244_BATT_STAT 0xfe8f0000 /* Battery Status */ |
19 | 15 | ||
20 | #ifndef __ASSEMBLY__ | ||
21 | extern void iq31244_map_io(void); | ||
22 | #endif | ||
23 | 16 | ||
24 | #endif // _IQ31244_H_ | 17 | #endif // _IQ31244_H_ |
diff --git a/include/asm-arm/arch-iop32x/iq80321.h b/include/asm-arm/arch-iop32x/iq80321.h index 7015a605ab64..55d70f49b7fd 100644 --- a/include/asm-arm/arch-iop32x/iq80321.h +++ b/include/asm-arm/arch-iop32x/iq80321.h | |||
@@ -7,18 +7,11 @@ | |||
7 | #ifndef _IQ80321_H_ | 7 | #ifndef _IQ80321_H_ |
8 | #define _IQ80321_H_ | 8 | #define _IQ80321_H_ |
9 | 9 | ||
10 | #define IQ80321_FLASHBASE 0xf0000000 /* Flash */ | ||
11 | #define IQ80321_FLASHSIZE 0x00800000 | ||
12 | #define IQ80321_FLASHWIDTH 1 | ||
13 | |||
14 | #define IQ80321_UART 0xfe800000 /* UART #1 */ | 10 | #define IQ80321_UART 0xfe800000 /* UART #1 */ |
15 | #define IQ80321_7SEG_1 0xfe840000 /* 7-Segment MSB */ | 11 | #define IQ80321_7SEG_1 0xfe840000 /* 7-Segment MSB */ |
16 | #define IQ80321_7SEG_0 0xfe850000 /* 7-Segment LSB (WO) */ | 12 | #define IQ80321_7SEG_0 0xfe850000 /* 7-Segment LSB (WO) */ |
17 | #define IQ80321_ROTARY_SW 0xfe8d0000 /* Rotary Switch */ | 13 | #define IQ80321_ROTARY_SW 0xfe8d0000 /* Rotary Switch */ |
18 | #define IQ80321_BATT_STAT 0xfe8f0000 /* Battery Status */ | 14 | #define IQ80321_BATT_STAT 0xfe8f0000 /* Battery Status */ |
19 | 15 | ||
20 | #ifndef __ASSEMBLY__ | ||
21 | extern void iq80321_map_io(void); | ||
22 | #endif | ||
23 | 16 | ||
24 | #endif // _IQ80321_H_ | 17 | #endif // _IQ80321_H_ |
diff --git a/include/asm-arm/arch-iop32x/irqs.h b/include/asm-arm/arch-iop32x/irqs.h index 9fefcf3372b1..a48327ced92e 100644 --- a/include/asm-arm/arch-iop32x/irqs.h +++ b/include/asm-arm/arch-iop32x/irqs.h | |||
@@ -47,42 +47,4 @@ | |||
47 | #define NR_IRQS 32 | 47 | #define NR_IRQS 32 |
48 | 48 | ||
49 | 49 | ||
50 | /* | ||
51 | * Interrupts available on the IQ80321 board | ||
52 | */ | ||
53 | |||
54 | /* | ||
55 | * On board devices | ||
56 | */ | ||
57 | #define IRQ_IQ80321_I82544 IRQ_IOP321_XINT0 | ||
58 | #define IRQ_IQ80321_UART IRQ_IOP321_XINT1 | ||
59 | |||
60 | /* | ||
61 | * PCI interrupts | ||
62 | */ | ||
63 | #define IRQ_IQ80321_INTA IRQ_IOP321_XINT0 | ||
64 | #define IRQ_IQ80321_INTB IRQ_IOP321_XINT1 | ||
65 | #define IRQ_IQ80321_INTC IRQ_IOP321_XINT2 | ||
66 | #define IRQ_IQ80321_INTD IRQ_IOP321_XINT3 | ||
67 | |||
68 | /* | ||
69 | * Interrupts on the IQ31244 board | ||
70 | */ | ||
71 | |||
72 | /* | ||
73 | * On board devices | ||
74 | */ | ||
75 | #define IRQ_IQ31244_UART IRQ_IOP321_XINT1 | ||
76 | #define IRQ_IQ31244_I82546 IRQ_IOP321_XINT0 | ||
77 | #define IRQ_IQ31244_SATA IRQ_IOP321_XINT2 | ||
78 | #define IRQ_IQ31244_PCIX_SLOT IRQ_IOP321_XINT3 | ||
79 | |||
80 | /* | ||
81 | * PCI interrupts | ||
82 | */ | ||
83 | #define IRQ_IQ31244_INTA IRQ_IOP321_XINT0 | ||
84 | #define IRQ_IQ31244_INTB IRQ_IOP321_XINT1 | ||
85 | #define IRQ_IQ31244_INTC IRQ_IOP321_XINT2 | ||
86 | #define IRQ_IQ31244_INTD IRQ_IOP321_XINT3 | ||
87 | |||
88 | #endif // _IRQ_H_ | 50 | #endif // _IRQ_H_ |