3 files changed, 57 insertions, 50 deletions
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 8a05a1227e5f..c6335f51907d 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -100,14 +100,15 @@ static void __init coyote_init(void)
 #ifdef CONFIG_ARCH_ADI_COYOTE
 MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(coyote_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = coyote_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(coyote_init)
+        .init_machine   = coyote_init,
 MACHINE_END
 #endif
@@ -117,14 +118,15 @@ MACHINE_END
 */
 #ifdef CONFIG_MACH_IXDPG425
 MACHINE_START(IXDPG425, "Intel IXDPG425")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(coyote_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = coyote_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(coyote_init)
+        .init_machine   = coyote_init,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index e77c86efd21d..8ba1cd9406e7 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void)
 MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
-        MAINTAINER("George Joseph")
+        /* Maintainer: George Joseph */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_UART2_BASE_VIRT)
+        .phys_io        = IXP4XX_UART2_BASE_PHYS,
-        MAPIO(gtwx5715_map_io)
+        .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = gtwx5715_map_io,
-                  .timer                = &ixp4xx_timer,
+        .init_irq       = ixp4xx_init_irq,
-        BOOT_PARAMS(0x0100)
+        .timer          = &ixp4xx_timer,
-        INIT_MACHINE(gtwx5715_init)
+        .boot_params    = 0x0100,
+        .init_machine   = gtwx5715_init,
 MACHINE_END
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)
 }
 MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
-        MAINTAINER("MontaVista Software, Inc.")
+        /* Maintainer: MontaVista Software, Inc. */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 /*
@@ -168,14 +171,15 @@ MACHINE_END
 */
 #ifdef CONFIG_ARCH_AVILA
 MACHINE_START(AVILA, "Gateworks Avila Network Platform")
-        MAINTAINER("Deepak Saxena <dsaxena@plexity.net>")
+        /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
-        BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
+        .phys_ram       = PHYS_OFFSET,
-                IXP4XX_PERIPHERAL_BASE_VIRT)
+        .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS,
-        MAPIO(ixdp425_map_io)
+        .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
-        INITIRQ(ixp4xx_init_irq)
+        .map_io         = ixdp425_map_io,
+        .init_irq       = ixp4xx_init_irq,
        .timer          = &ixp4xx_timer,
-        BOOT_PARAMS(0x0100)
+        .boot_params    = 0x0100,
-        INIT_MACHINE(ixdp425_init)
+        .init_machine   = ixdp425_init,
 MACHINE_END
 #endif

diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 8a05a1227e5f..c6335f51907d 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -100,14 +100,15 @@ static void __init coyote_init(void)
100		100
101	#ifdef CONFIG_ARCH_ADI_COYOTE	101	#ifdef CONFIG_ARCH_ADI_COYOTE
102	MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")	102	MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
103	MAINTAINER("MontaVista Software, Inc.")	103	/* Maintainer: MontaVista Software, Inc. */
104	BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,	104	.phys_ram = PHYS_OFFSET,
105	IXP4XX_PERIPHERAL_BASE_VIRT)	105	.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
106	MAPIO(coyote_map_io)	106	.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
107	INITIRQ(ixp4xx_init_irq)	107	.map_io = coyote_map_io,
		108	.init_irq = ixp4xx_init_irq,
108	.timer = &ixp4xx_timer,	109	.timer = &ixp4xx_timer,
109	BOOT_PARAMS(0x0100)	110	.boot_params = 0x0100,
110	INIT_MACHINE(coyote_init)	111	.init_machine = coyote_init,
111	MACHINE_END	112	MACHINE_END
112	#endif	113	#endif
113		114
@@ -117,14 +118,15 @@ MACHINE_END
117	*/	118	*/
118	#ifdef CONFIG_MACH_IXDPG425	119	#ifdef CONFIG_MACH_IXDPG425
119	MACHINE_START(IXDPG425, "Intel IXDPG425")	120	MACHINE_START(IXDPG425, "Intel IXDPG425")
120	MAINTAINER("MontaVista Software, Inc.")	121	/* Maintainer: MontaVista Software, Inc. */
121	BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,	122	.phys_ram = PHYS_OFFSET,
122	IXP4XX_PERIPHERAL_BASE_VIRT)	123	.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
123	MAPIO(coyote_map_io)	124	.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
124	INITIRQ(ixp4xx_init_irq)	125	.map_io = coyote_map_io,
		126	.init_irq = ixp4xx_init_irq,
125	.timer = &ixp4xx_timer,	127	.timer = &ixp4xx_timer,
126	BOOT_PARAMS(0x0100)	128	.boot_params = 0x0100,
127	INIT_MACHINE(coyote_init)	129	.init_machine = coyote_init,
128	MACHINE_END	130	MACHINE_END
129	#endif	131	#endif
130		132


diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index e77c86efd21d..8ba1cd9406e7 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void)
140		140
141		141
142	MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")	142	MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
143	MAINTAINER("George Joseph")	143	/* Maintainer: George Joseph */
144	BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS,	144	.phys_ram = PHYS_OFFSET,
145	IXP4XX_UART2_BASE_VIRT)	145	.phys_io = IXP4XX_UART2_BASE_PHYS,
146	MAPIO(gtwx5715_map_io)	146	.io_pg_offst = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
147	INITIRQ(ixp4xx_init_irq)	147	.map_io = gtwx5715_map_io,
148	.timer = &ixp4xx_timer,	148	.init_irq = ixp4xx_init_irq,
149	BOOT_PARAMS(0x0100)	149	.timer = &ixp4xx_timer,
150	INIT_MACHINE(gtwx5715_init)	150	.boot_params = 0x0100,
		151	.init_machine = gtwx5715_init,
151	MACHINE_END	152	MACHINE_END
152		153
153		154


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