aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-iop33x/setup.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-iop33x/setup.c')
-rw-r--r--arch/arm/mach-iop33x/setup.c35
1 files changed, 3 insertions, 32 deletions
diff --git a/arch/arm/mach-iop33x/setup.c b/arch/arm/mach-iop33x/setup.c
index c14c7da5ec4c..67cb21cb0ad9 100644
--- a/arch/arm/mach-iop33x/setup.c
+++ b/arch/arm/mach-iop33x/setup.c
@@ -28,26 +28,10 @@
28#include <asm/hardware.h> 28#include <asm/hardware.h>
29#include <asm/mach-types.h> 29#include <asm/mach-types.h>
30#include <asm/mach/arch.h> 30#include <asm/mach/arch.h>
31#include <asm/hardware/iop3xx.h>
31 32
32#define IOP331_UART_XTAL 33334000 33#define IOP331_UART_XTAL 33334000
33 34
34/*
35 * Standard IO mapping for all IOP331 based systems
36 */
37static struct map_desc iop331_std_desc[] __initdata = {
38 { /* mem mapped registers */
39 .virtual = IOP331_VIRT_MEM_BASE,
40 .pfn = __phys_to_pfn(IOP331_PHYS_MEM_BASE),
41 .length = 0x00002000,
42 .type = MT_DEVICE
43 }, { /* PCI IO space */
44 .virtual = IOP331_PCI_LOWER_IO_VA,
45 .pfn = __phys_to_pfn(IOP331_PCI_LOWER_IO_PA),
46 .length = IOP331_PCI_IO_WINDOW_SIZE,
47 .type = MT_DEVICE
48 }
49};
50
51static struct resource iop33x_uart0_resources[] = { 35static struct resource iop33x_uart0_resources[] = {
52 [0] = { 36 [0] = {
53 .start = IOP331_UART0_PHYS, 37 .start = IOP331_UART0_PHYS,
@@ -172,30 +156,17 @@ void __init iop33x_init(void)
172 } 156 }
173} 157}
174 158
175void __init iop331_map_io(void)
176{
177 iotable_init(iop331_std_desc, ARRAY_SIZE(iop331_std_desc));
178}
179
180#ifdef CONFIG_ARCH_IOP33X 159#ifdef CONFIG_ARCH_IOP33X
181extern void iop331_init_irq(void); 160extern void iop331_init_irq(void);
182extern struct sys_timer iop331_timer; 161extern struct sys_timer iop331_timer;
183#endif 162#endif
184 163
185#ifdef CONFIG_ARCH_IQ80331
186extern void iq80331_map_io(void);
187#endif
188
189#ifdef CONFIG_MACH_IQ80332
190extern void iq80332_map_io(void);
191#endif
192
193#if defined(CONFIG_ARCH_IQ80331) 164#if defined(CONFIG_ARCH_IQ80331)
194MACHINE_START(IQ80331, "Intel IQ80331") 165MACHINE_START(IQ80331, "Intel IQ80331")
195 /* Maintainer: Intel Corp. */ 166 /* Maintainer: Intel Corp. */
196 .phys_io = 0xfefff000, 167 .phys_io = 0xfefff000,
197 .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical 168 .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
198 .map_io = iq80331_map_io, 169 .map_io = iop3xx_map_io,
199 .init_irq = iop331_init_irq, 170 .init_irq = iop331_init_irq,
200 .timer = &iop331_timer, 171 .timer = &iop331_timer,
201 .boot_params = 0x0100, 172 .boot_params = 0x0100,
@@ -207,7 +178,7 @@ MACHINE_START(IQ80332, "Intel IQ80332")
207 /* Maintainer: Intel Corp. */ 178 /* Maintainer: Intel Corp. */
208 .phys_io = 0xfefff000, 179 .phys_io = 0xfefff000,
209 .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical 180 .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
210 .map_io = iq80332_map_io, 181 .map_io = iop3xx_map_io,
211 .init_irq = iop331_init_irq, 182 .init_irq = iop331_init_irq,
212 .timer = &iop331_timer, 183 .timer = &iop331_timer,
213 .boot_params = 0x0100, 184 .boot_params = 0x0100,