4 files changed, 40 insertions, 30 deletions
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c
index f3a291b6a9fb..b7ebf3898fc5 100644
--- a/arch/arm/mach-ixp2000/enp2611.c
+++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -223,13 +223,15 @@ static void __init enp2611_init_machine(void)
 MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
-        MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")
+        /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixp2000_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixp2000_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixp2000_map_io,
+        .init_irq       = ixp2000_init_irq,
        .timer          = &enp2611_timer,
-        INIT_MACHINE(enp2611_init_machine)
+        .init_machine   = enp2611_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c
index df3ff26c8cdd..fd280a93637e 100644
--- a/arch/arm/mach-ixp2000/ixdp2400.c
+++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void)
 }
 MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x00_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2400_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x00_map_io,
+        .init_irq       = ixdp2400_init_irq,
        .timer          = &ixdp2400_timer,
-        INIT_MACHINE(ixdp2x00_init_machine)
+        .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c
index 468a4bbfb724..f9073aa28615 100644
--- a/arch/arm/mach-ixp2000/ixdp2800.c
+++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -284,12 +284,14 @@ void ixdp2800_init_irq(void)
 }
 MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x00_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2800_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x00_map_io,
+        .init_irq       = ixdp2800_init_irq,
        .timer          = &ixdp2800_timer,
-        INIT_MACHINE(ixdp2x00_init_machine)
+        .init_machine   = ixdp2x00_init_machine,
 MACHINE_END
diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c
index e94dace3d412..c73588743ee1 100644
--- a/arch/arm/mach-ixp2000/ixdp2x01.c
+++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void)
 #ifdef CONFIG_ARCH_IXDP2401
 MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x01_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2x01_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-        INIT_MACHINE(ixdp2x01_init_machine)
+        .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif
 #ifdef CONFIG_ARCH_IXDP2801
 MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
+        .phys_ram       = 0x00000000,
-        BOOT_PARAMS(0x00000100)
+        .phys_io        = IXP2000_UART_PHYS_BASE,
-        MAPIO(ixdp2x01_map_io)
+        .io_pg_offst    = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
-        INITIRQ(ixdp2x01_init_irq)
+        .boot_params    = 0x00000100,
+        .map_io         = ixdp2x01_map_io,
+        .init_irq       = ixdp2x01_init_irq,
        .timer          = &ixdp2x01_timer,
-        INIT_MACHINE(ixdp2x01_init_machine)
+        .init_machine   = ixdp2x01_init_machine,
 MACHINE_END
 #endif

diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index f3a291b6a9fb..b7ebf3898fc5 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c
@@ -223,13 +223,15 @@ static void __init enp2611_init_machine(void)
223		223
224		224
225	MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")	225	MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
226	MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")	226	/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
227	BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)	227	.phys_ram = 0x00000000,
228	BOOT_PARAMS(0x00000100)	228	.phys_io = IXP2000_UART_PHYS_BASE,
229	MAPIO(ixp2000_map_io)	229	.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
230	INITIRQ(ixp2000_init_irq)	230	.boot_params = 0x00000100,
		231	.map_io = ixp2000_map_io,
		232	.init_irq = ixp2000_init_irq,
231	.timer = &enp2611_timer,	233	.timer = &enp2611_timer,
232	INIT_MACHINE(enp2611_init_machine)	234	.init_machine = enp2611_init_machine,
233	MACHINE_END	235	MACHINE_END
234		236
235		237


diff --git a/arch/arm/mach-ixp2000/ixdp2400.c b/arch/arm/mach-ixp2000/ixdp2400.c index df3ff26c8cdd..fd280a93637e 100644 --- a/arch/arm/mach-ixp2000/ixdp2400.c +++ b/arch/arm/mach-ixp2000/ixdp2400.c
@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void)
168	}	168	}
169		169
170	MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")	170	MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
171	MAINTAINER("MontaVista Software, Inc.")	171	/* Maintainer: MontaVista Software, Inc. */
172	BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)	172	.phys_ram = 0x00000000,
173	BOOT_PARAMS(0x00000100)	173	.phys_io = IXP2000_UART_PHYS_BASE,
174	MAPIO(ixdp2x00_map_io)	174	.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
175	INITIRQ(ixdp2400_init_irq)	175	.boot_params = 0x00000100,
		176	.map_io = ixdp2x00_map_io,
		177	.init_irq = ixdp2400_init_irq,
176	.timer = &ixdp2400_timer,	178	.timer = &ixdp2400_timer,
177	INIT_MACHINE(ixdp2x00_init_machine)	179	.init_machine = ixdp2x00_init_machine,
178	MACHINE_END	180	MACHINE_END
179		181


diff --git a/arch/arm/mach-ixp2000/ixdp2800.c b/arch/arm/mach-ixp2000/ixdp2800.c index 468a4bbfb724..f9073aa28615 100644 --- a/arch/arm/mach-ixp2000/ixdp2800.c +++ b/arch/arm/mach-ixp2000/ixdp2800.c
@@ -284,12 +284,14 @@ void ixdp2800_init_irq(void)
284	}	284	}
285		285
286	MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")	286	MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
287	MAINTAINER("MontaVista Software, Inc.")	287	/* Maintainer: MontaVista Software, Inc. */
288	BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)	288	.phys_ram = 0x00000000,
289	BOOT_PARAMS(0x00000100)	289	.phys_io = IXP2000_UART_PHYS_BASE,
290	MAPIO(ixdp2x00_map_io)	290	.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
291	INITIRQ(ixdp2800_init_irq)	291	.boot_params = 0x00000100,
		292	.map_io = ixdp2x00_map_io,
		293	.init_irq = ixdp2800_init_irq,
292	.timer = &ixdp2800_timer,	294	.timer = &ixdp2800_timer,
293	INIT_MACHINE(ixdp2x00_init_machine)	295	.init_machine = ixdp2x00_init_machine,
294	MACHINE_END	296	MACHINE_END
295		297


diff --git a/arch/arm/mach-ixp2000/ixdp2x01.c b/arch/arm/mach-ixp2000/ixdp2x01.c index e94dace3d412..c73588743ee1 100644 --- a/arch/arm/mach-ixp2000/ixdp2x01.c +++ b/arch/arm/mach-ixp2000/ixdp2x01.c
@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void)
375		375
376	#ifdef CONFIG_ARCH_IXDP2401	376	#ifdef CONFIG_ARCH_IXDP2401
377	MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")	377	MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
378	MAINTAINER("MontaVista Software, Inc.")	378	/* Maintainer: MontaVista Software, Inc. */
379	BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)	379	.phys_ram = 0x00000000,
380	BOOT_PARAMS(0x00000100)	380	.phys_io = IXP2000_UART_PHYS_BASE,
381	MAPIO(ixdp2x01_map_io)	381	.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
382	INITIRQ(ixdp2x01_init_irq)	382	.boot_params = 0x00000100,
		383	.map_io = ixdp2x01_map_io,
		384	.init_irq = ixdp2x01_init_irq,
383	.timer = &ixdp2x01_timer,	385	.timer = &ixdp2x01_timer,
384	INIT_MACHINE(ixdp2x01_init_machine)	386	.init_machine = ixdp2x01_init_machine,
385	MACHINE_END	387	MACHINE_END
386	#endif	388	#endif
387		389
388	#ifdef CONFIG_ARCH_IXDP2801	390	#ifdef CONFIG_ARCH_IXDP2801
389	MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")	391	MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
390	MAINTAINER("MontaVista Software, Inc.")	392	/* Maintainer: MontaVista Software, Inc. */
391	BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)	393	.phys_ram = 0x00000000,
392	BOOT_PARAMS(0x00000100)	394	.phys_io = IXP2000_UART_PHYS_BASE,
393	MAPIO(ixdp2x01_map_io)	395	.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
394	INITIRQ(ixdp2x01_init_irq)	396	.boot_params = 0x00000100,
		397	.map_io = ixdp2x01_map_io,
		398	.init_irq = ixdp2x01_init_irq,
395	.timer = &ixdp2x01_timer,	399	.timer = &ixdp2x01_timer,
396	INIT_MACHINE(ixdp2x01_init_machine)	400	.init_machine = ixdp2x01_init_machine,
397	MACHINE_END	401	MACHINE_END
398	#endif	402	#endif
399		403