7 files changed, 53 insertions, 39 deletions
diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c
index c106704a2c34..dc73feb1ffb0 100644
--- a/arch/arm/mach-clps711x/autcpu12.c
+++ b/arch/arm/mach-clps711x/autcpu12.c
@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void)
 }
 MACHINE_START(AUTCPU12, "autronix autcpu12")
-        MAINTAINER("Thomas Gleixner")
+        /* Maintainer: Thomas Gleixner */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0020000)
+        .phys_io        = 0x80000000,
-        MAPIO(autcpu12_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0020000,
+        .map_io         = autcpu12_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c
index 7664f9cf83b8..a46c82cd2711 100644
--- a/arch/arm/mach-clps711x/cdb89712.c
+++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void)
 }
 MACHINE_START(CDB89712, "Cirrus-CDB89712")
-        MAINTAINER("Ray Lehtiniemi")
+        /* Maintainer: Ray Lehtiniemi */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(cdb89712_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = cdb89712_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c
index e4093be3c4cb..780d91805984 100644
--- a/arch/arm/mach-clps711x/ceiva.c
+++ b/arch/arm/mach-clps711x/ceiva.c
@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void)
 MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
-        MAINTAINER("Rob Scott")
+        /* Maintainer: Rob Scott */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        MAPIO(ceiva_map_io)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        INITIRQ(clps711x_init_irq)
+        .boot_params    = 0xc0000100,
+        .map_io         = ceiva_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c
index 9ca21cb481ba..c83f3fd68fcd 100644
--- a/arch/arm/mach-clps711x/clep7312.c
+++ b/arch/arm/mach-clps711x/clep7312.c
@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
 MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
-        MAINTAINER("Nobody")
+        /* Maintainer: Nobody */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_clep7312)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(clps711x_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_clep7312,
+        .map_io         = clps711x_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c
index c6c46324a2e3..255c98b63e15 100644
--- a/arch/arm/mach-clps711x/edb7211-arch.c
+++ b/arch/arm/mach-clps711x/edb7211-arch.c
@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
-        MAINTAINER("Jon McClintock")
+        /* Maintainer: Jon McClintock */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_edb7211)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(edb7211_map_io)
+        .boot_params    = 0xc0020100,   /* 0xc0000000 - 0xc001ffff can be video RAM */
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_edb7211,
+        .map_io         = edb7211_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c
index c1c5b8e01549..f83a59761e02 100644
--- a/arch/arm/mach-clps711x/fortunet.c
+++ b/arch/arm/mach-clps711x/fortunet.c
@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
 }
 MACHINE_START(FORTUNET, "ARM-FortuNet")
-        MAINTAINER("FortuNet Inc.")
+        /* Maintainer: FortuNet Inc. */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0x00000000)
+        .phys_io        = 0x80000000,
-        FIXUP(fortunet_fixup)
+        .io_pg_offst    = ((0xf0000000) >> 18) & 0xfffc,
-        MAPIO(clps711x_map_io)
+        .boot_params    = 0x00000000,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fortunet_fixup,
+        .map_io         = clps711x_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END
diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c
index 29269df054f5..5bdb90edf992 100644
--- a/arch/arm/mach-clps711x/p720t.c
+++ b/arch/arm/mach-clps711x/p720t.c
@@ -79,12 +79,14 @@ static void __init p720t_map_io(void)
 }
 MACHINE_START(P720T, "ARM-Prospector720T")
-        MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
+        /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
-        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
+        .phys_ram       = 0xc0000000,
-        BOOT_PARAMS(0xc0000100)
+        .phys_io        = 0x80000000,
-        FIXUP(fixup_p720t)
+        .io_pg_offst    = ((0xff000000) >> 18) & 0xfffc,
-        MAPIO(p720t_map_io)
+        .boot_params    = 0xc0000100,
-        INITIRQ(clps711x_init_irq)
+        .fixup          = fixup_p720t,
+        .map_io         = p720t_map_io,
+        .init_irq       = clps711x_init_irq,
        .timer          = &clps711x_timer,
 MACHINE_END

diff --git a/arch/arm/mach-clps711x/autcpu12.c b/arch/arm/mach-clps711x/autcpu12.c index c106704a2c34..dc73feb1ffb0 100644 --- a/arch/arm/mach-clps711x/autcpu12.c +++ b/arch/arm/mach-clps711x/autcpu12.c
@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void)
59	}	59	}
60		60
61	MACHINE_START(AUTCPU12, "autronix autcpu12")	61	MACHINE_START(AUTCPU12, "autronix autcpu12")
62	MAINTAINER("Thomas Gleixner")	62	/* Maintainer: Thomas Gleixner */
63	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)	63	.phys_ram = 0xc0000000,
64	BOOT_PARAMS(0xc0020000)	64	.phys_io = 0x80000000,
65	MAPIO(autcpu12_map_io)	65	.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
66	INITIRQ(clps711x_init_irq)	66	.boot_params = 0xc0020000,
		67	.map_io = autcpu12_map_io,
		68	.init_irq = clps711x_init_irq,
67	.timer = &clps711x_timer,	69	.timer = &clps711x_timer,
68	MACHINE_END	70	MACHINE_END
69		71


diff --git a/arch/arm/mach-clps711x/cdb89712.c b/arch/arm/mach-clps711x/cdb89712.c index 7664f9cf83b8..a46c82cd2711 100644 --- a/arch/arm/mach-clps711x/cdb89712.c +++ b/arch/arm/mach-clps711x/cdb89712.c
@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void)
49	}	49	}
50		50
51	MACHINE_START(CDB89712, "Cirrus-CDB89712")	51	MACHINE_START(CDB89712, "Cirrus-CDB89712")
52	MAINTAINER("Ray Lehtiniemi")	52	/* Maintainer: Ray Lehtiniemi */
53	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)	53	.phys_ram = 0xc0000000,
54	BOOT_PARAMS(0xc0000100)	54	.phys_io = 0x80000000,
55	MAPIO(cdb89712_map_io)	55	.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
56	INITIRQ(clps711x_init_irq)	56	.boot_params = 0xc0000100,
		57	.map_io = cdb89712_map_io,
		58	.init_irq = clps711x_init_irq,
57	.timer = &clps711x_timer,	59	.timer = &clps711x_timer,
58	MACHINE_END	60	MACHINE_END


diff --git a/arch/arm/mach-clps711x/ceiva.c b/arch/arm/mach-clps711x/ceiva.c index e4093be3c4cb..780d91805984 100644 --- a/arch/arm/mach-clps711x/ceiva.c +++ b/arch/arm/mach-clps711x/ceiva.c
@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void)
53		53
54		54
55	MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")	55	MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
56	MAINTAINER("Rob Scott")	56	/* Maintainer: Rob Scott */
57	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)	57	.phys_ram = 0xc0000000,
58	BOOT_PARAMS(0xc0000100)	58	.phys_io = 0x80000000,
59	MAPIO(ceiva_map_io)	59	.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
60	INITIRQ(clps711x_init_irq)	60	.boot_params = 0xc0000100,
		61	.map_io = ceiva_map_io,
		62	.init_irq = clps711x_init_irq,
61	.timer = &clps711x_timer,	63	.timer = &clps711x_timer,
62	MACHINE_END	64	MACHINE_END


diff --git a/arch/arm/mach-clps711x/clep7312.c b/arch/arm/mach-clps711x/clep7312.c index 9ca21cb481ba..c83f3fd68fcd 100644 --- a/arch/arm/mach-clps711x/clep7312.c +++ b/arch/arm/mach-clps711x/clep7312.c
@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc desc, struct tag tags,
37		37
38		38
39	MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")	39	MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
40	MAINTAINER("Nobody")	40	/* Maintainer: Nobody */
41	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)	41	.phys_ram = 0xc0000000,
42	BOOT_PARAMS(0xc0000100)	42	.phys_io = 0x80000000,
43	FIXUP(fixup_clep7312)	43	.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
44	MAPIO(clps711x_map_io)	44	.boot_params = 0xc0000100,
45	INITIRQ(clps711x_init_irq)	45	.fixup = fixup_clep7312,
		46	.map_io = clps711x_map_io,
		47	.init_irq = clps711x_init_irq,
46	.timer = &clps711x_timer,	48	.timer = &clps711x_timer,
47	MACHINE_END	49	MACHINE_END
48		50


diff --git a/arch/arm/mach-clps711x/edb7211-arch.c b/arch/arm/mach-clps711x/edb7211-arch.c index c6c46324a2e3..255c98b63e15 100644 --- a/arch/arm/mach-clps711x/edb7211-arch.c +++ b/arch/arm/mach-clps711x/edb7211-arch.c
@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc desc, struct tag tags,
51	}	51	}
52		52
53	MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")	53	MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
54	MAINTAINER("Jon McClintock")	54	/* Maintainer: Jon McClintock */
55	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)	55	.phys_ram = 0xc0000000,
56	BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */	56	.phys_io = 0x80000000,
57	FIXUP(fixup_edb7211)	57	.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
58	MAPIO(edb7211_map_io)	58	.boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */
59	INITIRQ(clps711x_init_irq)	59	.fixup = fixup_edb7211,
		60	.map_io = edb7211_map_io,
		61	.init_irq = clps711x_init_irq,
60	.timer = &clps711x_timer,	62	.timer = &clps711x_timer,
61	MACHINE_END	63	MACHINE_END


diff --git a/arch/arm/mach-clps711x/fortunet.c b/arch/arm/mach-clps711x/fortunet.c index c1c5b8e01549..f83a59761e02 100644 --- a/arch/arm/mach-clps711x/fortunet.c +++ b/arch/arm/mach-clps711x/fortunet.c
@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc desc, struct tag tags,
75	}	75	}
76		76
77	MACHINE_START(FORTUNET, "ARM-FortuNet")	77	MACHINE_START(FORTUNET, "ARM-FortuNet")
78	MAINTAINER("FortuNet Inc.")	78	/* Maintainer: FortuNet Inc. */
79	BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)	79	.phys_ram = 0xc0000000,
80	BOOT_PARAMS(0x00000000)	80	.phys_io = 0x80000000,
81	FIXUP(fortunet_fixup)	81	.io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
82	MAPIO(clps711x_map_io)	82	.boot_params = 0x00000000,
83	INITIRQ(clps711x_init_irq)	83	.fixup = fortunet_fixup,
		84	.map_io = clps711x_map_io,
		85	.init_irq = clps711x_init_irq,
84	.timer = &clps711x_timer,	86	.timer = &clps711x_timer,
85	MACHINE_END	87	MACHINE_END


diff --git a/arch/arm/mach-clps711x/p720t.c b/arch/arm/mach-clps711x/p720t.c index 29269df054f5..5bdb90edf992 100644 --- a/arch/arm/mach-clps711x/p720t.c +++ b/arch/arm/mach-clps711x/p720t.c
@@ -79,12 +79,14 @@ static void __init p720t_map_io(void)
79	}	79	}
80		80
81	MACHINE_START(P720T, "ARM-Prospector720T")	81	MACHINE_START(P720T, "ARM-Prospector720T")
82	MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")	82	/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
83	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)	83	.phys_ram = 0xc0000000,
84	BOOT_PARAMS(0xc0000100)	84	.phys_io = 0x80000000,
85	FIXUP(fixup_p720t)	85	.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
86	MAPIO(p720t_map_io)	86	.boot_params = 0xc0000100,
87	INITIRQ(clps711x_init_irq)	87	.fixup = fixup_p720t,
		88	.map_io = p720t_map_io,
		89	.init_irq = clps711x_init_irq,
88	.timer = &clps711x_timer,	90	.timer = &clps711x_timer,
89	MACHINE_END	91	MACHINE_END
90		92