2 files changed, 32 insertions, 26 deletions
diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c
index bf23e0fd2843..0f921ba2750c 100644
--- a/arch/arm/mach-iop3xx/iop321-setup.c
+++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -146,23 +146,27 @@ extern void iop321_init_time(void);
 #if defined(CONFIG_ARCH_IQ80321)
 MACHINE_START(IQ80321, "Intel IQ80321")
-        MAINTAINER("Intel Corporation")
+        /* Maintainer: Intel Corporation */
-        BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART)
+        .phys_ram       = PHYS_OFFSET,
-        MAPIO(iq80321_map_io)
+        .phys_io        = IQ80321_UART,
-        INITIRQ(iop321_init_irq)
+        .io_pg_offst    = ((IQ80321_UART) >> 18) & 0xfffc,
+        .map_io         = iq80321_map_io,
+        .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
+        .boot_params    = 0xa0000100,
-        INIT_MACHINE(iop32x_init)
+        .init_machine   = iop32x_init,
 MACHINE_END
 #elif defined(CONFIG_ARCH_IQ31244)
 MACHINE_START(IQ31244, "Intel IQ31244")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)
+        .phys_ram       = PHYS_OFFSET,
-    MAPIO(iq31244_map_io)
+        .phys_io        = IQ31244_UART,
-    INITIRQ(iop321_init_irq)
+        .io_pg_offst    = ((IQ31244_UART) >> 18) & 0xfffc,
+        .map_io         = iq31244_map_io,
+        .init_irq       = iop321_init_irq,
        .timer          = &iop321_timer,
-    BOOT_PARAMS(0xa0000100)
+        .boot_params    = 0xa0000100,
-        INIT_MACHINE(iop32x_init)
+        .init_machine   = iop32x_init,
 MACHINE_END
 #else
 #error No machine descriptor defined for this IOP3XX implementation
diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c
index 622e7914819a..fc74b722f72f 100644
--- a/arch/arm/mach-iop3xx/iop331-setup.c
+++ b/arch/arm/mach-iop3xx/iop331-setup.c
@@ -148,26 +148,28 @@ extern void iq80332_map_io(void);
 #if defined(CONFIG_ARCH_IQ80331)
 MACHINE_START(IQ80331, "Intel IQ80331")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
+        .phys_ram       = PHYS_OFFSET,
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
+        .phys_io        = 0xfefff000,
-    MAPIO(iq80331_map_io)
+        .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-    INITIRQ(iop331_init_irq)
+        .map_io         = iq80331_map_io,
+        .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(iop33x_init)
+        .init_machine   = iop33x_init,
 MACHINE_END
 #elif defined(CONFIG_MACH_IQ80332)
 MACHINE_START(IQ80332, "Intel IQ80332")
-    MAINTAINER("Intel Corp.")
+        /* Maintainer: Intel Corp. */
-    BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
+        .phys_ram       = PHYS_OFFSET,
-    //BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
+        .phys_io        = 0xfefff000,
-    MAPIO(iq80332_map_io)
+        .io_pg_offst    = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
-    INITIRQ(iop331_init_irq)
+        .map_io         = iq80332_map_io,
+        .init_irq       = iop331_init_irq,
        .timer          = &iop331_timer,
-    BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(iop33x_init)
+        .init_machine   = iop33x_init,
 MACHINE_END
 #else

diff --git a/arch/arm/mach-iop3xx/iop321-setup.c b/arch/arm/mach-iop3xx/iop321-setup.c index bf23e0fd2843..0f921ba2750c 100644 --- a/arch/arm/mach-iop3xx/iop321-setup.c +++ b/arch/arm/mach-iop3xx/iop321-setup.c
@@ -146,23 +146,27 @@ extern void iop321_init_time(void);
146		146
147	#if defined(CONFIG_ARCH_IQ80321)	147	#if defined(CONFIG_ARCH_IQ80321)
148	MACHINE_START(IQ80321, "Intel IQ80321")	148	MACHINE_START(IQ80321, "Intel IQ80321")
149	MAINTAINER("Intel Corporation")	149	/* Maintainer: Intel Corporation */
150	BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART)	150	.phys_ram = PHYS_OFFSET,
151	MAPIO(iq80321_map_io)	151	.phys_io = IQ80321_UART,
152	INITIRQ(iop321_init_irq)	152	.io_pg_offst = ((IQ80321_UART) >> 18) & 0xfffc,
		153	.map_io = iq80321_map_io,
		154	.init_irq = iop321_init_irq,
153	.timer = &iop321_timer,	155	.timer = &iop321_timer,
154	BOOT_PARAMS(0xa0000100)	156	.boot_params = 0xa0000100,
155	INIT_MACHINE(iop32x_init)	157	.init_machine = iop32x_init,
156	MACHINE_END	158	MACHINE_END
157	#elif defined(CONFIG_ARCH_IQ31244)	159	#elif defined(CONFIG_ARCH_IQ31244)
158	MACHINE_START(IQ31244, "Intel IQ31244")	160	MACHINE_START(IQ31244, "Intel IQ31244")
159	MAINTAINER("Intel Corp.")	161	/* Maintainer: Intel Corp. */
160	BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)	162	.phys_ram = PHYS_OFFSET,
161	MAPIO(iq31244_map_io)	163	.phys_io = IQ31244_UART,
162	INITIRQ(iop321_init_irq)	164	.io_pg_offst = ((IQ31244_UART) >> 18) & 0xfffc,
		165	.map_io = iq31244_map_io,
		166	.init_irq = iop321_init_irq,
163	.timer = &iop321_timer,	167	.timer = &iop321_timer,
164	BOOT_PARAMS(0xa0000100)	168	.boot_params = 0xa0000100,
165	INIT_MACHINE(iop32x_init)	169	.init_machine = iop32x_init,
166	MACHINE_END	170	MACHINE_END
167	#else	171	#else
168	#error No machine descriptor defined for this IOP3XX implementation	172	#error No machine descriptor defined for this IOP3XX implementation


diff --git a/arch/arm/mach-iop3xx/iop331-setup.c b/arch/arm/mach-iop3xx/iop331-setup.c index 622e7914819a..fc74b722f72f 100644 --- a/arch/arm/mach-iop3xx/iop331-setup.c +++ b/arch/arm/mach-iop3xx/iop331-setup.c
@@ -148,26 +148,28 @@ extern void iq80332_map_io(void);
148		148
149	#if defined(CONFIG_ARCH_IQ80331)	149	#if defined(CONFIG_ARCH_IQ80331)
150	MACHINE_START(IQ80331, "Intel IQ80331")	150	MACHINE_START(IQ80331, "Intel IQ80331")
151	MAINTAINER("Intel Corp.")	151	/* Maintainer: Intel Corp. */
152	BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical	152	.phys_ram = PHYS_OFFSET,
153	//BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)	153	.phys_io = 0xfefff000,
154	MAPIO(iq80331_map_io)	154	.io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
155	INITIRQ(iop331_init_irq)	155	.map_io = iq80331_map_io,
		156	.init_irq = iop331_init_irq,
156	.timer = &iop331_timer,	157	.timer = &iop331_timer,
157	BOOT_PARAMS(0x0100)	158	.boot_params = 0x0100,
158	INIT_MACHINE(iop33x_init)	159	.init_machine = iop33x_init,
159	MACHINE_END	160	MACHINE_END
160		161
161	#elif defined(CONFIG_MACH_IQ80332)	162	#elif defined(CONFIG_MACH_IQ80332)
162	MACHINE_START(IQ80332, "Intel IQ80332")	163	MACHINE_START(IQ80332, "Intel IQ80332")
163	MAINTAINER("Intel Corp.")	164	/* Maintainer: Intel Corp. */
164	BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical	165	.phys_ram = PHYS_OFFSET,
165	//BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)	166	.phys_io = 0xfefff000,
166	MAPIO(iq80332_map_io)	167	.io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
167	INITIRQ(iop331_init_irq)	168	.map_io = iq80332_map_io,
		169	.init_irq = iop331_init_irq,
168	.timer = &iop331_timer,	170	.timer = &iop331_timer,
169	BOOT_PARAMS(0x0100)	171	.boot_params = 0x0100,
170	INIT_MACHINE(iop33x_init)	172	.init_machine = iop33x_init,
171	MACHINE_END	173	MACHINE_END
172		174
173	#else	175	#else