diff options
Diffstat (limited to 'arch/arm/mach-sa1100')
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/cerf.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/collie.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 30 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/hackkit.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/lart.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/pleb.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/shannon.c | 10 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/simpad.c | 12 |
11 files changed, 78 insertions, 52 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index bedf88fafe08..4d4d303ee3a8 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
| @@ -431,11 +431,13 @@ static void __init assabet_map_io(void) | |||
| 431 | 431 | ||
| 432 | 432 | ||
| 433 | MACHINE_START(ASSABET, "Intel-Assabet") | 433 | MACHINE_START(ASSABET, "Intel-Assabet") |
| 434 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 434 | .phys_ram = 0xc0000000, |
| 435 | BOOT_PARAMS(0xc0000100) | 435 | .phys_io = 0x80000000, |
| 436 | FIXUP(fixup_assabet) | 436 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 437 | MAPIO(assabet_map_io) | 437 | .boot_params = 0xc0000100, |
| 438 | INITIRQ(sa1100_init_irq) | 438 | .fixup = fixup_assabet, |
| 439 | .map_io = assabet_map_io, | ||
| 440 | .init_irq = sa1100_init_irq, | ||
| 439 | .timer = &sa1100_timer, | 441 | .timer = &sa1100_timer, |
| 440 | .init_machine = assabet_init, | 442 | .init_machine = assabet_init, |
| 441 | MACHINE_END | 443 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index 6a60b497ab42..b6169cb09196 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
| @@ -285,9 +285,11 @@ static void __init badge4_map_io(void) | |||
| 285 | } | 285 | } |
| 286 | 286 | ||
| 287 | MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") | 287 | MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") |
| 288 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 288 | .phys_ram = 0xc0000000, |
| 289 | BOOT_PARAMS(0xc0000100) | 289 | .phys_io = 0x80000000, |
| 290 | MAPIO(badge4_map_io) | 290 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 291 | INITIRQ(sa1100_init_irq) | 291 | .boot_params = 0xc0000100, |
| 292 | .map_io = badge4_map_io, | ||
| 293 | .init_irq = sa1100_init_irq, | ||
| 292 | .timer = &sa1100_timer, | 294 | .timer = &sa1100_timer, |
| 293 | MACHINE_END | 295 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/cerf.c b/arch/arm/mach-sa1100/cerf.c index f8edde5e7cbf..0aa918e24c31 100644 --- a/arch/arm/mach-sa1100/cerf.c +++ b/arch/arm/mach-sa1100/cerf.c | |||
| @@ -123,10 +123,12 @@ static void __init cerf_init(void) | |||
| 123 | } | 123 | } |
| 124 | 124 | ||
| 125 | MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") | 125 | MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") |
| 126 | MAINTAINER("support@intrinsyc.com") | 126 | /* Maintainer: support@intrinsyc.com */ |
| 127 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 127 | .phys_ram = 0xc0000000, |
| 128 | MAPIO(cerf_map_io) | 128 | .phys_io = 0x80000000, |
| 129 | INITIRQ(cerf_init_irq) | 129 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 130 | .map_io = cerf_map_io, | ||
| 131 | .init_irq = cerf_init_irq, | ||
| 130 | .timer = &sa1100_timer, | 132 | .timer = &sa1100_timer, |
| 131 | .init_machine = cerf_init, | 133 | .init_machine = cerf_init, |
| 132 | MACHINE_END | 134 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index 99287890d396..8cb69113a57c 100644 --- a/arch/arm/mach-sa1100/collie.c +++ b/arch/arm/mach-sa1100/collie.c | |||
| @@ -184,9 +184,11 @@ static void __init collie_map_io(void) | |||
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | MACHINE_START(COLLIE, "Sharp-Collie") | 186 | MACHINE_START(COLLIE, "Sharp-Collie") |
| 187 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 187 | .phys_ram = 0xc0000000, |
| 188 | MAPIO(collie_map_io) | 188 | .phys_io = 0x80000000, |
| 189 | INITIRQ(sa1100_init_irq) | 189 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 190 | .map_io = collie_map_io, | ||
| 191 | .init_irq = sa1100_init_irq, | ||
| 190 | .timer = &sa1100_timer, | 192 | .timer = &sa1100_timer, |
| 191 | .init_machine = collie_init, | 193 | .init_machine = collie_init, |
| 192 | MACHINE_END | 194 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 65dbe991426d..e7aa2681ca64 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
| @@ -380,10 +380,12 @@ static void __init h3100_map_io(void) | |||
| 380 | } | 380 | } |
| 381 | 381 | ||
| 382 | MACHINE_START(H3100, "Compaq iPAQ H3100") | 382 | MACHINE_START(H3100, "Compaq iPAQ H3100") |
| 383 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 383 | .phys_ram = 0xc0000000, |
| 384 | BOOT_PARAMS(0xc0000100) | 384 | .phys_io = 0x80000000, |
| 385 | MAPIO(h3100_map_io) | 385 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 386 | INITIRQ(sa1100_init_irq) | 386 | .boot_params = 0xc0000100, |
| 387 | .map_io = h3100_map_io, | ||
| 388 | .init_irq = sa1100_init_irq, | ||
| 387 | .timer = &sa1100_timer, | 389 | .timer = &sa1100_timer, |
| 388 | .init_machine = h3xxx_mach_init, | 390 | .init_machine = h3xxx_mach_init, |
| 389 | MACHINE_END | 391 | MACHINE_END |
| @@ -496,10 +498,12 @@ static void __init h3600_map_io(void) | |||
| 496 | } | 498 | } |
| 497 | 499 | ||
| 498 | MACHINE_START(H3600, "Compaq iPAQ H3600") | 500 | MACHINE_START(H3600, "Compaq iPAQ H3600") |
| 499 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 501 | .phys_ram = 0xc0000000, |
| 500 | BOOT_PARAMS(0xc0000100) | 502 | .phys_io = 0x80000000, |
| 501 | MAPIO(h3600_map_io) | 503 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 502 | INITIRQ(sa1100_init_irq) | 504 | .boot_params = 0xc0000100, |
| 505 | .map_io = h3600_map_io, | ||
| 506 | .init_irq = sa1100_init_irq, | ||
| 503 | .timer = &sa1100_timer, | 507 | .timer = &sa1100_timer, |
| 504 | .init_machine = h3xxx_mach_init, | 508 | .init_machine = h3xxx_mach_init, |
| 505 | MACHINE_END | 509 | MACHINE_END |
| @@ -881,10 +885,12 @@ static void __init h3800_map_io(void) | |||
| 881 | } | 885 | } |
| 882 | 886 | ||
| 883 | MACHINE_START(H3800, "Compaq iPAQ H3800") | 887 | MACHINE_START(H3800, "Compaq iPAQ H3800") |
| 884 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 888 | .phys_ram = 0xc0000000, |
| 885 | BOOT_PARAMS(0xc0000100) | 889 | .phys_io = 0x80000000, |
| 886 | MAPIO(h3800_map_io) | 890 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 887 | INITIRQ(h3800_init_irq) | 891 | .boot_params = 0xc0000100, |
| 892 | .map_io = h3800_map_io, | ||
| 893 | .init_irq = h3800_init_irq, | ||
| 888 | .timer = &sa1100_timer, | 894 | .timer = &sa1100_timer, |
| 889 | .init_machine = h3xxx_mach_init, | 895 | .init_machine = h3xxx_mach_init, |
| 890 | MACHINE_END | 896 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/hackkit.c b/arch/arm/mach-sa1100/hackkit.c index 570841779714..502d65cfe654 100644 --- a/arch/arm/mach-sa1100/hackkit.c +++ b/arch/arm/mach-sa1100/hackkit.c | |||
| @@ -191,10 +191,12 @@ static void __init hackkit_init(void) | |||
| 191 | */ | 191 | */ |
| 192 | 192 | ||
| 193 | MACHINE_START(HACKKIT, "HackKit Cpu Board") | 193 | MACHINE_START(HACKKIT, "HackKit Cpu Board") |
| 194 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 194 | .phys_ram = 0xc0000000, |
| 195 | BOOT_PARAMS(0xc0000100) | 195 | .phys_io = 0x80000000, |
| 196 | MAPIO(hackkit_map_io) | 196 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 197 | INITIRQ(sa1100_init_irq) | 197 | .boot_params = 0xc0000100, |
| 198 | .map_io = hackkit_map_io, | ||
| 199 | .init_irq = sa1100_init_irq, | ||
| 198 | .timer = &sa1100_timer, | 200 | .timer = &sa1100_timer, |
| 199 | .init_machine = hackkit_init, | 201 | .init_machine = hackkit_init, |
| 200 | MACHINE_END | 202 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 6be78291a878..eee3cbc5ec4f 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c | |||
| @@ -97,9 +97,11 @@ static void __init jornada720_map_io(void) | |||
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | MACHINE_START(JORNADA720, "HP Jornada 720") | 99 | MACHINE_START(JORNADA720, "HP Jornada 720") |
| 100 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 100 | .phys_ram = 0xc0000000, |
| 101 | BOOT_PARAMS(0xc0000100) | 101 | .phys_io = 0x80000000, |
| 102 | MAPIO(jornada720_map_io) | 102 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 103 | INITIRQ(sa1100_init_irq) | 103 | .boot_params = 0xc0000100, |
| 104 | .map_io = jornada720_map_io, | ||
| 105 | .init_irq = sa1100_init_irq, | ||
| 104 | .timer = &sa1100_timer, | 106 | .timer = &sa1100_timer, |
| 105 | MACHINE_END | 107 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/lart.c b/arch/arm/mach-sa1100/lart.c index 51c08ccfb8db..870b488aeda4 100644 --- a/arch/arm/mach-sa1100/lart.c +++ b/arch/arm/mach-sa1100/lart.c | |||
| @@ -41,9 +41,11 @@ static void __init lart_map_io(void) | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | MACHINE_START(LART, "LART") | 43 | MACHINE_START(LART, "LART") |
| 44 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 44 | .phys_ram = 0xc0000000, |
| 45 | BOOT_PARAMS(0xc0000100) | 45 | .phys_io = 0x80000000, |
| 46 | MAPIO(lart_map_io) | 46 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 47 | INITIRQ(sa1100_init_irq) | 47 | .boot_params = 0xc0000100, |
| 48 | .map_io = lart_map_io, | ||
| 49 | .init_irq = sa1100_init_irq, | ||
| 48 | .timer = &sa1100_timer, | 50 | .timer = &sa1100_timer, |
| 49 | MACHINE_END | 51 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/pleb.c b/arch/arm/mach-sa1100/pleb.c index 5606bd71b024..e17b58fb9c9c 100644 --- a/arch/arm/mach-sa1100/pleb.c +++ b/arch/arm/mach-sa1100/pleb.c | |||
| @@ -146,9 +146,11 @@ static void __init pleb_map_io(void) | |||
| 146 | } | 146 | } |
| 147 | 147 | ||
| 148 | MACHINE_START(PLEB, "PLEB") | 148 | MACHINE_START(PLEB, "PLEB") |
| 149 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 149 | .phys_ram = 0xc0000000, |
| 150 | MAPIO(pleb_map_io) | 150 | .phys_io = 0x80000000, |
| 151 | INITIRQ(sa1100_init_irq) | 151 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 152 | .map_io = pleb_map_io, | ||
| 153 | .init_irq = sa1100_init_irq, | ||
| 152 | .timer = &sa1100_timer, | 154 | .timer = &sa1100_timer, |
| 153 | .init_machine = pleb_init, | 155 | .init_machine = pleb_init, |
| 154 | MACHINE_END | 156 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/shannon.c b/arch/arm/mach-sa1100/shannon.c index edddd559be02..43a00359fcdd 100644 --- a/arch/arm/mach-sa1100/shannon.c +++ b/arch/arm/mach-sa1100/shannon.c | |||
| @@ -76,10 +76,12 @@ static void __init shannon_map_io(void) | |||
| 76 | } | 76 | } |
| 77 | 77 | ||
| 78 | MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") | 78 | MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") |
| 79 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 79 | .phys_ram = 0xc0000000, |
| 80 | BOOT_PARAMS(0xc0000100) | 80 | .phys_io = 0x80000000, |
| 81 | MAPIO(shannon_map_io) | 81 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 82 | INITIRQ(sa1100_init_irq) | 82 | .boot_params = 0xc0000100, |
| 83 | .map_io = shannon_map_io, | ||
| 84 | .init_irq = sa1100_init_irq, | ||
| 83 | .timer = &sa1100_timer, | 85 | .timer = &sa1100_timer, |
| 84 | .init_machine = shannon_init, | 86 | .init_machine = shannon_init, |
| 85 | MACHINE_END | 87 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/simpad.c b/arch/arm/mach-sa1100/simpad.c index 8d113d629867..77978586b126 100644 --- a/arch/arm/mach-sa1100/simpad.c +++ b/arch/arm/mach-sa1100/simpad.c | |||
| @@ -215,10 +215,12 @@ arch_initcall(simpad_init); | |||
| 215 | 215 | ||
| 216 | 216 | ||
| 217 | MACHINE_START(SIMPAD, "Simpad") | 217 | MACHINE_START(SIMPAD, "Simpad") |
| 218 | MAINTAINER("Holger Freyther") | 218 | /* Maintainer: Holger Freyther */ |
| 219 | BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) | 219 | .phys_ram = 0xc0000000, |
| 220 | BOOT_PARAMS(0xc0000100) | 220 | .phys_io = 0x80000000, |
| 221 | MAPIO(simpad_map_io) | 221 | .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, |
| 222 | INITIRQ(sa1100_init_irq) | 222 | .boot_params = 0xc0000100, |
| 223 | .map_io = simpad_map_io, | ||
| 224 | .init_irq = sa1100_init_irq, | ||
| 223 | .timer = &sa1100_timer, | 225 | .timer = &sa1100_timer, |
| 224 | MACHINE_END | 226 | MACHINE_END |
