1 files changed, 1 insertions, 150 deletions
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c
index 001a252bd514..1872faa11a27 100644
--- a/arch/arm/mach-pxa/eseries.c
+++ b/arch/arm/mach-pxa/eseries.c
@@ -22,65 +22,8 @@
 #include "generic.h"
-static unsigned long e740_pin_config[] __initdata = {
-        /* Chip selects */
-        GPIO15_nCS_1,   /* CS1 - Flash */
-        GPIO79_nCS_3,   /* CS3 - IMAGEON */
-        GPIO80_nCS_4,   /* CS4 - TMIO */
-        /* Clocks */
-        GPIO12_32KHz,
-        /* BTUART */
-        GPIO42_BTUART_RXD,
-        GPIO43_BTUART_TXD,
-        GPIO44_BTUART_CTS,
-        GPIO45_GPIO, /* Used by TMIO for #SUSPEND */
-        /* PC Card */
-        GPIO8_GPIO,   /* CD0 */
-        GPIO44_GPIO,  /* CD1 */
-        GPIO11_GPIO,  /* IRQ0 */
-        GPIO6_GPIO,   /* IRQ1 */
-        GPIO27_GPIO,  /* RST0 */
-        GPIO24_GPIO,  /* RST1 */
-        GPIO20_GPIO,  /* PWR0 */
-        GPIO23_GPIO,  /* PWR1 */
-        GPIO48_nPOE,
-        GPIO49_nPWE,
-        GPIO50_nPIOR,
-        GPIO51_nPIOW,
-        GPIO52_nPCE_1,
-        GPIO53_nPCE_2,
-        GPIO54_nPSKTSEL,
-        GPIO55_nPREG,
-        GPIO56_nPWAIT,
-        GPIO57_nIOIS16,
-        /* wakeup */
-        GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,
-};
-static unsigned long e400_pin_config[] __initdata = {
-        /* Chip selects */
-        GPIO15_nCS_1,   /* CS1 - Flash */
-        GPIO80_nCS_4,   /* CS4 - TMIO */
-        /* Clocks */
-        GPIO12_32KHz,
-        /* BTUART */
-        GPIO42_BTUART_RXD,
-        GPIO43_BTUART_TXD,
-        GPIO44_BTUART_CTS,
-        GPIO45_GPIO, /* Used by TMIO for #SUSPEND */
-        /* wakeup */
-        GPIO0_GPIO | WAKEUP_ON_EDGE_RISE,
-};
 /* Only e800 has 128MB RAM */
-static void __init eseries_fixup(struct machine_desc *desc,
+void __init eseries_fixup(struct machine_desc *desc,
        struct tag *tags, char **cmdline, struct meminfo *mi)
 {
        mi->nr_banks=1;
@@ -92,95 +35,3 @@ static void __init eseries_fixup(struct machine_desc *desc,
                mi->bank[0].size = (64*1024*1024);
 }
-static void __init e740_init(void)
-{
-        pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));
-}
-static void __init e400_init(void)
-{
-        pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));
-}
-/* e-series machine definitions */
-#ifdef CONFIG_MACH_E330
-MACHINE_START(E330, "Toshiba e330")
-        /* Maintainer: Ian Molton (spyro@f2s.com) */
-        .phys_io        = 0x40000000,
-        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa25x_init_irq,
-        .fixup          = eseries_fixup,
-        .timer          = &pxa_timer,
-MACHINE_END
-#endif
-#ifdef CONFIG_MACH_E350
-MACHINE_START(E350, "Toshiba e350")
-        /* Maintainer: Ian Molton (spyro@f2s.com) */
-        .phys_io        = 0x40000000,
-        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa25x_init_irq,
-        .fixup          = eseries_fixup,
-        .timer          = &pxa_timer,
-MACHINE_END
-#endif
-#ifdef CONFIG_MACH_E740
-MACHINE_START(E740, "Toshiba e740")
-        /* Maintainer: Ian Molton (spyro@f2s.com) */
-        .phys_io        = 0x40000000,
-        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa25x_init_irq,
-        .fixup          = eseries_fixup,
-        .init_machine   = e740_init,
-        .timer          = &pxa_timer,
-MACHINE_END
-#endif
-#ifdef CONFIG_MACH_E750
-MACHINE_START(E750, "Toshiba e750")
-        /* Maintainer: Ian Molton (spyro@f2s.com) */
-        .phys_io        = 0x40000000,
-        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa25x_init_irq,
-        .fixup          = eseries_fixup,
-        .timer          = &pxa_timer,
-MACHINE_END
-#endif
-#ifdef CONFIG_MACH_E400
-MACHINE_START(E400, "Toshiba e400")
-        /* Maintainer: Ian Molton (spyro@f2s.com) */
-        .phys_io        = 0x40000000,
-        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa25x_init_irq,
-        .fixup          = eseries_fixup,
-        .init_machine   = e400_init,
-        .timer          = &pxa_timer,
-MACHINE_END
-#endif
-#ifdef CONFIG_MACH_E800
-MACHINE_START(E800, "Toshiba e800")
-        /* Maintainer: Ian Molton (spyro@f2s.com) */
-        .phys_io        = 0x40000000,
-        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
-        .boot_params    = 0xa0000100,
-        .map_io         = pxa_map_io,
-        .init_irq       = pxa25x_init_irq,
-        .fixup          = eseries_fixup,
-        .timer          = &pxa_timer,
-MACHINE_END
-#endif

diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index 001a252bd514..1872faa11a27 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c
@@ -22,65 +22,8 @@
22		22
23	#include "generic.h"	23	#include "generic.h"
24		24
25	static unsigned long e740_pin_config[] __initdata = {
26	/* Chip selects */
27	GPIO15_nCS_1, /* CS1 - Flash */
28	GPIO79_nCS_3, /* CS3 - IMAGEON */
29	GPIO80_nCS_4, /* CS4 - TMIO */
30
31	/* Clocks */
32	GPIO12_32KHz,
33
34	/* BTUART */
35	GPIO42_BTUART_RXD,
36	GPIO43_BTUART_TXD,
37	GPIO44_BTUART_CTS,
38	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */
39
40	/* PC Card */
41	GPIO8_GPIO, /* CD0 */
42	GPIO44_GPIO, /* CD1 */
43	GPIO11_GPIO, /* IRQ0 */
44	GPIO6_GPIO, /* IRQ1 */
45	GPIO27_GPIO, /* RST0 */
46	GPIO24_GPIO, /* RST1 */
47	GPIO20_GPIO, /* PWR0 */
48	GPIO23_GPIO, /* PWR1 */
49	GPIO48_nPOE,
50	GPIO49_nPWE,
51	GPIO50_nPIOR,
52	GPIO51_nPIOW,
53	GPIO52_nPCE_1,
54	GPIO53_nPCE_2,
55	GPIO54_nPSKTSEL,
56	GPIO55_nPREG,
57	GPIO56_nPWAIT,
58	GPIO57_nIOIS16,
59
60	/* wakeup */
61	GPIO0_GPIO \| WAKEUP_ON_EDGE_RISE,
62	};
63
64	static unsigned long e400_pin_config[] __initdata = {
65	/* Chip selects */
66	GPIO15_nCS_1, /* CS1 - Flash */
67	GPIO80_nCS_4, /* CS4 - TMIO */
68
69	/* Clocks */
70	GPIO12_32KHz,
71
72	/* BTUART */
73	GPIO42_BTUART_RXD,
74	GPIO43_BTUART_TXD,
75	GPIO44_BTUART_CTS,
76	GPIO45_GPIO, /* Used by TMIO for #SUSPEND */
77
78	/* wakeup */
79	GPIO0_GPIO \| WAKEUP_ON_EDGE_RISE,
80	};
81
82	/* Only e800 has 128MB RAM */	25	/* Only e800 has 128MB RAM */
83	static void __init eseries_fixup(struct machine_desc *desc,	26	void __init eseries_fixup(struct machine_desc *desc,
84	struct tag tags, char cmdline, struct meminfo mi)	27	struct tag tags, char cmdline, struct meminfo mi)
85	{	28	{
86	mi->nr_banks=1;	29	mi->nr_banks=1;
@@ -92,95 +35,3 @@ static void __init eseries_fixup(struct machine_desc *desc,
92	mi->bank[0].size = (6410241024);	35	mi->bank[0].size = (6410241024);
93	}	36	}
94		37
95	static void __init e740_init(void)
96	{
97	pxa2xx_mfp_config(ARRAY_AND_SIZE(e740_pin_config));
98	}
99
100	static void __init e400_init(void)
101	{
102	pxa2xx_mfp_config(ARRAY_AND_SIZE(e400_pin_config));
103	}
104
105	/* e-series machine definitions */
106
107	#ifdef CONFIG_MACH_E330
108	MACHINE_START(E330, "Toshiba e330")
109	/* Maintainer: Ian Molton (spyro@f2s.com) */
110	.phys_io = 0x40000000,
111	.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
112	.boot_params = 0xa0000100,
113	.map_io = pxa_map_io,
114	.init_irq = pxa25x_init_irq,
115	.fixup = eseries_fixup,
116	.timer = &pxa_timer,
117	MACHINE_END
118	#endif
119
120	#ifdef CONFIG_MACH_E350
121	MACHINE_START(E350, "Toshiba e350")
122	/* Maintainer: Ian Molton (spyro@f2s.com) */
123	.phys_io = 0x40000000,
124	.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
125	.boot_params = 0xa0000100,
126	.map_io = pxa_map_io,
127	.init_irq = pxa25x_init_irq,
128	.fixup = eseries_fixup,
129	.timer = &pxa_timer,
130	MACHINE_END
131	#endif
132
133	#ifdef CONFIG_MACH_E740
134	MACHINE_START(E740, "Toshiba e740")
135	/* Maintainer: Ian Molton (spyro@f2s.com) */
136	.phys_io = 0x40000000,
137	.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
138	.boot_params = 0xa0000100,
139	.map_io = pxa_map_io,
140	.init_irq = pxa25x_init_irq,
141	.fixup = eseries_fixup,
142	.init_machine = e740_init,
143	.timer = &pxa_timer,
144	MACHINE_END
145	#endif
146
147	#ifdef CONFIG_MACH_E750
148	MACHINE_START(E750, "Toshiba e750")
149	/* Maintainer: Ian Molton (spyro@f2s.com) */
150	.phys_io = 0x40000000,
151	.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
152	.boot_params = 0xa0000100,
153	.map_io = pxa_map_io,
154	.init_irq = pxa25x_init_irq,
155	.fixup = eseries_fixup,
156	.timer = &pxa_timer,
157	MACHINE_END
158	#endif
159
160	#ifdef CONFIG_MACH_E400
161	MACHINE_START(E400, "Toshiba e400")
162	/* Maintainer: Ian Molton (spyro@f2s.com) */
163	.phys_io = 0x40000000,
164	.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
165	.boot_params = 0xa0000100,
166	.map_io = pxa_map_io,
167	.init_irq = pxa25x_init_irq,
168	.fixup = eseries_fixup,
169	.init_machine = e400_init,
170	.timer = &pxa_timer,
171	MACHINE_END
172	#endif
173
174	#ifdef CONFIG_MACH_E800
175	MACHINE_START(E800, "Toshiba e800")
176	/* Maintainer: Ian Molton (spyro@f2s.com) */
177	.phys_io = 0x40000000,
178	.io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc,
179	.boot_params = 0xa0000100,
180	.map_io = pxa_map_io,
181	.init_irq = pxa25x_init_irq,
182	.fixup = eseries_fixup,
183	.timer = &pxa_timer,
184	MACHINE_END
185	#endif
186