diff options
Diffstat (limited to 'arch/arm/mach-ixp4xx/ixdp425-setup.c')
-rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 60 |
1 files changed, 32 insertions, 28 deletions
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index 77346c1f676b..f2e9c0ea0501 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
@@ -128,36 +128,39 @@ static void __init ixdp425_init(void) | |||
128 | } | 128 | } |
129 | 129 | ||
130 | MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") | 130 | MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") |
131 | MAINTAINER("MontaVista Software, Inc.") | 131 | /* Maintainer: MontaVista Software, Inc. */ |
132 | BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, | 132 | .phys_ram = PHYS_OFFSET, |
133 | IXP4XX_PERIPHERAL_BASE_VIRT) | 133 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
134 | MAPIO(ixdp425_map_io) | 134 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, |
135 | INITIRQ(ixp4xx_init_irq) | 135 | .map_io = ixdp425_map_io, |
136 | .init_irq = ixp4xx_init_irq, | ||
136 | .timer = &ixp4xx_timer, | 137 | .timer = &ixp4xx_timer, |
137 | BOOT_PARAMS(0x0100) | 138 | .boot_params = 0x0100, |
138 | INIT_MACHINE(ixdp425_init) | 139 | .init_machine = ixdp425_init, |
139 | MACHINE_END | 140 | MACHINE_END |
140 | 141 | ||
141 | MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") | 142 | MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") |
142 | MAINTAINER("MontaVista Software, Inc.") | 143 | /* Maintainer: MontaVista Software, Inc. */ |
143 | BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, | 144 | .phys_ram = PHYS_OFFSET, |
144 | IXP4XX_PERIPHERAL_BASE_VIRT) | 145 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
145 | MAPIO(ixdp425_map_io) | 146 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, |
146 | INITIRQ(ixp4xx_init_irq) | 147 | .map_io = ixdp425_map_io, |
148 | .init_irq = ixp4xx_init_irq, | ||
147 | .timer = &ixp4xx_timer, | 149 | .timer = &ixp4xx_timer, |
148 | BOOT_PARAMS(0x0100) | 150 | .boot_params = 0x0100, |
149 | INIT_MACHINE(ixdp425_init) | 151 | .init_machine = ixdp425_init, |
150 | MACHINE_END | 152 | MACHINE_END |
151 | 153 | ||
152 | MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") | 154 | MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") |
153 | MAINTAINER("MontaVista Software, Inc.") | 155 | /* Maintainer: MontaVista Software, Inc. */ |
154 | BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, | 156 | .phys_ram = PHYS_OFFSET, |
155 | IXP4XX_PERIPHERAL_BASE_VIRT) | 157 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
156 | MAPIO(ixdp425_map_io) | 158 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, |
157 | INITIRQ(ixp4xx_init_irq) | 159 | .map_io = ixdp425_map_io, |
160 | .init_irq = ixp4xx_init_irq, | ||
158 | .timer = &ixp4xx_timer, | 161 | .timer = &ixp4xx_timer, |
159 | BOOT_PARAMS(0x0100) | 162 | .boot_params = 0x0100, |
160 | INIT_MACHINE(ixdp425_init) | 163 | .init_machine = ixdp425_init, |
161 | MACHINE_END | 164 | MACHINE_END |
162 | 165 | ||
163 | /* | 166 | /* |
@@ -168,14 +171,15 @@ MACHINE_END | |||
168 | */ | 171 | */ |
169 | #ifdef CONFIG_ARCH_AVILA | 172 | #ifdef CONFIG_ARCH_AVILA |
170 | MACHINE_START(AVILA, "Gateworks Avila Network Platform") | 173 | MACHINE_START(AVILA, "Gateworks Avila Network Platform") |
171 | MAINTAINER("Deepak Saxena <dsaxena@plexity.net>") | 174 | /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */ |
172 | BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, | 175 | .phys_ram = PHYS_OFFSET, |
173 | IXP4XX_PERIPHERAL_BASE_VIRT) | 176 | .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS, |
174 | MAPIO(ixdp425_map_io) | 177 | .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, |
175 | INITIRQ(ixp4xx_init_irq) | 178 | .map_io = ixdp425_map_io, |
179 | .init_irq = ixp4xx_init_irq, | ||
176 | .timer = &ixp4xx_timer, | 180 | .timer = &ixp4xx_timer, |
177 | BOOT_PARAMS(0x0100) | 181 | .boot_params = 0x0100, |
178 | INIT_MACHINE(ixdp425_init) | 182 | .init_machine = ixdp425_init, |
179 | MACHINE_END | 183 | MACHINE_END |
180 | #endif | 184 | #endif |
181 | 185 | ||