diff options
Diffstat (limited to 'arch/arm/mach-pxa')
45 files changed, 62 insertions, 82 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index ef3e8b1e06c1..7765d677adbb 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c | |||
@@ -828,5 +828,5 @@ MACHINE_START(BALLOON3, "Balloon3") | |||
828 | .handle_irq = pxa27x_handle_irq, | 828 | .handle_irq = pxa27x_handle_irq, |
829 | .timer = &pxa_timer, | 829 | .timer = &pxa_timer, |
830 | .init_machine = balloon3_init, | 830 | .init_machine = balloon3_init, |
831 | .boot_params = PLAT_PHYS_OFFSET + 0x100, | 831 | .atag_offset = 0x100, |
832 | MACHINE_END | 832 | MACHINE_END |
diff --git a/arch/arm/mach-pxa/capc7117.c b/arch/arm/mach-pxa/capc7117.c index 648b0ab2bf77..4efc16d39c79 100644 --- a/arch/arm/mach-pxa/capc7117.c +++ b/arch/arm/mach-pxa/capc7117.c | |||
@@ -148,7 +148,7 @@ static void __init capc7117_init(void) | |||
148 | 148 | ||
149 | MACHINE_START(CAPC7117, | 149 | MACHINE_START(CAPC7117, |
150 | "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM") | 150 | "Embedian CAPC-7117 evaluation kit based on the MXM-8x10 CoM") |
151 | .boot_params = 0xa0000100, | 151 | .atag_offset = 0x100, |
152 | .map_io = pxa3xx_map_io, | 152 | .map_io = pxa3xx_map_io, |
153 | .init_irq = pxa3xx_init_irq, | 153 | .init_irq = pxa3xx_init_irq, |
154 | .handle_irq = pxa3xx_handle_irq, | 154 | .handle_irq = pxa3xx_handle_irq, |
diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c index 13cf518bbbf8..349896c53abd 100644 --- a/arch/arm/mach-pxa/cm-x2xx.c +++ b/arch/arm/mach-pxa/cm-x2xx.c | |||
@@ -513,7 +513,7 @@ static void __init cmx2xx_map_io(void) | |||
513 | #endif | 513 | #endif |
514 | 514 | ||
515 | MACHINE_START(ARMCORE, "Compulab CM-X2XX") | 515 | MACHINE_START(ARMCORE, "Compulab CM-X2XX") |
516 | .boot_params = 0xa0000100, | 516 | .atag_offset = 0x100, |
517 | .map_io = cmx2xx_map_io, | 517 | .map_io = cmx2xx_map_io, |
518 | .nr_irqs = CMX2XX_NR_IRQS, | 518 | .nr_irqs = CMX2XX_NR_IRQS, |
519 | .init_irq = cmx2xx_init_irq, | 519 | .init_irq = cmx2xx_init_irq, |
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c index d940e8a72270..d2da301619f0 100644 --- a/arch/arm/mach-pxa/cm-x300.c +++ b/arch/arm/mach-pxa/cm-x300.c | |||
@@ -852,7 +852,7 @@ static void __init cm_x300_fixup(struct tag *tags, char **cmdline, | |||
852 | } | 852 | } |
853 | 853 | ||
854 | MACHINE_START(CM_X300, "CM-X300 module") | 854 | MACHINE_START(CM_X300, "CM-X300 module") |
855 | .boot_params = 0xa0000100, | 855 | .atag_offset = 0x100, |
856 | .map_io = pxa3xx_map_io, | 856 | .map_io = pxa3xx_map_io, |
857 | .init_irq = pxa3xx_init_irq, | 857 | .init_irq = pxa3xx_init_irq, |
858 | .handle_irq = pxa3xx_handle_irq, | 858 | .handle_irq = pxa3xx_handle_irq, |
diff --git a/arch/arm/mach-pxa/colibri-pxa270.c b/arch/arm/mach-pxa/colibri-pxa270.c index 870920934ecf..7db66465716f 100644 --- a/arch/arm/mach-pxa/colibri-pxa270.c +++ b/arch/arm/mach-pxa/colibri-pxa270.c | |||
@@ -306,7 +306,7 @@ static void __init colibri_pxa270_income_init(void) | |||
306 | } | 306 | } |
307 | 307 | ||
308 | MACHINE_START(COLIBRI, "Toradex Colibri PXA270") | 308 | MACHINE_START(COLIBRI, "Toradex Colibri PXA270") |
309 | .boot_params = COLIBRI_SDRAM_BASE + 0x100, | 309 | .atag_offset = 0x100, |
310 | .init_machine = colibri_pxa270_init, | 310 | .init_machine = colibri_pxa270_init, |
311 | .map_io = pxa27x_map_io, | 311 | .map_io = pxa27x_map_io, |
312 | .init_irq = pxa27x_init_irq, | 312 | .init_irq = pxa27x_init_irq, |
@@ -315,7 +315,7 @@ MACHINE_START(COLIBRI, "Toradex Colibri PXA270") | |||
315 | MACHINE_END | 315 | MACHINE_END |
316 | 316 | ||
317 | MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC") | 317 | MACHINE_START(INCOME, "Income s.r.o. SH-Dmaster PXA270 SBC") |
318 | .boot_params = 0xa0000100, | 318 | .atag_offset = 0x100, |
319 | .init_machine = colibri_pxa270_income_init, | 319 | .init_machine = colibri_pxa270_income_init, |
320 | .map_io = pxa27x_map_io, | 320 | .map_io = pxa27x_map_io, |
321 | .init_irq = pxa27x_init_irq, | 321 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/colibri-pxa300.c b/arch/arm/mach-pxa/colibri-pxa300.c index 60a6781e7a8e..c825e8bf2db1 100644 --- a/arch/arm/mach-pxa/colibri-pxa300.c +++ b/arch/arm/mach-pxa/colibri-pxa300.c | |||
@@ -183,7 +183,7 @@ void __init colibri_pxa300_init(void) | |||
183 | } | 183 | } |
184 | 184 | ||
185 | MACHINE_START(COLIBRI300, "Toradex Colibri PXA300") | 185 | MACHINE_START(COLIBRI300, "Toradex Colibri PXA300") |
186 | .boot_params = COLIBRI_SDRAM_BASE + 0x100, | 186 | .atag_offset = 0x100, |
187 | .init_machine = colibri_pxa300_init, | 187 | .init_machine = colibri_pxa300_init, |
188 | .map_io = pxa3xx_map_io, | 188 | .map_io = pxa3xx_map_io, |
189 | .init_irq = pxa3xx_init_irq, | 189 | .init_irq = pxa3xx_init_irq, |
diff --git a/arch/arm/mach-pxa/colibri-pxa320.c b/arch/arm/mach-pxa/colibri-pxa320.c index d2c6631915d4..692e1ffc5586 100644 --- a/arch/arm/mach-pxa/colibri-pxa320.c +++ b/arch/arm/mach-pxa/colibri-pxa320.c | |||
@@ -253,7 +253,7 @@ void __init colibri_pxa320_init(void) | |||
253 | } | 253 | } |
254 | 254 | ||
255 | MACHINE_START(COLIBRI320, "Toradex Colibri PXA320") | 255 | MACHINE_START(COLIBRI320, "Toradex Colibri PXA320") |
256 | .boot_params = COLIBRI_SDRAM_BASE + 0x100, | 256 | .atag_offset = 0x100, |
257 | .init_machine = colibri_pxa320_init, | 257 | .init_machine = colibri_pxa320_init, |
258 | .map_io = pxa3xx_map_io, | 258 | .map_io = pxa3xx_map_io, |
259 | .init_irq = pxa3xx_init_irq, | 259 | .init_irq = pxa3xx_init_irq, |
diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c index fe812eafb1f1..5e2cf39e9e4c 100644 --- a/arch/arm/mach-pxa/csb726.c +++ b/arch/arm/mach-pxa/csb726.c | |||
@@ -272,7 +272,7 @@ static void __init csb726_init(void) | |||
272 | } | 272 | } |
273 | 273 | ||
274 | MACHINE_START(CSB726, "Cogent CSB726") | 274 | MACHINE_START(CSB726, "Cogent CSB726") |
275 | .boot_params = 0xa0000100, | 275 | .atag_offset = 0x100, |
276 | .map_io = pxa27x_map_io, | 276 | .map_io = pxa27x_map_io, |
277 | .init_irq = pxa27x_init_irq, | 277 | .init_irq = pxa27x_init_irq, |
278 | .handle_irq = pxa27x_handle_irq, | 278 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 2e37ea52b372..94acc0b01dd6 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -1299,7 +1299,7 @@ static void __init em_x270_init(void) | |||
1299 | } | 1299 | } |
1300 | 1300 | ||
1301 | MACHINE_START(EM_X270, "Compulab EM-X270") | 1301 | MACHINE_START(EM_X270, "Compulab EM-X270") |
1302 | .boot_params = 0xa0000100, | 1302 | .atag_offset = 0x100, |
1303 | .map_io = pxa27x_map_io, | 1303 | .map_io = pxa27x_map_io, |
1304 | .init_irq = pxa27x_init_irq, | 1304 | .init_irq = pxa27x_init_irq, |
1305 | .handle_irq = pxa27x_handle_irq, | 1305 | .handle_irq = pxa27x_handle_irq, |
@@ -1308,7 +1308,7 @@ MACHINE_START(EM_X270, "Compulab EM-X270") | |||
1308 | MACHINE_END | 1308 | MACHINE_END |
1309 | 1309 | ||
1310 | MACHINE_START(EXEDA, "Compulab eXeda") | 1310 | MACHINE_START(EXEDA, "Compulab eXeda") |
1311 | .boot_params = 0xa0000100, | 1311 | .atag_offset = 0x100, |
1312 | .map_io = pxa27x_map_io, | 1312 | .map_io = pxa27x_map_io, |
1313 | .init_irq = pxa27x_init_irq, | 1313 | .init_irq = pxa27x_init_irq, |
1314 | .handle_irq = pxa27x_handle_irq, | 1314 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index e4a1f4dc89ff..8e697dd8accd 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
@@ -188,7 +188,7 @@ static void __init e330_init(void) | |||
188 | 188 | ||
189 | MACHINE_START(E330, "Toshiba e330") | 189 | MACHINE_START(E330, "Toshiba e330") |
190 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 190 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
191 | .boot_params = 0xa0000100, | 191 | .atag_offset = 0x100, |
192 | .map_io = pxa25x_map_io, | 192 | .map_io = pxa25x_map_io, |
193 | .nr_irqs = ESERIES_NR_IRQS, | 193 | .nr_irqs = ESERIES_NR_IRQS, |
194 | .init_irq = pxa25x_init_irq, | 194 | .init_irq = pxa25x_init_irq, |
@@ -238,7 +238,7 @@ static void __init e350_init(void) | |||
238 | 238 | ||
239 | MACHINE_START(E350, "Toshiba e350") | 239 | MACHINE_START(E350, "Toshiba e350") |
240 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 240 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
241 | .boot_params = 0xa0000100, | 241 | .atag_offset = 0x100, |
242 | .map_io = pxa25x_map_io, | 242 | .map_io = pxa25x_map_io, |
243 | .nr_irqs = ESERIES_NR_IRQS, | 243 | .nr_irqs = ESERIES_NR_IRQS, |
244 | .init_irq = pxa25x_init_irq, | 244 | .init_irq = pxa25x_init_irq, |
@@ -361,7 +361,7 @@ static void __init e400_init(void) | |||
361 | 361 | ||
362 | MACHINE_START(E400, "Toshiba e400") | 362 | MACHINE_START(E400, "Toshiba e400") |
363 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 363 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
364 | .boot_params = 0xa0000100, | 364 | .atag_offset = 0x100, |
365 | .map_io = pxa25x_map_io, | 365 | .map_io = pxa25x_map_io, |
366 | .nr_irqs = ESERIES_NR_IRQS, | 366 | .nr_irqs = ESERIES_NR_IRQS, |
367 | .init_irq = pxa25x_init_irq, | 367 | .init_irq = pxa25x_init_irq, |
@@ -550,7 +550,7 @@ static void __init e740_init(void) | |||
550 | 550 | ||
551 | MACHINE_START(E740, "Toshiba e740") | 551 | MACHINE_START(E740, "Toshiba e740") |
552 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 552 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
553 | .boot_params = 0xa0000100, | 553 | .atag_offset = 0x100, |
554 | .map_io = pxa25x_map_io, | 554 | .map_io = pxa25x_map_io, |
555 | .nr_irqs = ESERIES_NR_IRQS, | 555 | .nr_irqs = ESERIES_NR_IRQS, |
556 | .init_irq = pxa25x_init_irq, | 556 | .init_irq = pxa25x_init_irq, |
@@ -742,7 +742,7 @@ static void __init e750_init(void) | |||
742 | 742 | ||
743 | MACHINE_START(E750, "Toshiba e750") | 743 | MACHINE_START(E750, "Toshiba e750") |
744 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 744 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
745 | .boot_params = 0xa0000100, | 745 | .atag_offset = 0x100, |
746 | .map_io = pxa25x_map_io, | 746 | .map_io = pxa25x_map_io, |
747 | .nr_irqs = ESERIES_NR_IRQS, | 747 | .nr_irqs = ESERIES_NR_IRQS, |
748 | .init_irq = pxa25x_init_irq, | 748 | .init_irq = pxa25x_init_irq, |
@@ -947,7 +947,7 @@ static void __init e800_init(void) | |||
947 | 947 | ||
948 | MACHINE_START(E800, "Toshiba e800") | 948 | MACHINE_START(E800, "Toshiba e800") |
949 | /* Maintainer: Ian Molton (spyro@f2s.com) */ | 949 | /* Maintainer: Ian Molton (spyro@f2s.com) */ |
950 | .boot_params = 0xa0000100, | 950 | .atag_offset = 0x100, |
951 | .map_io = pxa25x_map_io, | 951 | .map_io = pxa25x_map_io, |
952 | .nr_irqs = ESERIES_NR_IRQS, | 952 | .nr_irqs = ESERIES_NR_IRQS, |
953 | .init_irq = pxa25x_init_irq, | 953 | .init_irq = pxa25x_init_irq, |
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index b73eadb9f5dc..8308eee5a924 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c | |||
@@ -797,7 +797,7 @@ static void __init a780_init(void) | |||
797 | } | 797 | } |
798 | 798 | ||
799 | MACHINE_START(EZX_A780, "Motorola EZX A780") | 799 | MACHINE_START(EZX_A780, "Motorola EZX A780") |
800 | .boot_params = 0xa0000100, | 800 | .atag_offset = 0x100, |
801 | .map_io = pxa27x_map_io, | 801 | .map_io = pxa27x_map_io, |
802 | .nr_irqs = EZX_NR_IRQS, | 802 | .nr_irqs = EZX_NR_IRQS, |
803 | .init_irq = pxa27x_init_irq, | 803 | .init_irq = pxa27x_init_irq, |
@@ -863,7 +863,7 @@ static void __init e680_init(void) | |||
863 | } | 863 | } |
864 | 864 | ||
865 | MACHINE_START(EZX_E680, "Motorola EZX E680") | 865 | MACHINE_START(EZX_E680, "Motorola EZX E680") |
866 | .boot_params = 0xa0000100, | 866 | .atag_offset = 0x100, |
867 | .map_io = pxa27x_map_io, | 867 | .map_io = pxa27x_map_io, |
868 | .nr_irqs = EZX_NR_IRQS, | 868 | .nr_irqs = EZX_NR_IRQS, |
869 | .init_irq = pxa27x_init_irq, | 869 | .init_irq = pxa27x_init_irq, |
@@ -929,7 +929,7 @@ static void __init a1200_init(void) | |||
929 | } | 929 | } |
930 | 930 | ||
931 | MACHINE_START(EZX_A1200, "Motorola EZX A1200") | 931 | MACHINE_START(EZX_A1200, "Motorola EZX A1200") |
932 | .boot_params = 0xa0000100, | 932 | .atag_offset = 0x100, |
933 | .map_io = pxa27x_map_io, | 933 | .map_io = pxa27x_map_io, |
934 | .nr_irqs = EZX_NR_IRQS, | 934 | .nr_irqs = EZX_NR_IRQS, |
935 | .init_irq = pxa27x_init_irq, | 935 | .init_irq = pxa27x_init_irq, |
@@ -1120,7 +1120,7 @@ static void __init a910_init(void) | |||
1120 | } | 1120 | } |
1121 | 1121 | ||
1122 | MACHINE_START(EZX_A910, "Motorola EZX A910") | 1122 | MACHINE_START(EZX_A910, "Motorola EZX A910") |
1123 | .boot_params = 0xa0000100, | 1123 | .atag_offset = 0x100, |
1124 | .map_io = pxa27x_map_io, | 1124 | .map_io = pxa27x_map_io, |
1125 | .nr_irqs = EZX_NR_IRQS, | 1125 | .nr_irqs = EZX_NR_IRQS, |
1126 | .init_irq = pxa27x_init_irq, | 1126 | .init_irq = pxa27x_init_irq, |
@@ -1186,7 +1186,7 @@ static void __init e6_init(void) | |||
1186 | } | 1186 | } |
1187 | 1187 | ||
1188 | MACHINE_START(EZX_E6, "Motorola EZX E6") | 1188 | MACHINE_START(EZX_E6, "Motorola EZX E6") |
1189 | .boot_params = 0xa0000100, | 1189 | .atag_offset = 0x100, |
1190 | .map_io = pxa27x_map_io, | 1190 | .map_io = pxa27x_map_io, |
1191 | .nr_irqs = EZX_NR_IRQS, | 1191 | .nr_irqs = EZX_NR_IRQS, |
1192 | .init_irq = pxa27x_init_irq, | 1192 | .init_irq = pxa27x_init_irq, |
@@ -1226,7 +1226,7 @@ static void __init e2_init(void) | |||
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | MACHINE_START(EZX_E2, "Motorola EZX E2") | 1228 | MACHINE_START(EZX_E2, "Motorola EZX E2") |
1229 | .boot_params = 0xa0000100, | 1229 | .atag_offset = 0x100, |
1230 | .map_io = pxa27x_map_io, | 1230 | .map_io = pxa27x_map_io, |
1231 | .nr_irqs = EZX_NR_IRQS, | 1231 | .nr_irqs = EZX_NR_IRQS, |
1232 | .init_irq = pxa27x_init_irq, | 1232 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c index deaa111c91f9..9c8208ca0415 100644 --- a/arch/arm/mach-pxa/gumstix.c +++ b/arch/arm/mach-pxa/gumstix.c | |||
@@ -233,7 +233,7 @@ static void __init gumstix_init(void) | |||
233 | } | 233 | } |
234 | 234 | ||
235 | MACHINE_START(GUMSTIX, "Gumstix") | 235 | MACHINE_START(GUMSTIX, "Gumstix") |
236 | .boot_params = 0xa0000100, /* match u-boot bi_boot_params */ | 236 | .atag_offset = 0x100, /* match u-boot bi_boot_params */ |
237 | .map_io = pxa25x_map_io, | 237 | .map_io = pxa25x_map_io, |
238 | .init_irq = pxa25x_init_irq, | 238 | .init_irq = pxa25x_init_irq, |
239 | .handle_irq = pxa25x_handle_irq, | 239 | .handle_irq = pxa25x_handle_irq, |
diff --git a/arch/arm/mach-pxa/h5000.c b/arch/arm/mach-pxa/h5000.c index 0a235128914d..4b5e110640b1 100644 --- a/arch/arm/mach-pxa/h5000.c +++ b/arch/arm/mach-pxa/h5000.c | |||
@@ -203,7 +203,7 @@ static void __init h5000_init(void) | |||
203 | } | 203 | } |
204 | 204 | ||
205 | MACHINE_START(H5400, "HP iPAQ H5000") | 205 | MACHINE_START(H5400, "HP iPAQ H5000") |
206 | .boot_params = 0xa0000100, | 206 | .atag_offset = 0x100, |
207 | .map_io = pxa25x_map_io, | 207 | .map_io = pxa25x_map_io, |
208 | .init_irq = pxa25x_init_irq, | 208 | .init_irq = pxa25x_init_irq, |
209 | .handle_irq = pxa25x_handle_irq, | 209 | .handle_irq = pxa25x_handle_irq, |
diff --git a/arch/arm/mach-pxa/himalaya.c b/arch/arm/mach-pxa/himalaya.c index a997d0ab2872..f2c324570844 100644 --- a/arch/arm/mach-pxa/himalaya.c +++ b/arch/arm/mach-pxa/himalaya.c | |||
@@ -158,7 +158,7 @@ static void __init himalaya_init(void) | |||
158 | 158 | ||
159 | 159 | ||
160 | MACHINE_START(HIMALAYA, "HTC Himalaya") | 160 | MACHINE_START(HIMALAYA, "HTC Himalaya") |
161 | .boot_params = 0xa0000100, | 161 | .atag_offset = 0x100, |
162 | .map_io = pxa25x_map_io, | 162 | .map_io = pxa25x_map_io, |
163 | .init_irq = pxa25x_init_irq, | 163 | .init_irq = pxa25x_init_irq, |
164 | .handle_irq = pxa25x_handle_irq, | 164 | .handle_irq = pxa25x_handle_irq, |
diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index c748a473a2ff..6f6368ece9bd 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c | |||
@@ -838,7 +838,7 @@ static void __init hx4700_init(void) | |||
838 | } | 838 | } |
839 | 839 | ||
840 | MACHINE_START(H4700, "HP iPAQ HX4700") | 840 | MACHINE_START(H4700, "HP iPAQ HX4700") |
841 | .boot_params = 0xa0000100, | 841 | .atag_offset = 0x100, |
842 | .map_io = pxa27x_map_io, | 842 | .map_io = pxa27x_map_io, |
843 | .nr_irqs = HX4700_NR_IRQS, | 843 | .nr_irqs = HX4700_NR_IRQS, |
844 | .init_irq = pxa27x_init_irq, | 844 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c index d427429f1f34..f78d5db758da 100644 --- a/arch/arm/mach-pxa/icontrol.c +++ b/arch/arm/mach-pxa/icontrol.c | |||
@@ -191,7 +191,7 @@ static void __init icontrol_init(void) | |||
191 | } | 191 | } |
192 | 192 | ||
193 | MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") | 193 | MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM") |
194 | .boot_params = 0xa0000100, | 194 | .atag_offset = 0x100, |
195 | .map_io = pxa3xx_map_io, | 195 | .map_io = pxa3xx_map_io, |
196 | .init_irq = pxa3xx_init_irq, | 196 | .init_irq = pxa3xx_init_irq, |
197 | .handle_irq = pxa3xx_handle_irq, | 197 | .handle_irq = pxa3xx_handle_irq, |
diff --git a/arch/arm/mach-pxa/include/mach/debug-macro.S b/arch/arm/mach-pxa/include/mach/debug-macro.S index 7d5c75125d65..70b112e8ef68 100644 --- a/arch/arm/mach-pxa/include/mach/debug-macro.S +++ b/arch/arm/mach-pxa/include/mach/debug-macro.S | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | #include "hardware.h" | 14 | #include "hardware.h" |
15 | 15 | ||
16 | .macro addruart, rp, rv | 16 | .macro addruart, rp, rv, tmp |
17 | mov \rp, #0x00100000 | 17 | mov \rp, #0x00100000 |
18 | orr \rv, \rp, #io_p2v(0x40000000) @ virtual | 18 | orr \rv, \rp, #io_p2v(0x40000000) @ virtual |
19 | orr \rp, \rp, #0x40000000 @ physical | 19 | orr \rp, \rp, #0x40000000 @ physical |
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h deleted file mode 100644 index d05a59727d66..000000000000 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-pxa/include/mach/memory.h | ||
3 | * | ||
4 | * Author: Nicolas Pitre | ||
5 | * Copyright: (C) 2001 MontaVista Software Inc. | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | ||
11 | |||
12 | #ifndef __ASM_ARCH_MEMORY_H | ||
13 | #define __ASM_ARCH_MEMORY_H | ||
14 | |||
15 | /* | ||
16 | * Physical DRAM offset. | ||
17 | */ | ||
18 | #define PLAT_PHYS_OFFSET UL(0xa0000000) | ||
19 | |||
20 | #endif | ||
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c index 8f97e15e86e5..0037e57e0cec 100644 --- a/arch/arm/mach-pxa/littleton.c +++ b/arch/arm/mach-pxa/littleton.c | |||
@@ -437,7 +437,7 @@ static void __init littleton_init(void) | |||
437 | } | 437 | } |
438 | 438 | ||
439 | MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleton)") | 439 | MACHINE_START(LITTLETON, "Marvell Form Factor Development Platform (aka Littleton)") |
440 | .boot_params = 0xa0000100, | 440 | .atag_offset = 0x100, |
441 | .map_io = pxa3xx_map_io, | 441 | .map_io = pxa3xx_map_io, |
442 | .nr_irqs = LITTLETON_NR_IRQS, | 442 | .nr_irqs = LITTLETON_NR_IRQS, |
443 | .init_irq = pxa3xx_init_irq, | 443 | .init_irq = pxa3xx_init_irq, |
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index a3acd968b44d..64540d908958 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
@@ -498,7 +498,7 @@ static void __init lpd270_map_io(void) | |||
498 | 498 | ||
499 | MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine") | 499 | MACHINE_START(LOGICPD_PXA270, "LogicPD PXA270 Card Engine") |
500 | /* Maintainer: Peter Barada */ | 500 | /* Maintainer: Peter Barada */ |
501 | .boot_params = 0xa0000100, | 501 | .atag_offset = 0x100, |
502 | .map_io = lpd270_map_io, | 502 | .map_io = lpd270_map_io, |
503 | .nr_irqs = LPD270_NR_IRQS, | 503 | .nr_irqs = LPD270_NR_IRQS, |
504 | .init_irq = lpd270_init_irq, | 504 | .init_irq = lpd270_init_irq, |
diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index 5fe5bcd7c0a1..4b796c37af3e 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c | |||
@@ -753,7 +753,7 @@ static void __init magician_init(void) | |||
753 | 753 | ||
754 | 754 | ||
755 | MACHINE_START(MAGICIAN, "HTC Magician") | 755 | MACHINE_START(MAGICIAN, "HTC Magician") |
756 | .boot_params = 0xa0000100, | 756 | .atag_offset = 0x100, |
757 | .map_io = pxa27x_map_io, | 757 | .map_io = pxa27x_map_io, |
758 | .nr_irqs = MAGICIAN_NR_IRQS, | 758 | .nr_irqs = MAGICIAN_NR_IRQS, |
759 | .init_irq = pxa27x_init_irq, | 759 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 6bc784bb3696..0567d3965fda 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -615,7 +615,7 @@ static void __init mainstone_map_io(void) | |||
615 | 615 | ||
616 | MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") | 616 | MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") |
617 | /* Maintainer: MontaVista Software Inc. */ | 617 | /* Maintainer: MontaVista Software Inc. */ |
618 | .boot_params = 0xa0000100, /* BLOB boot parameter setting */ | 618 | .atag_offset = 0x100, /* BLOB boot parameter setting */ |
619 | .map_io = mainstone_map_io, | 619 | .map_io = mainstone_map_io, |
620 | .nr_irqs = MAINSTONE_NR_IRQS, | 620 | .nr_irqs = MAINSTONE_NR_IRQS, |
621 | .init_irq = mainstone_init_irq, | 621 | .init_irq = mainstone_init_irq, |
diff --git a/arch/arm/mach-pxa/mioa701.c b/arch/arm/mach-pxa/mioa701.c index 64810f908e5b..b938fc2c316a 100644 --- a/arch/arm/mach-pxa/mioa701.c +++ b/arch/arm/mach-pxa/mioa701.c | |||
@@ -751,7 +751,7 @@ static void mioa701_machine_exit(void) | |||
751 | } | 751 | } |
752 | 752 | ||
753 | MACHINE_START(MIOA701, "MIO A701") | 753 | MACHINE_START(MIOA701, "MIO A701") |
754 | .boot_params = 0xa0000100, | 754 | .atag_offset = 0x100, |
755 | .map_io = &pxa27x_map_io, | 755 | .map_io = &pxa27x_map_io, |
756 | .init_irq = &pxa27x_init_irq, | 756 | .init_irq = &pxa27x_init_irq, |
757 | .handle_irq = &pxa27x_handle_irq, | 757 | .handle_irq = &pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/mp900.c b/arch/arm/mach-pxa/mp900.c index fb408861dbcf..4af5d513c380 100644 --- a/arch/arm/mach-pxa/mp900.c +++ b/arch/arm/mach-pxa/mp900.c | |||
@@ -92,7 +92,7 @@ static void __init mp900c_init(void) | |||
92 | 92 | ||
93 | /* Maintainer - Michael Petchkovsky <mkpetch@internode.on.net> */ | 93 | /* Maintainer - Michael Petchkovsky <mkpetch@internode.on.net> */ |
94 | MACHINE_START(NEC_MP900, "MobilePro900/C") | 94 | MACHINE_START(NEC_MP900, "MobilePro900/C") |
95 | .boot_params = 0xa0220100, | 95 | .atag_offset = 0x220100, |
96 | .timer = &pxa_timer, | 96 | .timer = &pxa_timer, |
97 | .map_io = pxa25x_map_io, | 97 | .map_io = pxa25x_map_io, |
98 | .init_irq = pxa25x_init_irq, | 98 | .init_irq = pxa25x_init_irq, |
diff --git a/arch/arm/mach-pxa/palmld.c b/arch/arm/mach-pxa/palmld.c index 6b77365ed938..3d4a2819cae1 100644 --- a/arch/arm/mach-pxa/palmld.c +++ b/arch/arm/mach-pxa/palmld.c | |||
@@ -342,7 +342,7 @@ static void __init palmld_init(void) | |||
342 | } | 342 | } |
343 | 343 | ||
344 | MACHINE_START(PALMLD, "Palm LifeDrive") | 344 | MACHINE_START(PALMLD, "Palm LifeDrive") |
345 | .boot_params = 0xa0000100, | 345 | .atag_offset = 0x100, |
346 | .map_io = palmld_map_io, | 346 | .map_io = palmld_map_io, |
347 | .init_irq = pxa27x_init_irq, | 347 | .init_irq = pxa27x_init_irq, |
348 | .handle_irq = pxa27x_handle_irq, | 348 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/palmt5.c b/arch/arm/mach-pxa/palmt5.c index 9bd3e47486fb..99d6bcf1f974 100644 --- a/arch/arm/mach-pxa/palmt5.c +++ b/arch/arm/mach-pxa/palmt5.c | |||
@@ -202,7 +202,7 @@ static void __init palmt5_init(void) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | MACHINE_START(PALMT5, "Palm Tungsten|T5") | 204 | MACHINE_START(PALMT5, "Palm Tungsten|T5") |
205 | .boot_params = 0xa0000100, | 205 | .atag_offset = 0x100, |
206 | .map_io = pxa27x_map_io, | 206 | .map_io = pxa27x_map_io, |
207 | .reserve = palmt5_reserve, | 207 | .reserve = palmt5_reserve, |
208 | .init_irq = pxa27x_init_irq, | 208 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/palmtc.c b/arch/arm/mach-pxa/palmtc.c index 6ad4a6c7bc96..6ec7caefb37c 100644 --- a/arch/arm/mach-pxa/palmtc.c +++ b/arch/arm/mach-pxa/palmtc.c | |||
@@ -537,7 +537,7 @@ static void __init palmtc_init(void) | |||
537 | }; | 537 | }; |
538 | 538 | ||
539 | MACHINE_START(PALMTC, "Palm Tungsten|C") | 539 | MACHINE_START(PALMTC, "Palm Tungsten|C") |
540 | .boot_params = 0xa0000100, | 540 | .atag_offset = 0x100, |
541 | .map_io = pxa25x_map_io, | 541 | .map_io = pxa25x_map_io, |
542 | .init_irq = pxa25x_init_irq, | 542 | .init_irq = pxa25x_init_irq, |
543 | .handle_irq = pxa25x_handle_irq, | 543 | .handle_irq = pxa25x_handle_irq, |
diff --git a/arch/arm/mach-pxa/palmte2.c b/arch/arm/mach-pxa/palmte2.c index 664232f3e62c..9376da06404c 100644 --- a/arch/arm/mach-pxa/palmte2.c +++ b/arch/arm/mach-pxa/palmte2.c | |||
@@ -356,7 +356,7 @@ static void __init palmte2_init(void) | |||
356 | } | 356 | } |
357 | 357 | ||
358 | MACHINE_START(PALMTE2, "Palm Tungsten|E2") | 358 | MACHINE_START(PALMTE2, "Palm Tungsten|E2") |
359 | .boot_params = 0xa0000100, | 359 | .atag_offset = 0x100, |
360 | .map_io = pxa25x_map_io, | 360 | .map_io = pxa25x_map_io, |
361 | .init_irq = pxa25x_init_irq, | 361 | .init_irq = pxa25x_init_irq, |
362 | .handle_irq = pxa25x_handle_irq, | 362 | .handle_irq = pxa25x_handle_irq, |
diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c index bb27d4b688d8..7346fbfa8101 100644 --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c | |||
@@ -440,7 +440,7 @@ static void __init centro_init(void) | |||
440 | } | 440 | } |
441 | 441 | ||
442 | MACHINE_START(TREO680, "Palm Treo 680") | 442 | MACHINE_START(TREO680, "Palm Treo 680") |
443 | .boot_params = 0xa0000100, | 443 | .atag_offset = 0x100, |
444 | .map_io = pxa27x_map_io, | 444 | .map_io = pxa27x_map_io, |
445 | .reserve = treo_reserve, | 445 | .reserve = treo_reserve, |
446 | .init_irq = pxa27x_init_irq, | 446 | .init_irq = pxa27x_init_irq, |
@@ -450,7 +450,7 @@ MACHINE_START(TREO680, "Palm Treo 680") | |||
450 | MACHINE_END | 450 | MACHINE_END |
451 | 451 | ||
452 | MACHINE_START(CENTRO, "Palm Centro 685") | 452 | MACHINE_START(CENTRO, "Palm Centro 685") |
453 | .boot_params = 0xa0000100, | 453 | .atag_offset = 0x100, |
454 | .map_io = pxa27x_map_io, | 454 | .map_io = pxa27x_map_io, |
455 | .reserve = treo_reserve, | 455 | .reserve = treo_reserve, |
456 | .init_irq = pxa27x_init_irq, | 456 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index fc4285589c1f..2b9e76fc2c90 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -364,7 +364,7 @@ static void __init palmtx_init(void) | |||
364 | } | 364 | } |
365 | 365 | ||
366 | MACHINE_START(PALMTX, "Palm T|X") | 366 | MACHINE_START(PALMTX, "Palm T|X") |
367 | .boot_params = 0xa0000100, | 367 | .atag_offset = 0x100, |
368 | .map_io = palmtx_map_io, | 368 | .map_io = palmtx_map_io, |
369 | .init_irq = pxa27x_init_irq, | 369 | .init_irq = pxa27x_init_irq, |
370 | .handle_irq = pxa27x_handle_irq, | 370 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/palmz72.c b/arch/arm/mach-pxa/palmz72.c index e61c1cc05519..68e18baf8e07 100644 --- a/arch/arm/mach-pxa/palmz72.c +++ b/arch/arm/mach-pxa/palmz72.c | |||
@@ -399,7 +399,7 @@ static void __init palmz72_init(void) | |||
399 | } | 399 | } |
400 | 400 | ||
401 | MACHINE_START(PALMZ72, "Palm Zire72") | 401 | MACHINE_START(PALMZ72, "Palm Zire72") |
402 | .boot_params = 0xa0000100, | 402 | .atag_offset = 0x100, |
403 | .map_io = pxa27x_map_io, | 403 | .map_io = pxa27x_map_io, |
404 | .init_irq = pxa27x_init_irq, | 404 | .init_irq = pxa27x_init_irq, |
405 | .handle_irq = pxa27x_handle_irq, | 405 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/pcm027.c b/arch/arm/mach-pxa/pcm027.c index ffa65dfb8c6f..0b825a353537 100644 --- a/arch/arm/mach-pxa/pcm027.c +++ b/arch/arm/mach-pxa/pcm027.c | |||
@@ -258,7 +258,7 @@ static void __init pcm027_map_io(void) | |||
258 | 258 | ||
259 | MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270") | 259 | MACHINE_START(PCM027, "Phytec Messtechnik GmbH phyCORE-PXA270") |
260 | /* Maintainer: Pengutronix */ | 260 | /* Maintainer: Pengutronix */ |
261 | .boot_params = 0xa0000100, | 261 | .atag_offset = 0x100, |
262 | .map_io = pcm027_map_io, | 262 | .map_io = pcm027_map_io, |
263 | .nr_irqs = PCM027_NR_IRQS, | 263 | .nr_irqs = PCM027_NR_IRQS, |
264 | .init_irq = pxa27x_init_irq, | 264 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c index bbcd90562ebe..6810cddec927 100644 --- a/arch/arm/mach-pxa/raumfeld.c +++ b/arch/arm/mach-pxa/raumfeld.c | |||
@@ -1086,7 +1086,7 @@ static void __init raumfeld_speaker_init(void) | |||
1086 | 1086 | ||
1087 | #ifdef CONFIG_MACH_RAUMFELD_RC | 1087 | #ifdef CONFIG_MACH_RAUMFELD_RC |
1088 | MACHINE_START(RAUMFELD_RC, "Raumfeld Controller") | 1088 | MACHINE_START(RAUMFELD_RC, "Raumfeld Controller") |
1089 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, | 1089 | .atag_offset = 0x100, |
1090 | .init_machine = raumfeld_controller_init, | 1090 | .init_machine = raumfeld_controller_init, |
1091 | .map_io = pxa3xx_map_io, | 1091 | .map_io = pxa3xx_map_io, |
1092 | .init_irq = pxa3xx_init_irq, | 1092 | .init_irq = pxa3xx_init_irq, |
@@ -1097,7 +1097,7 @@ MACHINE_END | |||
1097 | 1097 | ||
1098 | #ifdef CONFIG_MACH_RAUMFELD_CONNECTOR | 1098 | #ifdef CONFIG_MACH_RAUMFELD_CONNECTOR |
1099 | MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector") | 1099 | MACHINE_START(RAUMFELD_CONNECTOR, "Raumfeld Connector") |
1100 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, | 1100 | .atag_offset = 0x100, |
1101 | .init_machine = raumfeld_connector_init, | 1101 | .init_machine = raumfeld_connector_init, |
1102 | .map_io = pxa3xx_map_io, | 1102 | .map_io = pxa3xx_map_io, |
1103 | .init_irq = pxa3xx_init_irq, | 1103 | .init_irq = pxa3xx_init_irq, |
@@ -1108,7 +1108,7 @@ MACHINE_END | |||
1108 | 1108 | ||
1109 | #ifdef CONFIG_MACH_RAUMFELD_SPEAKER | 1109 | #ifdef CONFIG_MACH_RAUMFELD_SPEAKER |
1110 | MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker") | 1110 | MACHINE_START(RAUMFELD_SPEAKER, "Raumfeld Speaker") |
1111 | .boot_params = RAUMFELD_SDRAM_BASE + 0x100, | 1111 | .atag_offset = 0x100, |
1112 | .init_machine = raumfeld_speaker_init, | 1112 | .init_machine = raumfeld_speaker_init, |
1113 | .map_io = pxa3xx_map_io, | 1113 | .map_io = pxa3xx_map_io, |
1114 | .init_irq = pxa3xx_init_irq, | 1114 | .init_irq = pxa3xx_init_irq, |
diff --git a/arch/arm/mach-pxa/saar.c b/arch/arm/mach-pxa/saar.c index 72001ec6e7b5..fc2c1e05af9c 100644 --- a/arch/arm/mach-pxa/saar.c +++ b/arch/arm/mach-pxa/saar.c | |||
@@ -596,7 +596,7 @@ static void __init saar_init(void) | |||
596 | 596 | ||
597 | MACHINE_START(SAAR, "PXA930 Handheld Platform (aka SAAR)") | 597 | MACHINE_START(SAAR, "PXA930 Handheld Platform (aka SAAR)") |
598 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ | 598 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ |
599 | .boot_params = 0xa0000100, | 599 | .atag_offset = 0x100, |
600 | .map_io = pxa3xx_map_io, | 600 | .map_io = pxa3xx_map_io, |
601 | .init_irq = pxa3xx_init_irq, | 601 | .init_irq = pxa3xx_init_irq, |
602 | .handle_irq = pxa3xx_handle_irq, | 602 | .handle_irq = pxa3xx_handle_irq, |
diff --git a/arch/arm/mach-pxa/saarb.c b/arch/arm/mach-pxa/saarb.c index eb6a10d85b03..3c988b6f718f 100644 --- a/arch/arm/mach-pxa/saarb.c +++ b/arch/arm/mach-pxa/saarb.c | |||
@@ -103,7 +103,7 @@ static void __init saarb_init(void) | |||
103 | } | 103 | } |
104 | 104 | ||
105 | MACHINE_START(SAARB, "PXA955 Handheld Platform (aka SAARB)") | 105 | MACHINE_START(SAARB, "PXA955 Handheld Platform (aka SAARB)") |
106 | .boot_params = 0xa0000100, | 106 | .atag_offset = 0x100, |
107 | .map_io = pxa3xx_map_io, | 107 | .map_io = pxa3xx_map_io, |
108 | .nr_irqs = SAARB_NR_IRQS, | 108 | .nr_irqs = SAARB_NR_IRQS, |
109 | .init_irq = pxa95x_init_irq, | 109 | .init_irq = pxa95x_init_irq, |
diff --git a/arch/arm/mach-pxa/stargate2.c b/arch/arm/mach-pxa/stargate2.c index 3f8d0af9e2f7..4c9a48bef569 100644 --- a/arch/arm/mach-pxa/stargate2.c +++ b/arch/arm/mach-pxa/stargate2.c | |||
@@ -1004,7 +1004,7 @@ MACHINE_START(INTELMOTE2, "IMOTE 2") | |||
1004 | .handle_irq = pxa27x_handle_irq, | 1004 | .handle_irq = pxa27x_handle_irq, |
1005 | .timer = &pxa_timer, | 1005 | .timer = &pxa_timer, |
1006 | .init_machine = imote2_init, | 1006 | .init_machine = imote2_init, |
1007 | .boot_params = 0xA0000100, | 1007 | .atag_offset = 0x100, |
1008 | MACHINE_END | 1008 | MACHINE_END |
1009 | #endif | 1009 | #endif |
1010 | 1010 | ||
@@ -1016,6 +1016,6 @@ MACHINE_START(STARGATE2, "Stargate 2") | |||
1016 | .handle_irq = pxa27x_handle_irq, | 1016 | .handle_irq = pxa27x_handle_irq, |
1017 | .timer = &pxa_timer, | 1017 | .timer = &pxa_timer, |
1018 | .init_machine = stargate2_init, | 1018 | .init_machine = stargate2_init, |
1019 | .boot_params = 0xA0000100, | 1019 | .atag_offset = 0x100, |
1020 | MACHINE_END | 1020 | MACHINE_END |
1021 | #endif | 1021 | #endif |
diff --git a/arch/arm/mach-pxa/tavorevb.c b/arch/arm/mach-pxa/tavorevb.c index 32fb58e01b10..ad47bb98f30d 100644 --- a/arch/arm/mach-pxa/tavorevb.c +++ b/arch/arm/mach-pxa/tavorevb.c | |||
@@ -489,7 +489,7 @@ static void __init tavorevb_init(void) | |||
489 | 489 | ||
490 | MACHINE_START(TAVOREVB, "PXA930 Evaluation Board (aka TavorEVB)") | 490 | MACHINE_START(TAVOREVB, "PXA930 Evaluation Board (aka TavorEVB)") |
491 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ | 491 | /* Maintainer: Eric Miao <eric.miao@marvell.com> */ |
492 | .boot_params = 0xa0000100, | 492 | .atag_offset = 0x100, |
493 | .map_io = pxa3xx_map_io, | 493 | .map_io = pxa3xx_map_io, |
494 | .init_irq = pxa3xx_init_irq, | 494 | .init_irq = pxa3xx_init_irq, |
495 | .handle_irq = pxa3xx_handle_irq, | 495 | .handle_irq = pxa3xx_handle_irq, |
diff --git a/arch/arm/mach-pxa/tavorevb3.c b/arch/arm/mach-pxa/tavorevb3.c index fd5a8eae0a87..fd569167302a 100644 --- a/arch/arm/mach-pxa/tavorevb3.c +++ b/arch/arm/mach-pxa/tavorevb3.c | |||
@@ -125,7 +125,7 @@ static void __init evb3_init(void) | |||
125 | } | 125 | } |
126 | 126 | ||
127 | MACHINE_START(TAVOREVB3, "PXA950 Evaluation Board (aka TavorEVB3)") | 127 | MACHINE_START(TAVOREVB3, "PXA950 Evaluation Board (aka TavorEVB3)") |
128 | .boot_params = 0xa0000100, | 128 | .atag_offset = 0x100, |
129 | .map_io = pxa3xx_map_io, | 129 | .map_io = pxa3xx_map_io, |
130 | .nr_irqs = TAVOREVB3_NR_IRQS, | 130 | .nr_irqs = TAVOREVB3_NR_IRQS, |
131 | .init_irq = pxa3xx_init_irq, | 131 | .init_irq = pxa3xx_init_irq, |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index c0417508f39d..35bbf13724b9 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -554,7 +554,7 @@ static void __init trizeps4_map_io(void) | |||
554 | 554 | ||
555 | MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module") | 555 | MACHINE_START(TRIZEPS4, "Keith und Koep Trizeps IV module") |
556 | /* MAINTAINER("Jürgen Schindele") */ | 556 | /* MAINTAINER("Jürgen Schindele") */ |
557 | .boot_params = TRIZEPS4_SDRAM_BASE + 0x100, | 557 | .atag_offset = 0x100, |
558 | .init_machine = trizeps4_init, | 558 | .init_machine = trizeps4_init, |
559 | .map_io = trizeps4_map_io, | 559 | .map_io = trizeps4_map_io, |
560 | .init_irq = pxa27x_init_irq, | 560 | .init_irq = pxa27x_init_irq, |
@@ -564,7 +564,7 @@ MACHINE_END | |||
564 | 564 | ||
565 | MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module") | 565 | MACHINE_START(TRIZEPS4WL, "Keith und Koep Trizeps IV-WL module") |
566 | /* MAINTAINER("Jürgen Schindele") */ | 566 | /* MAINTAINER("Jürgen Schindele") */ |
567 | .boot_params = TRIZEPS4_SDRAM_BASE + 0x100, | 567 | .atag_offset = 0x100, |
568 | .init_machine = trizeps4_init, | 568 | .init_machine = trizeps4_init, |
569 | .map_io = trizeps4_map_io, | 569 | .map_io = trizeps4_map_io, |
570 | .init_irq = pxa27x_init_irq, | 570 | .init_irq = pxa27x_init_irq, |
diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c index d4a3dc74e84a..242ddae332d3 100644 --- a/arch/arm/mach-pxa/viper.c +++ b/arch/arm/mach-pxa/viper.c | |||
@@ -992,7 +992,7 @@ static void __init viper_map_io(void) | |||
992 | 992 | ||
993 | MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC") | 993 | MACHINE_START(VIPER, "Arcom/Eurotech VIPER SBC") |
994 | /* Maintainer: Marc Zyngier <maz@misterjones.org> */ | 994 | /* Maintainer: Marc Zyngier <maz@misterjones.org> */ |
995 | .boot_params = 0xa0000100, | 995 | .atag_offset = 0x100, |
996 | .map_io = viper_map_io, | 996 | .map_io = viper_map_io, |
997 | .init_irq = viper_init_irq, | 997 | .init_irq = viper_init_irq, |
998 | .handle_irq = pxa25x_handle_irq, | 998 | .handle_irq = pxa25x_handle_irq, |
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c index 5f8490ab07cb..a7539a6ed1ff 100644 --- a/arch/arm/mach-pxa/vpac270.c +++ b/arch/arm/mach-pxa/vpac270.c | |||
@@ -716,7 +716,7 @@ static void __init vpac270_init(void) | |||
716 | } | 716 | } |
717 | 717 | ||
718 | MACHINE_START(VPAC270, "Voipac PXA270") | 718 | MACHINE_START(VPAC270, "Voipac PXA270") |
719 | .boot_params = 0xa0000100, | 719 | .atag_offset = 0x100, |
720 | .map_io = pxa27x_map_io, | 720 | .map_io = pxa27x_map_io, |
721 | .init_irq = pxa27x_init_irq, | 721 | .init_irq = pxa27x_init_irq, |
722 | .handle_irq = pxa27x_handle_irq, | 722 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/xcep.c b/arch/arm/mach-pxa/xcep.c index 937c42845df9..70e1730ef282 100644 --- a/arch/arm/mach-pxa/xcep.c +++ b/arch/arm/mach-pxa/xcep.c | |||
@@ -179,7 +179,7 @@ static void __init xcep_init(void) | |||
179 | } | 179 | } |
180 | 180 | ||
181 | MACHINE_START(XCEP, "Iskratel XCEP") | 181 | MACHINE_START(XCEP, "Iskratel XCEP") |
182 | .boot_params = 0xa0000100, | 182 | .atag_offset = 0x100, |
183 | .init_machine = xcep_init, | 183 | .init_machine = xcep_init, |
184 | .map_io = pxa25x_map_io, | 184 | .map_io = pxa25x_map_io, |
185 | .init_irq = pxa25x_init_irq, | 185 | .init_irq = pxa25x_init_irq, |
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c index 6c9275a20c91..84ed72de53b5 100644 --- a/arch/arm/mach-pxa/z2.c +++ b/arch/arm/mach-pxa/z2.c | |||
@@ -686,7 +686,7 @@ static void z2_power_off(void) | |||
686 | */ | 686 | */ |
687 | PSPR = 0x0; | 687 | PSPR = 0x0; |
688 | local_irq_disable(); | 688 | local_irq_disable(); |
689 | pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PLAT_PHYS_OFFSET - PAGE_OFFSET); | 689 | pxa27x_cpu_suspend(PWRMODE_DEEPSLEEP, PHYS_OFFSET - PAGE_OFFSET); |
690 | } | 690 | } |
691 | #else | 691 | #else |
692 | #define z2_power_off NULL | 692 | #define z2_power_off NULL |
@@ -718,7 +718,7 @@ static void __init z2_init(void) | |||
718 | } | 718 | } |
719 | 719 | ||
720 | MACHINE_START(ZIPIT2, "Zipit Z2") | 720 | MACHINE_START(ZIPIT2, "Zipit Z2") |
721 | .boot_params = 0xa0000100, | 721 | .atag_offset = 0x100, |
722 | .map_io = pxa27x_map_io, | 722 | .map_io = pxa27x_map_io, |
723 | .init_irq = pxa27x_init_irq, | 723 | .init_irq = pxa27x_init_irq, |
724 | .handle_irq = pxa27x_handle_irq, | 724 | .handle_irq = pxa27x_handle_irq, |
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c index 99c49bcd9f70..c424e7d85ce3 100644 --- a/arch/arm/mach-pxa/zeus.c +++ b/arch/arm/mach-pxa/zeus.c | |||
@@ -904,7 +904,7 @@ static void __init zeus_map_io(void) | |||
904 | 904 | ||
905 | MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS") | 905 | MACHINE_START(ARCOM_ZEUS, "Arcom/Eurotech ZEUS") |
906 | /* Maintainer: Marc Zyngier <maz@misterjones.org> */ | 906 | /* Maintainer: Marc Zyngier <maz@misterjones.org> */ |
907 | .boot_params = 0xa0000100, | 907 | .atag_offset = 0x100, |
908 | .map_io = zeus_map_io, | 908 | .map_io = zeus_map_io, |
909 | .nr_irqs = ZEUS_NR_IRQS, | 909 | .nr_irqs = ZEUS_NR_IRQS, |
910 | .init_irq = zeus_init_irq, | 910 | .init_irq = zeus_init_irq, |
diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 15ec66b3471a..31d496891891 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c | |||
@@ -422,7 +422,7 @@ static void __init zylonite_init(void) | |||
422 | } | 422 | } |
423 | 423 | ||
424 | MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") | 424 | MACHINE_START(ZYLONITE, "PXA3xx Platform Development Kit (aka Zylonite)") |
425 | .boot_params = 0xa0000100, | 425 | .atag_offset = 0x100, |
426 | .map_io = pxa3xx_map_io, | 426 | .map_io = pxa3xx_map_io, |
427 | .nr_irqs = ZYLONITE_NR_IRQS, | 427 | .nr_irqs = ZYLONITE_NR_IRQS, |
428 | .init_irq = pxa3xx_init_irq, | 428 | .init_irq = pxa3xx_init_irq, |