diff options
Diffstat (limited to 'arch/arm/mach-versatile')
-rw-r--r-- | arch/arm/mach-versatile/core.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/debug-macro.S | 23 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/dma.h | 20 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/entry-macro.S | 44 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/hardware.h | 52 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/io.h | 32 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/irqs.h | 211 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/memory.h | 38 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/platform.h | 510 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/system.h | 49 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/timex.h | 23 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/uncompress.h | 46 | ||||
-rw-r--r-- | arch/arm/mach-versatile/include/mach/vmalloc.h | 21 | ||||
-rw-r--r-- | arch/arm/mach-versatile/pci.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/versatile_ab.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-versatile/versatile_pb.c | 2 |
16 files changed, 1073 insertions, 4 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index a7dd09436cbc..d75e795c893e 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | #include <asm/cnt32_to_63.h> | 32 | #include <asm/cnt32_to_63.h> |
33 | #include <asm/system.h> | 33 | #include <asm/system.h> |
34 | #include <asm/hardware.h> | 34 | #include <mach/hardware.h> |
35 | #include <asm/io.h> | 35 | #include <asm/io.h> |
36 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
37 | #include <asm/leds.h> | 37 | #include <asm/leds.h> |
diff --git a/arch/arm/mach-versatile/include/mach/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S new file mode 100644 index 000000000000..b4ac00eacf68 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/debug-macro.S | |||
@@ -0,0 +1,23 @@ | |||
1 | /* arch/arm/mach-versatile/include/mach/debug-macro.S | ||
2 | * | ||
3 | * Debugging macro include header | ||
4 | * | ||
5 | * Copyright (C) 1994-1999 Russell King | ||
6 | * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | */ | ||
13 | |||
14 | .macro addruart,rx | ||
15 | mrc p15, 0, \rx, c1, c0 | ||
16 | tst \rx, #1 @ MMU enabled? | ||
17 | moveq \rx, #0x10000000 | ||
18 | movne \rx, #0xf1000000 @ virtual base | ||
19 | orr \rx, \rx, #0x001F0000 | ||
20 | orr \rx, \rx, #0x00001000 | ||
21 | .endm | ||
22 | |||
23 | #include <asm/hardware/debug-pl01x.S> | ||
diff --git a/arch/arm/mach-versatile/include/mach/dma.h b/arch/arm/mach-versatile/include/mach/dma.h new file mode 100644 index 000000000000..0aabf12c8834 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/dma.h | |||
@@ -0,0 +1,20 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/dma.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited. | ||
5 | * Copyright (C) 1997,1998 Russell King | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
diff --git a/arch/arm/mach-versatile/include/mach/entry-macro.S b/arch/arm/mach-versatile/include/mach/entry-macro.S new file mode 100644 index 000000000000..8c8020980585 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/entry-macro.S | |||
@@ -0,0 +1,44 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/entry-macro.S | ||
3 | * | ||
4 | * Low-level IRQ helper macros for Versatile platforms | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | #include <mach/hardware.h> | ||
11 | #include <asm/hardware/vic.h> | ||
12 | |||
13 | .macro disable_fiq | ||
14 | .endm | ||
15 | |||
16 | .macro get_irqnr_preamble, base, tmp | ||
17 | ldr \base, =IO_ADDRESS(VERSATILE_VIC_BASE) | ||
18 | .endm | ||
19 | |||
20 | .macro arch_ret_to_user, tmp1, tmp2 | ||
21 | .endm | ||
22 | |||
23 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
24 | ldr \irqstat, [\base, #VIC_IRQ_STATUS] @ get masked status | ||
25 | mov \irqnr, #0 | ||
26 | teq \irqstat, #0 | ||
27 | beq 1003f | ||
28 | |||
29 | 1001: tst \irqstat, #15 | ||
30 | bne 1002f | ||
31 | add \irqnr, \irqnr, #4 | ||
32 | movs \irqstat, \irqstat, lsr #4 | ||
33 | bne 1001b | ||
34 | 1002: tst \irqstat, #1 | ||
35 | bne 1003f | ||
36 | add \irqnr, \irqnr, #1 | ||
37 | movs \irqstat, \irqstat, lsr #1 | ||
38 | bne 1002b | ||
39 | 1003: /* EQ will be set if no irqs pending */ | ||
40 | |||
41 | @ clz \irqnr, \irqstat | ||
42 | @1003: /* EQ will be set if we reach MAXIRQNUM */ | ||
43 | .endm | ||
44 | |||
diff --git a/arch/arm/mach-versatile/include/mach/hardware.h b/arch/arm/mach-versatile/include/mach/hardware.h new file mode 100644 index 000000000000..7aa906c93154 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/hardware.h | |||
@@ -0,0 +1,52 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/hardware.h | ||
3 | * | ||
4 | * This file contains the hardware definitions of the Versatile boards. | ||
5 | * | ||
6 | * Copyright (C) 2003 ARM Limited. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | */ | ||
22 | #ifndef __ASM_ARCH_HARDWARE_H | ||
23 | #define __ASM_ARCH_HARDWARE_H | ||
24 | |||
25 | #include <asm/sizes.h> | ||
26 | #include <mach/platform.h> | ||
27 | |||
28 | /* | ||
29 | * PCI space virtual addresses | ||
30 | */ | ||
31 | #define VERSATILE_PCI_VIRT_BASE (void __iomem *)0xe8000000ul | ||
32 | #define VERSATILE_PCI_CFG_VIRT_BASE (void __iomem *)0xe9000000ul | ||
33 | |||
34 | #if 0 | ||
35 | #define VERSATILE_PCI_VIRT_MEM_BASE0 0xf4000000 | ||
36 | #define VERSATILE_PCI_VIRT_MEM_BASE1 0xf5000000 | ||
37 | #define VERSATILE_PCI_VIRT_MEM_BASE2 0xf6000000 | ||
38 | |||
39 | #define PCIO_BASE VERSATILE_PCI_VIRT_MEM_BASE0 | ||
40 | #define PCIMEM_BASE VERSATILE_PCI_VIRT_MEM_BASE1 | ||
41 | #endif | ||
42 | |||
43 | /* CIK guesswork */ | ||
44 | #define PCIBIOS_MIN_IO 0x44000000 | ||
45 | #define PCIBIOS_MIN_MEM 0x50000000 | ||
46 | |||
47 | #define pcibios_assign_all_busses() 1 | ||
48 | |||
49 | /* macro to get at IO space when running virtually */ | ||
50 | #define IO_ADDRESS(x) (((x) & 0x0fffffff) + (((x) >> 4) & 0x0f000000) + 0xf0000000) | ||
51 | |||
52 | #endif | ||
diff --git a/arch/arm/mach-versatile/include/mach/io.h b/arch/arm/mach-versatile/include/mach/io.h new file mode 100644 index 000000000000..c0b9dd1d0257 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/io.h | |||
@@ -0,0 +1,32 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/io.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | #ifndef __ASM_ARM_ARCH_IO_H | ||
21 | #define __ASM_ARM_ARCH_IO_H | ||
22 | |||
23 | #define IO_SPACE_LIMIT 0xffffffff | ||
24 | |||
25 | static inline void __iomem *__io(unsigned long addr) | ||
26 | { | ||
27 | return (void __iomem *)addr; | ||
28 | } | ||
29 | #define __io(a) __io(a) | ||
30 | #define __mem_pci(a) (a) | ||
31 | |||
32 | #endif | ||
diff --git a/arch/arm/mach-versatile/include/mach/irqs.h b/arch/arm/mach-versatile/include/mach/irqs.h new file mode 100644 index 000000000000..216a1312e62e --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/irqs.h | |||
@@ -0,0 +1,211 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/irqs.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * Copyright (C) 2000 Deep Blue Solutions Ltd. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | #include <mach/platform.h> | ||
23 | |||
24 | /* | ||
25 | * IRQ interrupts definitions are the same as the INT definitions | ||
26 | * held within platform.h | ||
27 | */ | ||
28 | #define IRQ_VIC_START 0 | ||
29 | #define IRQ_WDOGINT (IRQ_VIC_START + INT_WDOGINT) | ||
30 | #define IRQ_SOFTINT (IRQ_VIC_START + INT_SOFTINT) | ||
31 | #define IRQ_COMMRx (IRQ_VIC_START + INT_COMMRx) | ||
32 | #define IRQ_COMMTx (IRQ_VIC_START + INT_COMMTx) | ||
33 | #define IRQ_TIMERINT0_1 (IRQ_VIC_START + INT_TIMERINT0_1) | ||
34 | #define IRQ_TIMERINT2_3 (IRQ_VIC_START + INT_TIMERINT2_3) | ||
35 | #define IRQ_GPIOINT0 (IRQ_VIC_START + INT_GPIOINT0) | ||
36 | #define IRQ_GPIOINT1 (IRQ_VIC_START + INT_GPIOINT1) | ||
37 | #define IRQ_GPIOINT2 (IRQ_VIC_START + INT_GPIOINT2) | ||
38 | #define IRQ_GPIOINT3 (IRQ_VIC_START + INT_GPIOINT3) | ||
39 | #define IRQ_RTCINT (IRQ_VIC_START + INT_RTCINT) | ||
40 | #define IRQ_SSPINT (IRQ_VIC_START + INT_SSPINT) | ||
41 | #define IRQ_UARTINT0 (IRQ_VIC_START + INT_UARTINT0) | ||
42 | #define IRQ_UARTINT1 (IRQ_VIC_START + INT_UARTINT1) | ||
43 | #define IRQ_UARTINT2 (IRQ_VIC_START + INT_UARTINT2) | ||
44 | #define IRQ_SCIINT (IRQ_VIC_START + INT_SCIINT) | ||
45 | #define IRQ_CLCDINT (IRQ_VIC_START + INT_CLCDINT) | ||
46 | #define IRQ_DMAINT (IRQ_VIC_START + INT_DMAINT) | ||
47 | #define IRQ_PWRFAILINT (IRQ_VIC_START + INT_PWRFAILINT) | ||
48 | #define IRQ_MBXINT (IRQ_VIC_START + INT_MBXINT) | ||
49 | #define IRQ_GNDINT (IRQ_VIC_START + INT_GNDINT) | ||
50 | #define IRQ_VICSOURCE21 (IRQ_VIC_START + INT_VICSOURCE21) | ||
51 | #define IRQ_VICSOURCE22 (IRQ_VIC_START + INT_VICSOURCE22) | ||
52 | #define IRQ_VICSOURCE23 (IRQ_VIC_START + INT_VICSOURCE23) | ||
53 | #define IRQ_VICSOURCE24 (IRQ_VIC_START + INT_VICSOURCE24) | ||
54 | #define IRQ_VICSOURCE25 (IRQ_VIC_START + INT_VICSOURCE25) | ||
55 | #define IRQ_VICSOURCE26 (IRQ_VIC_START + INT_VICSOURCE26) | ||
56 | #define IRQ_VICSOURCE27 (IRQ_VIC_START + INT_VICSOURCE27) | ||
57 | #define IRQ_VICSOURCE28 (IRQ_VIC_START + INT_VICSOURCE28) | ||
58 | #define IRQ_VICSOURCE29 (IRQ_VIC_START + INT_VICSOURCE29) | ||
59 | #define IRQ_VICSOURCE30 (IRQ_VIC_START + INT_VICSOURCE30) | ||
60 | #define IRQ_VICSOURCE31 (IRQ_VIC_START + INT_VICSOURCE31) | ||
61 | #define IRQ_VIC_END (IRQ_VIC_START + 31) | ||
62 | |||
63 | #define IRQMASK_WDOGINT INTMASK_WDOGINT | ||
64 | #define IRQMASK_SOFTINT INTMASK_SOFTINT | ||
65 | #define IRQMASK_COMMRx INTMASK_COMMRx | ||
66 | #define IRQMASK_COMMTx INTMASK_COMMTx | ||
67 | #define IRQMASK_TIMERINT0_1 INTMASK_TIMERINT0_1 | ||
68 | #define IRQMASK_TIMERINT2_3 INTMASK_TIMERINT2_3 | ||
69 | #define IRQMASK_GPIOINT0 INTMASK_GPIOINT0 | ||
70 | #define IRQMASK_GPIOINT1 INTMASK_GPIOINT1 | ||
71 | #define IRQMASK_GPIOINT2 INTMASK_GPIOINT2 | ||
72 | #define IRQMASK_GPIOINT3 INTMASK_GPIOINT3 | ||
73 | #define IRQMASK_RTCINT INTMASK_RTCINT | ||
74 | #define IRQMASK_SSPINT INTMASK_SSPINT | ||
75 | #define IRQMASK_UARTINT0 INTMASK_UARTINT0 | ||
76 | #define IRQMASK_UARTINT1 INTMASK_UARTINT1 | ||
77 | #define IRQMASK_UARTINT2 INTMASK_UARTINT2 | ||
78 | #define IRQMASK_SCIINT INTMASK_SCIINT | ||
79 | #define IRQMASK_CLCDINT INTMASK_CLCDINT | ||
80 | #define IRQMASK_DMAINT INTMASK_DMAINT | ||
81 | #define IRQMASK_PWRFAILINT INTMASK_PWRFAILINT | ||
82 | #define IRQMASK_MBXINT INTMASK_MBXINT | ||
83 | #define IRQMASK_GNDINT INTMASK_GNDINT | ||
84 | #define IRQMASK_VICSOURCE21 INTMASK_VICSOURCE21 | ||
85 | #define IRQMASK_VICSOURCE22 INTMASK_VICSOURCE22 | ||
86 | #define IRQMASK_VICSOURCE23 INTMASK_VICSOURCE23 | ||
87 | #define IRQMASK_VICSOURCE24 INTMASK_VICSOURCE24 | ||
88 | #define IRQMASK_VICSOURCE25 INTMASK_VICSOURCE25 | ||
89 | #define IRQMASK_VICSOURCE26 INTMASK_VICSOURCE26 | ||
90 | #define IRQMASK_VICSOURCE27 INTMASK_VICSOURCE27 | ||
91 | #define IRQMASK_VICSOURCE28 INTMASK_VICSOURCE28 | ||
92 | #define IRQMASK_VICSOURCE29 INTMASK_VICSOURCE29 | ||
93 | #define IRQMASK_VICSOURCE30 INTMASK_VICSOURCE30 | ||
94 | #define IRQMASK_VICSOURCE31 INTMASK_VICSOURCE31 | ||
95 | |||
96 | /* | ||
97 | * FIQ interrupts definitions are the same as the INT definitions. | ||
98 | */ | ||
99 | #define FIQ_WDOGINT INT_WDOGINT | ||
100 | #define FIQ_SOFTINT INT_SOFTINT | ||
101 | #define FIQ_COMMRx INT_COMMRx | ||
102 | #define FIQ_COMMTx INT_COMMTx | ||
103 | #define FIQ_TIMERINT0_1 INT_TIMERINT0_1 | ||
104 | #define FIQ_TIMERINT2_3 INT_TIMERINT2_3 | ||
105 | #define FIQ_GPIOINT0 INT_GPIOINT0 | ||
106 | #define FIQ_GPIOINT1 INT_GPIOINT1 | ||
107 | #define FIQ_GPIOINT2 INT_GPIOINT2 | ||
108 | #define FIQ_GPIOINT3 INT_GPIOINT3 | ||
109 | #define FIQ_RTCINT INT_RTCINT | ||
110 | #define FIQ_SSPINT INT_SSPINT | ||
111 | #define FIQ_UARTINT0 INT_UARTINT0 | ||
112 | #define FIQ_UARTINT1 INT_UARTINT1 | ||
113 | #define FIQ_UARTINT2 INT_UARTINT2 | ||
114 | #define FIQ_SCIINT INT_SCIINT | ||
115 | #define FIQ_CLCDINT INT_CLCDINT | ||
116 | #define FIQ_DMAINT INT_DMAINT | ||
117 | #define FIQ_PWRFAILINT INT_PWRFAILINT | ||
118 | #define FIQ_MBXINT INT_MBXINT | ||
119 | #define FIQ_GNDINT INT_GNDINT | ||
120 | #define FIQ_VICSOURCE21 INT_VICSOURCE21 | ||
121 | #define FIQ_VICSOURCE22 INT_VICSOURCE22 | ||
122 | #define FIQ_VICSOURCE23 INT_VICSOURCE23 | ||
123 | #define FIQ_VICSOURCE24 INT_VICSOURCE24 | ||
124 | #define FIQ_VICSOURCE25 INT_VICSOURCE25 | ||
125 | #define FIQ_VICSOURCE26 INT_VICSOURCE26 | ||
126 | #define FIQ_VICSOURCE27 INT_VICSOURCE27 | ||
127 | #define FIQ_VICSOURCE28 INT_VICSOURCE28 | ||
128 | #define FIQ_VICSOURCE29 INT_VICSOURCE29 | ||
129 | #define FIQ_VICSOURCE30 INT_VICSOURCE30 | ||
130 | #define FIQ_VICSOURCE31 INT_VICSOURCE31 | ||
131 | |||
132 | |||
133 | #define FIQMASK_WDOGINT INTMASK_WDOGINT | ||
134 | #define FIQMASK_SOFTINT INTMASK_SOFTINT | ||
135 | #define FIQMASK_COMMRx INTMASK_COMMRx | ||
136 | #define FIQMASK_COMMTx INTMASK_COMMTx | ||
137 | #define FIQMASK_TIMERINT0_1 INTMASK_TIMERINT0_1 | ||
138 | #define FIQMASK_TIMERINT2_3 INTMASK_TIMERINT2_3 | ||
139 | #define FIQMASK_GPIOINT0 INTMASK_GPIOINT0 | ||
140 | #define FIQMASK_GPIOINT1 INTMASK_GPIOINT1 | ||
141 | #define FIQMASK_GPIOINT2 INTMASK_GPIOINT2 | ||
142 | #define FIQMASK_GPIOINT3 INTMASK_GPIOINT3 | ||
143 | #define FIQMASK_RTCINT INTMASK_RTCINT | ||
144 | #define FIQMASK_SSPINT INTMASK_SSPINT | ||
145 | #define FIQMASK_UARTINT0 INTMASK_UARTINT0 | ||
146 | #define FIQMASK_UARTINT1 INTMASK_UARTINT1 | ||
147 | #define FIQMASK_UARTINT2 INTMASK_UARTINT2 | ||
148 | #define FIQMASK_SCIINT INTMASK_SCIINT | ||
149 | #define FIQMASK_CLCDINT INTMASK_CLCDINT | ||
150 | #define FIQMASK_DMAINT INTMASK_DMAINT | ||
151 | #define FIQMASK_PWRFAILINT INTMASK_PWRFAILINT | ||
152 | #define FIQMASK_MBXINT INTMASK_MBXINT | ||
153 | #define FIQMASK_GNDINT INTMASK_GNDINT | ||
154 | #define FIQMASK_VICSOURCE21 INTMASK_VICSOURCE21 | ||
155 | #define FIQMASK_VICSOURCE22 INTMASK_VICSOURCE22 | ||
156 | #define FIQMASK_VICSOURCE23 INTMASK_VICSOURCE23 | ||
157 | #define FIQMASK_VICSOURCE24 INTMASK_VICSOURCE24 | ||
158 | #define FIQMASK_VICSOURCE25 INTMASK_VICSOURCE25 | ||
159 | #define FIQMASK_VICSOURCE26 INTMASK_VICSOURCE26 | ||
160 | #define FIQMASK_VICSOURCE27 INTMASK_VICSOURCE27 | ||
161 | #define FIQMASK_VICSOURCE28 INTMASK_VICSOURCE28 | ||
162 | #define FIQMASK_VICSOURCE29 INTMASK_VICSOURCE29 | ||
163 | #define FIQMASK_VICSOURCE30 INTMASK_VICSOURCE30 | ||
164 | #define FIQMASK_VICSOURCE31 INTMASK_VICSOURCE31 | ||
165 | |||
166 | /* | ||
167 | * Secondary interrupt controller | ||
168 | */ | ||
169 | #define IRQ_SIC_START 32 | ||
170 | #define IRQ_SIC_MMCI0B (IRQ_SIC_START + SIC_INT_MMCI0B) | ||
171 | #define IRQ_SIC_MMCI1B (IRQ_SIC_START + SIC_INT_MMCI1B) | ||
172 | #define IRQ_SIC_KMI0 (IRQ_SIC_START + SIC_INT_KMI0) | ||
173 | #define IRQ_SIC_KMI1 (IRQ_SIC_START + SIC_INT_KMI1) | ||
174 | #define IRQ_SIC_SCI3 (IRQ_SIC_START + SIC_INT_SCI3) | ||
175 | #define IRQ_SIC_UART3 (IRQ_SIC_START + SIC_INT_UART3) | ||
176 | #define IRQ_SIC_CLCD (IRQ_SIC_START + SIC_INT_CLCD) | ||
177 | #define IRQ_SIC_TOUCH (IRQ_SIC_START + SIC_INT_TOUCH) | ||
178 | #define IRQ_SIC_KEYPAD (IRQ_SIC_START + SIC_INT_KEYPAD) | ||
179 | #define IRQ_SIC_DoC (IRQ_SIC_START + SIC_INT_DoC) | ||
180 | #define IRQ_SIC_MMCI0A (IRQ_SIC_START + SIC_INT_MMCI0A) | ||
181 | #define IRQ_SIC_MMCI1A (IRQ_SIC_START + SIC_INT_MMCI1A) | ||
182 | #define IRQ_SIC_AACI (IRQ_SIC_START + SIC_INT_AACI) | ||
183 | #define IRQ_SIC_ETH (IRQ_SIC_START + SIC_INT_ETH) | ||
184 | #define IRQ_SIC_USB (IRQ_SIC_START + SIC_INT_USB) | ||
185 | #define IRQ_SIC_PCI0 (IRQ_SIC_START + SIC_INT_PCI0) | ||
186 | #define IRQ_SIC_PCI1 (IRQ_SIC_START + SIC_INT_PCI1) | ||
187 | #define IRQ_SIC_PCI2 (IRQ_SIC_START + SIC_INT_PCI2) | ||
188 | #define IRQ_SIC_PCI3 (IRQ_SIC_START + SIC_INT_PCI3) | ||
189 | #define IRQ_SIC_END 63 | ||
190 | |||
191 | #define SIC_IRQMASK_MMCI0B SIC_INTMASK_MMCI0B | ||
192 | #define SIC_IRQMASK_MMCI1B SIC_INTMASK_MMCI1B | ||
193 | #define SIC_IRQMASK_KMI0 SIC_INTMASK_KMI0 | ||
194 | #define SIC_IRQMASK_KMI1 SIC_INTMASK_KMI1 | ||
195 | #define SIC_IRQMASK_SCI3 SIC_INTMASK_SCI3 | ||
196 | #define SIC_IRQMASK_UART3 SIC_INTMASK_UART3 | ||
197 | #define SIC_IRQMASK_CLCD SIC_INTMASK_CLCD | ||
198 | #define SIC_IRQMASK_TOUCH SIC_INTMASK_TOUCH | ||
199 | #define SIC_IRQMASK_KEYPAD SIC_INTMASK_KEYPAD | ||
200 | #define SIC_IRQMASK_DoC SIC_INTMASK_DoC | ||
201 | #define SIC_IRQMASK_MMCI0A SIC_INTMASK_MMCI0A | ||
202 | #define SIC_IRQMASK_MMCI1A SIC_INTMASK_MMCI1A | ||
203 | #define SIC_IRQMASK_AACI SIC_INTMASK_AACI | ||
204 | #define SIC_IRQMASK_ETH SIC_INTMASK_ETH | ||
205 | #define SIC_IRQMASK_USB SIC_INTMASK_USB | ||
206 | #define SIC_IRQMASK_PCI0 SIC_INTMASK_PCI0 | ||
207 | #define SIC_IRQMASK_PCI1 SIC_INTMASK_PCI1 | ||
208 | #define SIC_IRQMASK_PCI2 SIC_INTMASK_PCI2 | ||
209 | #define SIC_IRQMASK_PCI3 SIC_INTMASK_PCI3 | ||
210 | |||
211 | #define NR_IRQS 64 | ||
diff --git a/arch/arm/mach-versatile/include/mach/memory.h b/arch/arm/mach-versatile/include/mach/memory.h new file mode 100644 index 000000000000..b6315c0602ac --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/memory.h | |||
@@ -0,0 +1,38 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/memory.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | #ifndef __ASM_ARCH_MEMORY_H | ||
21 | #define __ASM_ARCH_MEMORY_H | ||
22 | |||
23 | /* | ||
24 | * Physical DRAM offset. | ||
25 | */ | ||
26 | #define PHYS_OFFSET UL(0x00000000) | ||
27 | |||
28 | /* | ||
29 | * Virtual view <-> DMA view memory address translations | ||
30 | * virt_to_bus: Used to translate the virtual address to an | ||
31 | * address suitable to be passed to set_dma_addr | ||
32 | * bus_to_virt: Used to convert an address for DMA operations | ||
33 | * to an address that the kernel can use. | ||
34 | */ | ||
35 | #define __virt_to_bus(x) ((x) - PAGE_OFFSET) | ||
36 | #define __bus_to_virt(x) ((x) + PAGE_OFFSET) | ||
37 | |||
38 | #endif | ||
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h new file mode 100644 index 000000000000..27cbe6a3f220 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/platform.h | |||
@@ -0,0 +1,510 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/platform.h | ||
3 | * | ||
4 | * Copyright (c) ARM Limited 2003. All rights reserved. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #ifndef __address_h | ||
22 | #define __address_h 1 | ||
23 | |||
24 | /* | ||
25 | * Memory definitions | ||
26 | */ | ||
27 | #define VERSATILE_BOOT_ROM_LO 0x30000000 /* DoC Base (64Mb)...*/ | ||
28 | #define VERSATILE_BOOT_ROM_HI 0x30000000 | ||
29 | #define VERSATILE_BOOT_ROM_BASE VERSATILE_BOOT_ROM_HI /* Normal position */ | ||
30 | #define VERSATILE_BOOT_ROM_SIZE SZ_64M | ||
31 | |||
32 | #define VERSATILE_SSRAM_BASE /* VERSATILE_SSMC_BASE ? */ | ||
33 | #define VERSATILE_SSRAM_SIZE SZ_2M | ||
34 | |||
35 | #define VERSATILE_FLASH_BASE 0x34000000 | ||
36 | #define VERSATILE_FLASH_SIZE SZ_64M | ||
37 | |||
38 | /* | ||
39 | * SDRAM | ||
40 | */ | ||
41 | #define VERSATILE_SDRAM_BASE 0x00000000 | ||
42 | |||
43 | /* | ||
44 | * Logic expansion modules | ||
45 | * | ||
46 | */ | ||
47 | |||
48 | |||
49 | /* ------------------------------------------------------------------------ | ||
50 | * Versatile Registers | ||
51 | * ------------------------------------------------------------------------ | ||
52 | * | ||
53 | */ | ||
54 | #define VERSATILE_SYS_ID_OFFSET 0x00 | ||
55 | #define VERSATILE_SYS_SW_OFFSET 0x04 | ||
56 | #define VERSATILE_SYS_LED_OFFSET 0x08 | ||
57 | #define VERSATILE_SYS_OSC0_OFFSET 0x0C | ||
58 | |||
59 | #if defined(CONFIG_ARCH_VERSATILE_PB) | ||
60 | #define VERSATILE_SYS_OSC1_OFFSET 0x10 | ||
61 | #define VERSATILE_SYS_OSC2_OFFSET 0x14 | ||
62 | #define VERSATILE_SYS_OSC3_OFFSET 0x18 | ||
63 | #define VERSATILE_SYS_OSC4_OFFSET 0x1C | ||
64 | #elif defined(CONFIG_MACH_VERSATILE_AB) | ||
65 | #define VERSATILE_SYS_OSC1_OFFSET 0x1C | ||
66 | #endif | ||
67 | |||
68 | #define VERSATILE_SYS_OSCCLCD_OFFSET 0x1c | ||
69 | |||
70 | #define VERSATILE_SYS_LOCK_OFFSET 0x20 | ||
71 | #define VERSATILE_SYS_100HZ_OFFSET 0x24 | ||
72 | #define VERSATILE_SYS_CFGDATA1_OFFSET 0x28 | ||
73 | #define VERSATILE_SYS_CFGDATA2_OFFSET 0x2C | ||
74 | #define VERSATILE_SYS_FLAGS_OFFSET 0x30 | ||
75 | #define VERSATILE_SYS_FLAGSSET_OFFSET 0x30 | ||
76 | #define VERSATILE_SYS_FLAGSCLR_OFFSET 0x34 | ||
77 | #define VERSATILE_SYS_NVFLAGS_OFFSET 0x38 | ||
78 | #define VERSATILE_SYS_NVFLAGSSET_OFFSET 0x38 | ||
79 | #define VERSATILE_SYS_NVFLAGSCLR_OFFSET 0x3C | ||
80 | #define VERSATILE_SYS_RESETCTL_OFFSET 0x40 | ||
81 | #define VERSATILE_SYS_PCICTL_OFFSET 0x44 | ||
82 | #define VERSATILE_SYS_MCI_OFFSET 0x48 | ||
83 | #define VERSATILE_SYS_FLASH_OFFSET 0x4C | ||
84 | #define VERSATILE_SYS_CLCD_OFFSET 0x50 | ||
85 | #define VERSATILE_SYS_CLCDSER_OFFSET 0x54 | ||
86 | #define VERSATILE_SYS_BOOTCS_OFFSET 0x58 | ||
87 | #define VERSATILE_SYS_24MHz_OFFSET 0x5C | ||
88 | #define VERSATILE_SYS_MISC_OFFSET 0x60 | ||
89 | #define VERSATILE_SYS_TEST_OSC0_OFFSET 0x80 | ||
90 | #define VERSATILE_SYS_TEST_OSC1_OFFSET 0x84 | ||
91 | #define VERSATILE_SYS_TEST_OSC2_OFFSET 0x88 | ||
92 | #define VERSATILE_SYS_TEST_OSC3_OFFSET 0x8C | ||
93 | #define VERSATILE_SYS_TEST_OSC4_OFFSET 0x90 | ||
94 | |||
95 | #define VERSATILE_SYS_BASE 0x10000000 | ||
96 | #define VERSATILE_SYS_ID (VERSATILE_SYS_BASE + VERSATILE_SYS_ID_OFFSET) | ||
97 | #define VERSATILE_SYS_SW (VERSATILE_SYS_BASE + VERSATILE_SYS_SW_OFFSET) | ||
98 | #define VERSATILE_SYS_LED (VERSATILE_SYS_BASE + VERSATILE_SYS_LED_OFFSET) | ||
99 | #define VERSATILE_SYS_OSC0 (VERSATILE_SYS_BASE + VERSATILE_SYS_OSC0_OFFSET) | ||
100 | #define VERSATILE_SYS_OSC1 (VERSATILE_SYS_BASE + VERSATILE_SYS_OSC1_OFFSET) | ||
101 | |||
102 | #if defined(CONFIG_ARCH_VERSATILE_PB) | ||
103 | #define VERSATILE_SYS_OSC2 (VERSATILE_SYS_BASE + VERSATILE_SYS_OSC2_OFFSET) | ||
104 | #define VERSATILE_SYS_OSC3 (VERSATILE_SYS_BASE + VERSATILE_SYS_OSC3_OFFSET) | ||
105 | #define VERSATILE_SYS_OSC4 (VERSATILE_SYS_BASE + VERSATILE_SYS_OSC4_OFFSET) | ||
106 | #endif | ||
107 | |||
108 | #define VERSATILE_SYS_LOCK (VERSATILE_SYS_BASE + VERSATILE_SYS_LOCK_OFFSET) | ||
109 | #define VERSATILE_SYS_100HZ (VERSATILE_SYS_BASE + VERSATILE_SYS_100HZ_OFFSET) | ||
110 | #define VERSATILE_SYS_CFGDATA1 (VERSATILE_SYS_BASE + VERSATILE_SYS_CFGDATA1_OFFSET) | ||
111 | #define VERSATILE_SYS_CFGDATA2 (VERSATILE_SYS_BASE + VERSATILE_SYS_CFGDATA2_OFFSET) | ||
112 | #define VERSATILE_SYS_FLAGS (VERSATILE_SYS_BASE + VERSATILE_SYS_FLAGS_OFFSET) | ||
113 | #define VERSATILE_SYS_FLAGSSET (VERSATILE_SYS_BASE + VERSATILE_SYS_FLAGSSET_OFFSET) | ||
114 | #define VERSATILE_SYS_FLAGSCLR (VERSATILE_SYS_BASE + VERSATILE_SYS_FLAGSCLR_OFFSET) | ||
115 | #define VERSATILE_SYS_NVFLAGS (VERSATILE_SYS_BASE + VERSATILE_SYS_NVFLAGS_OFFSET) | ||
116 | #define VERSATILE_SYS_NVFLAGSSET (VERSATILE_SYS_BASE + VERSATILE_SYS_NVFLAGSSET_OFFSET) | ||
117 | #define VERSATILE_SYS_NVFLAGSCLR (VERSATILE_SYS_BASE + VERSATILE_SYS_NVFLAGSCLR_OFFSET) | ||
118 | #define VERSATILE_SYS_RESETCTL (VERSATILE_SYS_BASE + VERSATILE_SYS_RESETCTL_OFFSET) | ||
119 | #define VERSATILE_SYS_PCICTL (VERSATILE_SYS_BASE + VERSATILE_SYS_PCICTL_OFFSET) | ||
120 | #define VERSATILE_SYS_MCI (VERSATILE_SYS_BASE + VERSATILE_SYS_MCI_OFFSET) | ||
121 | #define VERSATILE_SYS_FLASH (VERSATILE_SYS_BASE + VERSATILE_SYS_FLASH_OFFSET) | ||
122 | #define VERSATILE_SYS_CLCD (VERSATILE_SYS_BASE + VERSATILE_SYS_CLCD_OFFSET) | ||
123 | #define VERSATILE_SYS_CLCDSER (VERSATILE_SYS_BASE + VERSATILE_SYS_CLCDSER_OFFSET) | ||
124 | #define VERSATILE_SYS_BOOTCS (VERSATILE_SYS_BASE + VERSATILE_SYS_BOOTCS_OFFSET) | ||
125 | #define VERSATILE_SYS_24MHz (VERSATILE_SYS_BASE + VERSATILE_SYS_24MHz_OFFSET) | ||
126 | #define VERSATILE_SYS_MISC (VERSATILE_SYS_BASE + VERSATILE_SYS_MISC_OFFSET) | ||
127 | #define VERSATILE_SYS_TEST_OSC0 (VERSATILE_SYS_BASE + VERSATILE_SYS_TEST_OSC0_OFFSET) | ||
128 | #define VERSATILE_SYS_TEST_OSC1 (VERSATILE_SYS_BASE + VERSATILE_SYS_TEST_OSC1_OFFSET) | ||
129 | #define VERSATILE_SYS_TEST_OSC2 (VERSATILE_SYS_BASE + VERSATILE_SYS_TEST_OSC2_OFFSET) | ||
130 | #define VERSATILE_SYS_TEST_OSC3 (VERSATILE_SYS_BASE + VERSATILE_SYS_TEST_OSC3_OFFSET) | ||
131 | #define VERSATILE_SYS_TEST_OSC4 (VERSATILE_SYS_BASE + VERSATILE_SYS_TEST_OSC4_OFFSET) | ||
132 | |||
133 | /* | ||
134 | * Values for VERSATILE_SYS_RESET_CTRL | ||
135 | */ | ||
136 | #define VERSATILE_SYS_CTRL_RESET_CONFIGCLR 0x01 | ||
137 | #define VERSATILE_SYS_CTRL_RESET_CONFIGINIT 0x02 | ||
138 | #define VERSATILE_SYS_CTRL_RESET_DLLRESET 0x03 | ||
139 | #define VERSATILE_SYS_CTRL_RESET_PLLRESET 0x04 | ||
140 | #define VERSATILE_SYS_CTRL_RESET_POR 0x05 | ||
141 | #define VERSATILE_SYS_CTRL_RESET_DoC 0x06 | ||
142 | |||
143 | #define VERSATILE_SYS_CTRL_LED (1 << 0) | ||
144 | |||
145 | |||
146 | /* ------------------------------------------------------------------------ | ||
147 | * Versatile control registers | ||
148 | * ------------------------------------------------------------------------ | ||
149 | */ | ||
150 | |||
151 | /* | ||
152 | * VERSATILE_IDFIELD | ||
153 | * | ||
154 | * 31:24 = manufacturer (0x41 = ARM) | ||
155 | * 23:16 = architecture (0x08 = AHB system bus, ASB processor bus) | ||
156 | * 15:12 = FPGA (0x3 = XVC600 or XVC600E) | ||
157 | * 11:4 = build value | ||
158 | * 3:0 = revision number (0x1 = rev B (AHB)) | ||
159 | */ | ||
160 | |||
161 | /* | ||
162 | * VERSATILE_SYS_LOCK | ||
163 | * control access to SYS_OSCx, SYS_CFGDATAx, SYS_RESETCTL, | ||
164 | * SYS_CLD, SYS_BOOTCS | ||
165 | */ | ||
166 | #define VERSATILE_SYS_LOCK_LOCKED (1 << 16) | ||
167 | #define VERSATILE_SYS_LOCKVAL_MASK 0xFFFF /* write 0xA05F to enable write access */ | ||
168 | |||
169 | /* | ||
170 | * VERSATILE_SYS_FLASH | ||
171 | */ | ||
172 | #define VERSATILE_FLASHPROG_FLVPPEN (1 << 0) /* Enable writing to flash */ | ||
173 | |||
174 | /* | ||
175 | * VERSATILE_INTREG | ||
176 | * - used to acknowledge and control MMCI and UART interrupts | ||
177 | */ | ||
178 | #define VERSATILE_INTREG_WPROT 0x00 /* MMC protection status (no interrupt generated) */ | ||
179 | #define VERSATILE_INTREG_RI0 0x01 /* Ring indicator UART0 is asserted, */ | ||
180 | #define VERSATILE_INTREG_CARDIN 0x08 /* MMCI card in detect */ | ||
181 | /* write 1 to acknowledge and clear */ | ||
182 | #define VERSATILE_INTREG_RI1 0x02 /* Ring indicator UART1 is asserted, */ | ||
183 | #define VERSATILE_INTREG_CARDINSERT 0x03 /* Signal insertion of MMC card */ | ||
184 | |||
185 | /* | ||
186 | * VERSATILE peripheral addresses | ||
187 | */ | ||
188 | #define VERSATILE_PCI_CORE_BASE 0x10001000 /* PCI core control */ | ||
189 | #define VERSATILE_I2C_BASE 0x10002000 /* I2C control */ | ||
190 | #define VERSATILE_SIC_BASE 0x10003000 /* Secondary interrupt controller */ | ||
191 | #define VERSATILE_AACI_BASE 0x10004000 /* Audio */ | ||
192 | #define VERSATILE_MMCI0_BASE 0x10005000 /* MMC interface */ | ||
193 | #define VERSATILE_KMI0_BASE 0x10006000 /* KMI interface */ | ||
194 | #define VERSATILE_KMI1_BASE 0x10007000 /* KMI 2nd interface */ | ||
195 | #define VERSATILE_CHAR_LCD_BASE 0x10008000 /* Character LCD */ | ||
196 | #define VERSATILE_UART3_BASE 0x10009000 /* UART 3 */ | ||
197 | #define VERSATILE_SCI1_BASE 0x1000A000 | ||
198 | #define VERSATILE_MMCI1_BASE 0x1000B000 /* MMC Interface */ | ||
199 | /* 0x1000C000 - 0x1000CFFF = reserved */ | ||
200 | #define VERSATILE_ETH_BASE 0x10010000 /* Ethernet */ | ||
201 | #define VERSATILE_USB_BASE 0x10020000 /* USB */ | ||
202 | /* 0x10030000 - 0x100FFFFF = reserved */ | ||
203 | #define VERSATILE_SMC_BASE 0x10100000 /* SMC */ | ||
204 | #define VERSATILE_MPMC_BASE 0x10110000 /* MPMC */ | ||
205 | #define VERSATILE_CLCD_BASE 0x10120000 /* CLCD */ | ||
206 | #define VERSATILE_DMAC_BASE 0x10130000 /* DMA controller */ | ||
207 | #define VERSATILE_VIC_BASE 0x10140000 /* Vectored interrupt controller */ | ||
208 | #define VERSATILE_PERIPH_BASE 0x10150000 /* off-chip peripherals alias from */ | ||
209 | /* 0x10000000 - 0x100FFFFF */ | ||
210 | #define VERSATILE_AHBM_BASE 0x101D0000 /* AHB monitor */ | ||
211 | #define VERSATILE_SCTL_BASE 0x101E0000 /* System controller */ | ||
212 | #define VERSATILE_WATCHDOG_BASE 0x101E1000 /* Watchdog */ | ||
213 | #define VERSATILE_TIMER0_1_BASE 0x101E2000 /* Timer 0 and 1 */ | ||
214 | #define VERSATILE_TIMER2_3_BASE 0x101E3000 /* Timer 2 and 3 */ | ||
215 | #define VERSATILE_GPIO0_BASE 0x101E4000 /* GPIO port 0 */ | ||
216 | #define VERSATILE_GPIO1_BASE 0x101E5000 /* GPIO port 1 */ | ||
217 | #define VERSATILE_GPIO2_BASE 0x101E6000 /* GPIO port 2 */ | ||
218 | #define VERSATILE_GPIO3_BASE 0x101E7000 /* GPIO port 3 */ | ||
219 | #define VERSATILE_RTC_BASE 0x101E8000 /* Real Time Clock */ | ||
220 | /* 0x101E9000 - reserved */ | ||
221 | #define VERSATILE_SCI_BASE 0x101F0000 /* Smart card controller */ | ||
222 | #define VERSATILE_UART0_BASE 0x101F1000 /* Uart 0 */ | ||
223 | #define VERSATILE_UART1_BASE 0x101F2000 /* Uart 1 */ | ||
224 | #define VERSATILE_UART2_BASE 0x101F3000 /* Uart 2 */ | ||
225 | #define VERSATILE_SSP_BASE 0x101F4000 /* Synchronous Serial Port */ | ||
226 | |||
227 | #define VERSATILE_SSMC_BASE 0x20000000 /* SSMC */ | ||
228 | #define VERSATILE_IB2_BASE 0x24000000 /* IB2 module */ | ||
229 | #define VERSATILE_MBX_BASE 0x40000000 /* MBX */ | ||
230 | |||
231 | /* PCI space */ | ||
232 | #define VERSATILE_PCI_BASE 0x41000000 /* PCI Interface */ | ||
233 | #define VERSATILE_PCI_CFG_BASE 0x42000000 | ||
234 | #define VERSATILE_PCI_MEM_BASE0 0x44000000 | ||
235 | #define VERSATILE_PCI_MEM_BASE1 0x50000000 | ||
236 | #define VERSATILE_PCI_MEM_BASE2 0x60000000 | ||
237 | /* Sizes of above maps */ | ||
238 | #define VERSATILE_PCI_BASE_SIZE 0x01000000 | ||
239 | #define VERSATILE_PCI_CFG_BASE_SIZE 0x02000000 | ||
240 | #define VERSATILE_PCI_MEM_BASE0_SIZE 0x0c000000 /* 32Mb */ | ||
241 | #define VERSATILE_PCI_MEM_BASE1_SIZE 0x10000000 /* 256Mb */ | ||
242 | #define VERSATILE_PCI_MEM_BASE2_SIZE 0x10000000 /* 256Mb */ | ||
243 | |||
244 | #define VERSATILE_SDRAM67_BASE 0x70000000 /* SDRAM banks 6 and 7 */ | ||
245 | #define VERSATILE_LT_BASE 0x80000000 /* Logic Tile expansion */ | ||
246 | |||
247 | /* | ||
248 | * Disk on Chip | ||
249 | */ | ||
250 | #define VERSATILE_DOC_BASE 0x2C000000 | ||
251 | #define VERSATILE_DOC_SIZE (16 << 20) | ||
252 | #define VERSATILE_DOC_PAGE_SIZE 512 | ||
253 | #define VERSATILE_DOC_TOTAL_PAGES (DOC_SIZE / PAGE_SIZE) | ||
254 | |||
255 | #define ERASE_UNIT_PAGES 32 | ||
256 | #define START_PAGE 0x80 | ||
257 | |||
258 | /* | ||
259 | * LED settings, bits [7:0] | ||
260 | */ | ||
261 | #define VERSATILE_SYS_LED0 (1 << 0) | ||
262 | #define VERSATILE_SYS_LED1 (1 << 1) | ||
263 | #define VERSATILE_SYS_LED2 (1 << 2) | ||
264 | #define VERSATILE_SYS_LED3 (1 << 3) | ||
265 | #define VERSATILE_SYS_LED4 (1 << 4) | ||
266 | #define VERSATILE_SYS_LED5 (1 << 5) | ||
267 | #define VERSATILE_SYS_LED6 (1 << 6) | ||
268 | #define VERSATILE_SYS_LED7 (1 << 7) | ||
269 | |||
270 | #define ALL_LEDS 0xFF | ||
271 | |||
272 | #define LED_BANK VERSATILE_SYS_LED | ||
273 | |||
274 | /* | ||
275 | * Control registers | ||
276 | */ | ||
277 | #define VERSATILE_IDFIELD_OFFSET 0x0 /* Versatile build information */ | ||
278 | #define VERSATILE_FLASHPROG_OFFSET 0x4 /* Flash devices */ | ||
279 | #define VERSATILE_INTREG_OFFSET 0x8 /* Interrupt control */ | ||
280 | #define VERSATILE_DECODE_OFFSET 0xC /* Fitted logic modules */ | ||
281 | |||
282 | |||
283 | /* ------------------------------------------------------------------------ | ||
284 | * Versatile Interrupt Controller - control registers | ||
285 | * ------------------------------------------------------------------------ | ||
286 | * | ||
287 | * Offsets from interrupt controller base | ||
288 | * | ||
289 | * System Controller interrupt controller base is | ||
290 | * | ||
291 | * VERSATILE_IC_BASE | ||
292 | * | ||
293 | * Core Module interrupt controller base is | ||
294 | * | ||
295 | * VERSATILE_SYS_IC | ||
296 | * | ||
297 | */ | ||
298 | /* VIC definitions in include/asm-arm/hardware/vic.h */ | ||
299 | |||
300 | #define SIC_IRQ_STATUS 0 | ||
301 | #define SIC_IRQ_RAW_STATUS 0x04 | ||
302 | #define SIC_IRQ_ENABLE 0x08 | ||
303 | #define SIC_IRQ_ENABLE_SET 0x08 | ||
304 | #define SIC_IRQ_ENABLE_CLEAR 0x0C | ||
305 | #define SIC_INT_SOFT_SET 0x10 | ||
306 | #define SIC_INT_SOFT_CLEAR 0x14 | ||
307 | #define SIC_INT_PIC_ENABLE 0x20 /* read status of pass through mask */ | ||
308 | #define SIC_INT_PIC_ENABLES 0x20 /* set interrupt pass through bits */ | ||
309 | #define SIC_INT_PIC_ENABLEC 0x24 /* Clear interrupt pass through bits */ | ||
310 | |||
311 | /* ------------------------------------------------------------------------ | ||
312 | * Interrupts - bit assignment (primary) | ||
313 | * ------------------------------------------------------------------------ | ||
314 | */ | ||
315 | |||
316 | #define INT_WDOGINT 0 /* Watchdog timer */ | ||
317 | #define INT_SOFTINT 1 /* Software interrupt */ | ||
318 | #define INT_COMMRx 2 /* Debug Comm Rx interrupt */ | ||
319 | #define INT_COMMTx 3 /* Debug Comm Tx interrupt */ | ||
320 | #define INT_TIMERINT0_1 4 /* Timer 0 and 1 */ | ||
321 | #define INT_TIMERINT2_3 5 /* Timer 2 and 3 */ | ||
322 | #define INT_GPIOINT0 6 /* GPIO 0 */ | ||
323 | #define INT_GPIOINT1 7 /* GPIO 1 */ | ||
324 | #define INT_GPIOINT2 8 /* GPIO 2 */ | ||
325 | #define INT_GPIOINT3 9 /* GPIO 3 */ | ||
326 | #define INT_RTCINT 10 /* Real Time Clock */ | ||
327 | #define INT_SSPINT 11 /* Synchronous Serial Port */ | ||
328 | #define INT_UARTINT0 12 /* UART 0 on development chip */ | ||
329 | #define INT_UARTINT1 13 /* UART 1 on development chip */ | ||
330 | #define INT_UARTINT2 14 /* UART 2 on development chip */ | ||
331 | #define INT_SCIINT 15 /* Smart Card Interface */ | ||
332 | #define INT_CLCDINT 16 /* CLCD controller */ | ||
333 | #define INT_DMAINT 17 /* DMA controller */ | ||
334 | #define INT_PWRFAILINT 18 /* Power failure */ | ||
335 | #define INT_MBXINT 19 /* Graphics processor */ | ||
336 | #define INT_GNDINT 20 /* Reserved */ | ||
337 | /* External interrupt signals from logic tiles or secondary controller */ | ||
338 | #define INT_VICSOURCE21 21 /* Disk on Chip */ | ||
339 | #define INT_VICSOURCE22 22 /* MCI0A */ | ||
340 | #define INT_VICSOURCE23 23 /* MCI1A */ | ||
341 | #define INT_VICSOURCE24 24 /* AACI */ | ||
342 | #define INT_VICSOURCE25 25 /* Ethernet */ | ||
343 | #define INT_VICSOURCE26 26 /* USB */ | ||
344 | #define INT_VICSOURCE27 27 /* PCI 0 */ | ||
345 | #define INT_VICSOURCE28 28 /* PCI 1 */ | ||
346 | #define INT_VICSOURCE29 29 /* PCI 2 */ | ||
347 | #define INT_VICSOURCE30 30 /* PCI 3 */ | ||
348 | #define INT_VICSOURCE31 31 /* SIC source */ | ||
349 | |||
350 | /* | ||
351 | * Interrupt bit positions | ||
352 | * | ||
353 | */ | ||
354 | #define INTMASK_WDOGINT (1 << INT_WDOGINT) | ||
355 | #define INTMASK_SOFTINT (1 << INT_SOFTINT) | ||
356 | #define INTMASK_COMMRx (1 << INT_COMMRx) | ||
357 | #define INTMASK_COMMTx (1 << INT_COMMTx) | ||
358 | #define INTMASK_TIMERINT0_1 (1 << INT_TIMERINT0_1) | ||
359 | #define INTMASK_TIMERINT2_3 (1 << INT_TIMERINT2_3) | ||
360 | #define INTMASK_GPIOINT0 (1 << INT_GPIOINT0) | ||
361 | #define INTMASK_GPIOINT1 (1 << INT_GPIOINT1) | ||
362 | #define INTMASK_GPIOINT2 (1 << INT_GPIOINT2) | ||
363 | #define INTMASK_GPIOINT3 (1 << INT_GPIOINT3) | ||
364 | #define INTMASK_RTCINT (1 << INT_RTCINT) | ||
365 | #define INTMASK_SSPINT (1 << INT_SSPINT) | ||
366 | #define INTMASK_UARTINT0 (1 << INT_UARTINT0) | ||
367 | #define INTMASK_UARTINT1 (1 << INT_UARTINT1) | ||
368 | #define INTMASK_UARTINT2 (1 << INT_UARTINT2) | ||
369 | #define INTMASK_SCIINT (1 << INT_SCIINT) | ||
370 | #define INTMASK_CLCDINT (1 << INT_CLCDINT) | ||
371 | #define INTMASK_DMAINT (1 << INT_DMAINT) | ||
372 | #define INTMASK_PWRFAILINT (1 << INT_PWRFAILINT) | ||
373 | #define INTMASK_MBXINT (1 << INT_MBXINT) | ||
374 | #define INTMASK_GNDINT (1 << INT_GNDINT) | ||
375 | #define INTMASK_VICSOURCE21 (1 << INT_VICSOURCE21) | ||
376 | #define INTMASK_VICSOURCE22 (1 << INT_VICSOURCE22) | ||
377 | #define INTMASK_VICSOURCE23 (1 << INT_VICSOURCE23) | ||
378 | #define INTMASK_VICSOURCE24 (1 << INT_VICSOURCE24) | ||
379 | #define INTMASK_VICSOURCE25 (1 << INT_VICSOURCE25) | ||
380 | #define INTMASK_VICSOURCE26 (1 << INT_VICSOURCE26) | ||
381 | #define INTMASK_VICSOURCE27 (1 << INT_VICSOURCE27) | ||
382 | #define INTMASK_VICSOURCE28 (1 << INT_VICSOURCE28) | ||
383 | #define INTMASK_VICSOURCE29 (1 << INT_VICSOURCE29) | ||
384 | #define INTMASK_VICSOURCE30 (1 << INT_VICSOURCE30) | ||
385 | #define INTMASK_VICSOURCE31 (1 << INT_VICSOURCE31) | ||
386 | |||
387 | |||
388 | #define VERSATILE_SC_VALID_INT 0x003FFFFF | ||
389 | |||
390 | #define MAXIRQNUM 31 | ||
391 | #define MAXFIQNUM 31 | ||
392 | #define MAXSWINUM 31 | ||
393 | |||
394 | /* ------------------------------------------------------------------------ | ||
395 | * Interrupts - bit assignment (secondary) | ||
396 | * ------------------------------------------------------------------------ | ||
397 | */ | ||
398 | #define SIC_INT_MMCI0B 1 /* Multimedia Card 0B */ | ||
399 | #define SIC_INT_MMCI1B 2 /* Multimedia Card 1B */ | ||
400 | #define SIC_INT_KMI0 3 /* Keyboard/Mouse port 0 */ | ||
401 | #define SIC_INT_KMI1 4 /* Keyboard/Mouse port 1 */ | ||
402 | #define SIC_INT_SCI3 5 /* Smart Card interface */ | ||
403 | #define SIC_INT_UART3 6 /* UART 3 empty or data available */ | ||
404 | #define SIC_INT_CLCD 7 /* Character LCD */ | ||
405 | #define SIC_INT_TOUCH 8 /* Touchscreen */ | ||
406 | #define SIC_INT_KEYPAD 9 /* Key pressed on display keypad */ | ||
407 | /* 10:20 - reserved */ | ||
408 | #define SIC_INT_DoC 21 /* Disk on Chip memory controller */ | ||
409 | #define SIC_INT_MMCI0A 22 /* MMC 0A */ | ||
410 | #define SIC_INT_MMCI1A 23 /* MMC 1A */ | ||
411 | #define SIC_INT_AACI 24 /* Audio Codec */ | ||
412 | #define SIC_INT_ETH 25 /* Ethernet controller */ | ||
413 | #define SIC_INT_USB 26 /* USB controller */ | ||
414 | #define SIC_INT_PCI0 27 | ||
415 | #define SIC_INT_PCI1 28 | ||
416 | #define SIC_INT_PCI2 29 | ||
417 | #define SIC_INT_PCI3 30 | ||
418 | |||
419 | |||
420 | #define SIC_INTMASK_MMCI0B (1 << SIC_INT_MMCI0B) | ||
421 | #define SIC_INTMASK_MMCI1B (1 << SIC_INT_MMCI1B) | ||
422 | #define SIC_INTMASK_KMI0 (1 << SIC_INT_KMI0) | ||
423 | #define SIC_INTMASK_KMI1 (1 << SIC_INT_KMI1) | ||
424 | #define SIC_INTMASK_SCI3 (1 << SIC_INT_SCI3) | ||
425 | #define SIC_INTMASK_UART3 (1 << SIC_INT_UART3) | ||
426 | #define SIC_INTMASK_CLCD (1 << SIC_INT_CLCD) | ||
427 | #define SIC_INTMASK_TOUCH (1 << SIC_INT_TOUCH) | ||
428 | #define SIC_INTMASK_KEYPAD (1 << SIC_INT_KEYPAD) | ||
429 | #define SIC_INTMASK_DoC (1 << SIC_INT_DoC) | ||
430 | #define SIC_INTMASK_MMCI0A (1 << SIC_INT_MMCI0A) | ||
431 | #define SIC_INTMASK_MMCI1A (1 << SIC_INT_MMCI1A) | ||
432 | #define SIC_INTMASK_AACI (1 << SIC_INT_AACI) | ||
433 | #define SIC_INTMASK_ETH (1 << SIC_INT_ETH) | ||
434 | #define SIC_INTMASK_USB (1 << SIC_INT_USB) | ||
435 | #define SIC_INTMASK_PCI0 (1 << SIC_INT_PCI0) | ||
436 | #define SIC_INTMASK_PCI1 (1 << SIC_INT_PCI1) | ||
437 | #define SIC_INTMASK_PCI2 (1 << SIC_INT_PCI2) | ||
438 | #define SIC_INTMASK_PCI3 (1 << SIC_INT_PCI3) | ||
439 | /* | ||
440 | * Application Flash | ||
441 | * | ||
442 | */ | ||
443 | #define FLASH_BASE VERSATILE_FLASH_BASE | ||
444 | #define FLASH_SIZE VERSATILE_FLASH_SIZE | ||
445 | #define FLASH_END (FLASH_BASE + FLASH_SIZE - 1) | ||
446 | #define FLASH_BLOCK_SIZE SZ_128K | ||
447 | |||
448 | /* | ||
449 | * Boot Flash | ||
450 | * | ||
451 | */ | ||
452 | #define EPROM_BASE VERSATILE_BOOT_ROM_HI | ||
453 | #define EPROM_SIZE VERSATILE_BOOT_ROM_SIZE | ||
454 | #define EPROM_END (EPROM_BASE + EPROM_SIZE - 1) | ||
455 | |||
456 | /* | ||
457 | * Clean base - dummy | ||
458 | * | ||
459 | */ | ||
460 | #define CLEAN_BASE EPROM_BASE | ||
461 | |||
462 | /* | ||
463 | * System controller bit assignment | ||
464 | */ | ||
465 | #define VERSATILE_REFCLK 0 | ||
466 | #define VERSATILE_TIMCLK 1 | ||
467 | |||
468 | #define VERSATILE_TIMER1_EnSel 15 | ||
469 | #define VERSATILE_TIMER2_EnSel 17 | ||
470 | #define VERSATILE_TIMER3_EnSel 19 | ||
471 | #define VERSATILE_TIMER4_EnSel 21 | ||
472 | |||
473 | |||
474 | #define MAX_TIMER 2 | ||
475 | #define MAX_PERIOD 699050 | ||
476 | #define TICKS_PER_uSEC 1 | ||
477 | |||
478 | /* | ||
479 | * These are useconds NOT ticks. | ||
480 | * | ||
481 | */ | ||
482 | #define mSEC_1 1000 | ||
483 | #define mSEC_5 (mSEC_1 * 5) | ||
484 | #define mSEC_10 (mSEC_1 * 10) | ||
485 | #define mSEC_25 (mSEC_1 * 25) | ||
486 | #define SEC_1 (mSEC_1 * 1000) | ||
487 | |||
488 | #define VERSATILE_CSR_BASE 0x10000000 | ||
489 | #define VERSATILE_CSR_SIZE 0x10000000 | ||
490 | |||
491 | #ifdef CONFIG_MACH_VERSATILE_AB | ||
492 | /* | ||
493 | * IB2 Versatile/AB expansion board definitions | ||
494 | */ | ||
495 | #define VERSATILE_IB2_CAMERA_BANK VERSATILE_IB2_BASE | ||
496 | #define VERSATILE_IB2_KBD_DATAREG (VERSATILE_IB2_BASE + 0x01000000) | ||
497 | |||
498 | /* VICINTSOURCE27 */ | ||
499 | #define VERSATILE_IB2_INT_BASE (VERSATILE_IB2_BASE + 0x02000000) | ||
500 | #define VERSATILE_IB2_IER (VERSATILE_IB2_INT_BASE + 0) | ||
501 | #define VERSATILE_IB2_ISR (VERSATILE_IB2_INT_BASE + 4) | ||
502 | |||
503 | #define VERSATILE_IB2_CTL_BASE (VERSATILE_IB2_BASE + 0x03000000) | ||
504 | #define VERSATILE_IB2_CTRL (VERSATILE_IB2_CTL_BASE + 0) | ||
505 | #define VERSATILE_IB2_STAT (VERSATILE_IB2_CTL_BASE + 4) | ||
506 | #endif | ||
507 | |||
508 | #endif | ||
509 | |||
510 | /* END */ | ||
diff --git a/arch/arm/mach-versatile/include/mach/system.h b/arch/arm/mach-versatile/include/mach/system.h new file mode 100644 index 000000000000..91fa559c7cca --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/system.h | |||
@@ -0,0 +1,49 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/system.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * Copyright (C) 2000 Deep Blue Solutions Ltd | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | #ifndef __ASM_ARCH_SYSTEM_H | ||
22 | #define __ASM_ARCH_SYSTEM_H | ||
23 | |||
24 | #include <mach/hardware.h> | ||
25 | #include <asm/io.h> | ||
26 | #include <mach/platform.h> | ||
27 | |||
28 | static inline void arch_idle(void) | ||
29 | { | ||
30 | /* | ||
31 | * This should do all the clock switching | ||
32 | * and wait for interrupt tricks | ||
33 | */ | ||
34 | cpu_do_idle(); | ||
35 | } | ||
36 | |||
37 | static inline void arch_reset(char mode) | ||
38 | { | ||
39 | u32 val; | ||
40 | |||
41 | val = __raw_readl(IO_ADDRESS(VERSATILE_SYS_RESETCTL)) & ~0x7; | ||
42 | val |= 0x105; | ||
43 | |||
44 | __raw_writel(0xa05f, IO_ADDRESS(VERSATILE_SYS_LOCK)); | ||
45 | __raw_writel(val, IO_ADDRESS(VERSATILE_SYS_RESETCTL)); | ||
46 | __raw_writel(0, IO_ADDRESS(VERSATILE_SYS_LOCK)); | ||
47 | } | ||
48 | |||
49 | #endif | ||
diff --git a/arch/arm/mach-versatile/include/mach/timex.h b/arch/arm/mach-versatile/include/mach/timex.h new file mode 100644 index 000000000000..426199b1add5 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/timex.h | |||
@@ -0,0 +1,23 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/timex.h | ||
3 | * | ||
4 | * Versatile architecture timex specifications | ||
5 | * | ||
6 | * Copyright (C) 2003 ARM Limited | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License as published by | ||
10 | * the Free Software Foundation; either version 2 of the License, or | ||
11 | * (at your option) any later version. | ||
12 | * | ||
13 | * This program is distributed in the hope that it will be useful, | ||
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
16 | * GNU General Public License for more details. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License | ||
19 | * along with this program; if not, write to the Free Software | ||
20 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
21 | */ | ||
22 | |||
23 | #define CLOCK_TICK_RATE (50000000 / 16) | ||
diff --git a/arch/arm/mach-versatile/include/mach/uncompress.h b/arch/arm/mach-versatile/include/mach/uncompress.h new file mode 100644 index 000000000000..3dd0048afb34 --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/uncompress.h | |||
@@ -0,0 +1,46 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/uncompress.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License as published by | ||
8 | * the Free Software Foundation; either version 2 of the License, or | ||
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | #define AMBA_UART_DR (*(volatile unsigned char *)0x101F1000) | ||
21 | #define AMBA_UART_LCRH (*(volatile unsigned char *)0x101F102C) | ||
22 | #define AMBA_UART_CR (*(volatile unsigned char *)0x101F1030) | ||
23 | #define AMBA_UART_FR (*(volatile unsigned char *)0x101F1018) | ||
24 | |||
25 | /* | ||
26 | * This does not append a newline | ||
27 | */ | ||
28 | static inline void putc(int c) | ||
29 | { | ||
30 | while (AMBA_UART_FR & (1 << 5)) | ||
31 | barrier(); | ||
32 | |||
33 | AMBA_UART_DR = c; | ||
34 | } | ||
35 | |||
36 | static inline void flush(void) | ||
37 | { | ||
38 | while (AMBA_UART_FR & (1 << 3)) | ||
39 | barrier(); | ||
40 | } | ||
41 | |||
42 | /* | ||
43 | * nothing to do | ||
44 | */ | ||
45 | #define arch_decomp_setup() | ||
46 | #define arch_decomp_wdog() | ||
diff --git a/arch/arm/mach-versatile/include/mach/vmalloc.h b/arch/arm/mach-versatile/include/mach/vmalloc.h new file mode 100644 index 000000000000..427e3612db5d --- /dev/null +++ b/arch/arm/mach-versatile/include/mach/vmalloc.h | |||
@@ -0,0 +1,21 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-versatile/include/mach/vmalloc.h | ||
3 | * | ||
4 | * Copyright (C) 2003 ARM Limited | ||
5 | * Copyright (C) 2000 Russell King. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | #define VMALLOC_END (PAGE_OFFSET + 0x18000000) | ||
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c index ca8290159432..36f23f896503 100644 --- a/arch/arm/mach-versatile/pci.c +++ b/arch/arm/mach-versatile/pci.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
24 | 24 | ||
25 | #include <asm/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <asm/io.h> | 26 | #include <asm/io.h> |
27 | #include <asm/irq.h> | 27 | #include <asm/irq.h> |
28 | #include <asm/system.h> | 28 | #include <asm/system.h> |
diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c index b257ef78ef45..76375c64413a 100644 --- a/arch/arm/mach-versatile/versatile_ab.c +++ b/arch/arm/mach-versatile/versatile_ab.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | 26 | ||
27 | #include <asm/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |
diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index be439bb9d450..1725f019fc85 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/sysdev.h> | 24 | #include <linux/sysdev.h> |
25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
26 | 26 | ||
27 | #include <asm/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
29 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
30 | #include <asm/mach-types.h> | 30 | #include <asm/mach-types.h> |