Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
+609
-491
+6
-4
arch/arm/mach-aaec2000/aaed2000.c
+6
-4
arch/arm/mach-aaec2000/aaed2000.c
···
40
40
}
41
41
42
42
MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
43
-
MAINTAINER("Nicolas Bellido Y Ortega")
44
-
BOOT_MEM(0xf0000000, PIO_BASE, VIO_BASE)
45
-
MAPIO(aaed2000_map_io)
46
-
INITIRQ(aaed2000_init_irq)
43
+
/* Maintainer: Nicolas Bellido Y Ortega */
44
+
.phys_ram = 0xf0000000,
45
+
.phys_io = PIO_BASE,
46
+
.io_pg_offst = ((VIO_BASE) >> 18) & 0xfffc,
47
+
.map_io = aaed2000_map_io,
48
+
.init_irq = aaed2000_init_irq,
47
49
.timer = &aaec2000_timer,
48
50
MACHINE_END
+7
-5
arch/arm/mach-clps711x/autcpu12.c
+7
-5
arch/arm/mach-clps711x/autcpu12.c
···
59
59
}
60
60
61
61
MACHINE_START(AUTCPU12, "autronix autcpu12")
62
-
MAINTAINER("Thomas Gleixner")
63
-
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
64
-
BOOT_PARAMS(0xc0020000)
65
-
MAPIO(autcpu12_map_io)
66
-
INITIRQ(clps711x_init_irq)
62
+
/* Maintainer: Thomas Gleixner */
63
+
.phys_ram = 0xc0000000,
64
+
.phys_io = 0x80000000,
65
+
.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
66
+
.boot_params = 0xc0020000,
67
+
.map_io = autcpu12_map_io,
68
+
.init_irq = clps711x_init_irq,
67
69
.timer = &clps711x_timer,
68
70
MACHINE_END
69
71
+7
-5
arch/arm/mach-clps711x/cdb89712.c
+7
-5
arch/arm/mach-clps711x/cdb89712.c
···
49
49
}
50
50
51
51
MACHINE_START(CDB89712, "Cirrus-CDB89712")
52
-
MAINTAINER("Ray Lehtiniemi")
53
-
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
54
-
BOOT_PARAMS(0xc0000100)
55
-
MAPIO(cdb89712_map_io)
56
-
INITIRQ(clps711x_init_irq)
52
+
/* Maintainer: Ray Lehtiniemi */
53
+
.phys_ram = 0xc0000000,
54
+
.phys_io = 0x80000000,
55
+
.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
56
+
.boot_params = 0xc0000100,
57
+
.map_io = cdb89712_map_io,
58
+
.init_irq = clps711x_init_irq,
57
59
.timer = &clps711x_timer,
58
60
MACHINE_END
+7
-5
arch/arm/mach-clps711x/ceiva.c
+7
-5
arch/arm/mach-clps711x/ceiva.c
···
53
53
54
54
55
55
MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
56
-
MAINTAINER("Rob Scott")
57
-
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
58
-
BOOT_PARAMS(0xc0000100)
59
-
MAPIO(ceiva_map_io)
60
-
INITIRQ(clps711x_init_irq)
56
+
/* Maintainer: Rob Scott */
57
+
.phys_ram = 0xc0000000,
58
+
.phys_io = 0x80000000,
59
+
.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
60
+
.boot_params = 0xc0000100,
61
+
.map_io = ceiva_map_io,
62
+
.init_irq = clps711x_init_irq,
61
63
.timer = &clps711x_timer,
62
64
MACHINE_END
+8
-6
arch/arm/mach-clps711x/clep7312.c
+8
-6
arch/arm/mach-clps711x/clep7312.c
···
37
37
38
38
39
39
MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
40
-
MAINTAINER("Nobody")
41
-
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
42
-
BOOT_PARAMS(0xc0000100)
43
-
FIXUP(fixup_clep7312)
44
-
MAPIO(clps711x_map_io)
45
-
INITIRQ(clps711x_init_irq)
40
+
/* Maintainer: Nobody */
41
+
.phys_ram = 0xc0000000,
42
+
.phys_io = 0x80000000,
43
+
.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
44
+
.boot_params = 0xc0000100,
45
+
.fixup = fixup_clep7312,
46
+
.map_io = clps711x_map_io,
47
+
.init_irq = clps711x_init_irq,
46
48
.timer = &clps711x_timer,
47
49
MACHINE_END
48
50
+8
-6
arch/arm/mach-clps711x/edb7211-arch.c
+8
-6
arch/arm/mach-clps711x/edb7211-arch.c
···
51
51
}
52
52
53
53
MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
54
-
MAINTAINER("Jon McClintock")
55
-
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
56
-
BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */
57
-
FIXUP(fixup_edb7211)
58
-
MAPIO(edb7211_map_io)
59
-
INITIRQ(clps711x_init_irq)
54
+
/* Maintainer: Jon McClintock */
55
+
.phys_ram = 0xc0000000,
56
+
.phys_io = 0x80000000,
57
+
.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
58
+
.boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */
59
+
.fixup = fixup_edb7211,
60
+
.map_io = edb7211_map_io,
61
+
.init_irq = clps711x_init_irq,
60
62
.timer = &clps711x_timer,
61
63
MACHINE_END
+8
-6
arch/arm/mach-clps711x/fortunet.c
+8
-6
arch/arm/mach-clps711x/fortunet.c
···
75
75
}
76
76
77
77
MACHINE_START(FORTUNET, "ARM-FortuNet")
78
-
MAINTAINER("FortuNet Inc.")
79
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000)
80
-
BOOT_PARAMS(0x00000000)
81
-
FIXUP(fortunet_fixup)
82
-
MAPIO(clps711x_map_io)
83
-
INITIRQ(clps711x_init_irq)
78
+
/* Maintainer: FortuNet Inc. */
79
+
.phys_ram = 0xc0000000,
80
+
.phys_io = 0x80000000,
81
+
.io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
82
+
.boot_params = 0x00000000,
83
+
.fixup = fortunet_fixup,
84
+
.map_io = clps711x_map_io,
85
+
.init_irq = clps711x_init_irq,
84
86
.timer = &clps711x_timer,
85
87
MACHINE_END
+8
-6
arch/arm/mach-clps711x/p720t.c
+8
-6
arch/arm/mach-clps711x/p720t.c
···
79
79
}
80
80
81
81
MACHINE_START(P720T, "ARM-Prospector720T")
82
-
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
83
-
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)
84
-
BOOT_PARAMS(0xc0000100)
85
-
FIXUP(fixup_p720t)
86
-
MAPIO(p720t_map_io)
87
-
INITIRQ(clps711x_init_irq)
82
+
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
83
+
.phys_ram = 0xc0000000,
84
+
.phys_io = 0x80000000,
85
+
.io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
86
+
.boot_params = 0xc0000100,
87
+
.fixup = fixup_p720t,
88
+
.map_io = p720t_map_io,
89
+
.init_irq = clps711x_init_irq,
88
90
.timer = &clps711x_timer,
89
91
MACHINE_END
90
92
+8
-6
arch/arm/mach-clps7500/core.c
+8
-6
arch/arm/mach-clps7500/core.c
···
366
366
}
367
367
368
368
MACHINE_START(CLPS7500, "CL-PS7500")
369
-
MAINTAINER("Philip Blundell")
370
-
BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
371
-
MAPIO(clps7500_map_io)
372
-
INITIRQ(clps7500_init_irq)
373
-
.init_machine = clps7500_init,
374
-
.timer = &clps7500_timer,
369
+
/* Maintainer: Philip Blundell */
370
+
.phys_ram = 0x10000000,
371
+
.phys_io = 0x03000000,
372
+
.io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
373
+
.map_io = clps7500_map_io,
374
+
.init_irq = clps7500_init_irq,
375
+
.init_machine = clps7500_init,
376
+
.timer = &clps7500_timer,
375
377
MACHINE_END
376
378
+10
-8
arch/arm/mach-ebsa110/core.c
+10
-8
arch/arm/mach-ebsa110/core.c
···
233
233
arch_initcall(ebsa110_init);
234
234
235
235
MACHINE_START(EBSA110, "EBSA110")
236
-
MAINTAINER("Russell King")
237
-
BOOT_MEM(0x00000000, 0xe0000000, 0xe0000000)
238
-
BOOT_PARAMS(0x00000400)
239
-
DISABLE_PARPORT(0)
240
-
DISABLE_PARPORT(2)
241
-
SOFT_REBOOT
242
-
MAPIO(ebsa110_map_io)
243
-
INITIRQ(ebsa110_init_irq)
236
+
/* Maintainer: Russell King */
237
+
.phys_ram = 0x00000000,
238
+
.phys_io = 0xe0000000,
239
+
.io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
240
+
.boot_params = 0x00000400,
241
+
.reserve_lp0 = 1,
242
+
.reserve_lp2 = 1,
243
+
.soft_reboot = 1,
244
+
.map_io = ebsa110_map_io,
245
+
.init_irq = ebsa110_init_irq,
244
246
.timer = &ebsa110_timer,
245
247
MACHINE_END
+6
-4
arch/arm/mach-epxa10db/arch.c
+6
-4
arch/arm/mach-epxa10db/arch.c
···
63
63
extern struct sys_timer epxa10db_timer;
64
64
65
65
MACHINE_START(CAMELOT, "Altera Epxa10db")
66
-
MAINTAINER("Altera Corporation")
67
-
BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000)
68
-
MAPIO(epxa10db_map_io)
69
-
INITIRQ(epxa10db_init_irq)
66
+
/* Maintainer: Altera Corporation */
67
+
.phys_ram = 0x00000000,
68
+
.phys_io = 0x7fffc000,
69
+
.io_pg_offst = ((0xffffc000) >> 18) & 0xfffc,
70
+
.map_io = epxa10db_map_io,
71
+
.init_irq = epxa10db_init_irq,
70
72
.timer = &epxa10db_timer,
71
73
MACHINE_END
72
74
+9
-7
arch/arm/mach-footbridge/cats-hw.c
+9
-7
arch/arm/mach-footbridge/cats-hw.c
···
84
84
}
85
85
86
86
MACHINE_START(CATS, "Chalice-CATS")
87
-
MAINTAINER("Philip Blundell")
88
-
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
89
-
BOOT_PARAMS(0x00000100)
90
-
SOFT_REBOOT
91
-
FIXUP(fixup_cats)
92
-
MAPIO(footbridge_map_io)
93
-
INITIRQ(footbridge_init_irq)
87
+
/* Maintainer: Philip Blundell */
88
+
.phys_ram = 0x00000000,
89
+
.phys_io = DC21285_ARMCSR_BASE,
90
+
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
91
+
.boot_params = 0x00000100,
92
+
.soft_reboot = 1,
93
+
.fixup = fixup_cats,
94
+
.map_io = footbridge_map_io,
95
+
.init_irq = footbridge_init_irq,
94
96
.timer = &isa_timer,
95
97
MACHINE_END
+7
-5
arch/arm/mach-footbridge/co285.c
+7
-5
arch/arm/mach-footbridge/co285.c
···
28
28
}
29
29
30
30
MACHINE_START(CO285, "co-EBSA285")
31
-
MAINTAINER("Mark van Doesburg")
32
-
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000)
33
-
FIXUP(fixup_coebsa285)
34
-
MAPIO(footbridge_map_io)
35
-
INITIRQ(footbridge_init_irq)
31
+
/* Maintainer: Mark van Doesburg */
32
+
.phys_ram = 0x00000000,
33
+
.phys_io = DC21285_ARMCSR_BASE,
34
+
.io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc,
35
+
.fixup = fixup_coebsa285,
36
+
.map_io = footbridge_map_io,
37
+
.init_irq = footbridge_init_irq,
36
38
.timer = &footbridge_timer,
37
39
MACHINE_END
38
40
+9
-6
arch/arm/mach-footbridge/ebsa285.c
+9
-6
arch/arm/mach-footbridge/ebsa285.c
···
13
13
#include "common.h"
14
14
15
15
MACHINE_START(EBSA285, "EBSA285")
16
-
MAINTAINER("Russell King")
17
-
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
18
-
BOOT_PARAMS(0x00000100)
19
-
VIDEO(0x000a0000, 0x000bffff)
20
-
MAPIO(footbridge_map_io)
21
-
INITIRQ(footbridge_init_irq)
16
+
/* Maintainer: Russell King */
17
+
.phys_ram = 0x00000000,
18
+
.phys_io = DC21285_ARMCSR_BASE,
19
+
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
20
+
.boot_params = 0x00000100,
21
+
.video_start = 0x000a0000,
22
+
.video_end = 0x000bffff,
23
+
.map_io = footbridge_map_io,
24
+
.init_irq = footbridge_init_irq,
22
25
.timer = &footbridge_timer,
23
26
MACHINE_END
24
27
+12
-9
arch/arm/mach-footbridge/netwinder-hw.c
+12
-9
arch/arm/mach-footbridge/netwinder-hw.c
···
647
647
}
648
648
649
649
MACHINE_START(NETWINDER, "Rebel-NetWinder")
650
-
MAINTAINER("Russell King/Rebel.com")
651
-
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
652
-
BOOT_PARAMS(0x00000100)
653
-
VIDEO(0x000a0000, 0x000bffff)
654
-
DISABLE_PARPORT(0)
655
-
DISABLE_PARPORT(2)
656
-
FIXUP(fixup_netwinder)
657
-
MAPIO(footbridge_map_io)
658
-
INITIRQ(footbridge_init_irq)
650
+
/* Maintainer: Russell King/Rebel.com */
651
+
.phys_ram = 0x00000000,
652
+
.phys_io = DC21285_ARMCSR_BASE,
653
+
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
654
+
.boot_params = 0x00000100,
655
+
.video_start = 0x000a0000,
656
+
.video_end = 0x000bffff,
657
+
.reserve_lp0 = 1,
658
+
.reserve_lp2 = 1,
659
+
.fixup = fixup_netwinder,
660
+
.map_io = footbridge_map_io,
661
+
.init_irq = footbridge_init_irq,
659
662
.timer = &isa_timer,
660
663
MACHINE_END
+7
-5
arch/arm/mach-footbridge/personal.c
+7
-5
arch/arm/mach-footbridge/personal.c
···
13
13
#include "common.h"
14
14
15
15
MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
16
-
MAINTAINER("Jamey Hicks / George France")
17
-
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000)
18
-
BOOT_PARAMS(0x00000100)
19
-
MAPIO(footbridge_map_io)
20
-
INITIRQ(footbridge_init_irq)
16
+
/* Maintainer: Jamey Hicks / George France */
17
+
.phys_ram = 0x00000000,
18
+
.phys_io = DC21285_ARMCSR_BASE,
19
+
.io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
20
+
.boot_params = 0x00000100,
21
+
.map_io = footbridge_map_io,
22
+
.init_irq = footbridge_init_irq,
21
23
.timer = &footbridge_timer,
22
24
MACHINE_END
23
25
+8
-6
arch/arm/mach-h720x/h7201-eval.c
+8
-6
arch/arm/mach-h720x/h7201-eval.c
···
30
30
#include "common.h"
31
31
32
32
MACHINE_START(H7201, "Hynix GMS30C7201")
33
-
MAINTAINER("Robert Schwebel, Pengutronix")
34
-
BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
35
-
BOOT_PARAMS(0xc0001000)
36
-
MAPIO(h720x_map_io)
37
-
INITIRQ(h720x_init_irq)
38
-
.timer = &h7201_timer,
33
+
/* Maintainer: Robert Schwebel, Pengutronix */
34
+
.phys_ram = 0x40000000,
35
+
.phys_io = 0x80000000,
36
+
.io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
37
+
.boot_params = 0xc0001000,
38
+
.map_io = h720x_map_io,
39
+
.init_irq = h720x_init_irq,
40
+
.timer = &h7201_timer,
39
41
MACHINE_END
+9
-7
arch/arm/mach-h720x/h7202-eval.c
+9
-7
arch/arm/mach-h720x/h7202-eval.c
···
71
71
}
72
72
73
73
MACHINE_START(H7202, "Hynix HMS30C7202")
74
-
MAINTAINER("Robert Schwebel, Pengutronix")
75
-
BOOT_MEM(0x40000000, 0x80000000, 0xf0000000)
76
-
BOOT_PARAMS(0x40000100)
77
-
MAPIO(h720x_map_io)
78
-
INITIRQ(h7202_init_irq)
79
-
.timer = &h7202_timer,
80
-
INIT_MACHINE(init_eval_h7202)
74
+
/* Maintainer: Robert Schwebel, Pengutronix */
75
+
.phys_ram = 0x40000000,
76
+
.phys_io = 0x80000000,
77
+
.io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
78
+
.boot_params = 0x40000100,
79
+
.map_io = h720x_map_io,
80
+
.init_irq = h7202_init_irq,
81
+
.timer = &h7202_timer,
82
+
.init_machine = init_eval_h7202,
81
83
MACHINE_END
+8
-6
arch/arm/mach-imx/mx1ads.c
+8
-6
arch/arm/mach-imx/mx1ads.c
···
78
78
}
79
79
80
80
MACHINE_START(MX1ADS, "Motorola MX1ADS")
81
-
MAINTAINER("Sascha Hauer, Pengutronix")
82
-
BOOT_MEM(0x08000000, 0x00200000, 0xe0200000)
83
-
BOOT_PARAMS(0x08000100)
84
-
MAPIO(mx1ads_map_io)
85
-
INITIRQ(imx_init_irq)
81
+
/* Maintainer: Sascha Hauer, Pengutronix */
82
+
.phys_ram = 0x08000000,
83
+
.phys_io = 0x00200000,
84
+
.io_pg_offst = ((0xe0200000) >> 18) & 0xfffc,
85
+
.boot_params = 0x08000100,
86
+
.map_io = mx1ads_map_io,
87
+
.init_irq = imx_init_irq,
86
88
.timer = &imx_timer,
87
-
INIT_MACHINE(mx1ads_init)
89
+
.init_machine = mx1ads_init,
88
90
MACHINE_END
+8
-6
arch/arm/mach-integrator/integrator_ap.c
+8
-6
arch/arm/mach-integrator/integrator_ap.c
···
292
292
};
293
293
294
294
MACHINE_START(INTEGRATOR, "ARM-Integrator")
295
-
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
296
-
BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
297
-
BOOT_PARAMS(0x00000100)
298
-
MAPIO(ap_map_io)
299
-
INITIRQ(ap_init_irq)
295
+
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
296
+
.phys_ram = 0x00000000,
297
+
.phys_io = 0x16000000,
298
+
.io_pg_offst = ((0xf1600000) >> 18) & 0xfffc,
299
+
.boot_params = 0x00000100,
300
+
.map_io = ap_map_io,
301
+
.init_irq = ap_init_irq,
300
302
.timer = &ap_timer,
301
-
INIT_MACHINE(ap_init)
303
+
.init_machine = ap_init,
302
304
MACHINE_END
+8
-6
arch/arm/mach-integrator/integrator_cp.c
+8
-6
arch/arm/mach-integrator/integrator_cp.c
···
532
532
};
533
533
534
534
MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
535
-
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
536
-
BOOT_MEM(0x00000000, 0x16000000, 0xf1600000)
537
-
BOOT_PARAMS(0x00000100)
538
-
MAPIO(intcp_map_io)
539
-
INITIRQ(intcp_init_irq)
535
+
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
536
+
.phys_ram = 0x00000000,
537
+
.phys_io = 0x16000000,
538
+
.io_pg_offst = ((0xf1600000) >> 18) & 0xfffc,
539
+
.boot_params = 0x00000100,
540
+
.map_io = intcp_map_io,
541
+
.init_irq = intcp_init_irq,
540
542
.timer = &cp_timer,
541
-
INIT_MACHINE(intcp_init)
543
+
.init_machine = intcp_init,
542
544
MACHINE_END
+16
-12
arch/arm/mach-iop3xx/iop321-setup.c
+16
-12
arch/arm/mach-iop3xx/iop321-setup.c
···
146
146
147
147
#if defined(CONFIG_ARCH_IQ80321)
148
148
MACHINE_START(IQ80321, "Intel IQ80321")
149
-
MAINTAINER("Intel Corporation")
150
-
BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART)
151
-
MAPIO(iq80321_map_io)
152
-
INITIRQ(iop321_init_irq)
149
+
/* Maintainer: Intel Corporation */
150
+
.phys_ram = PHYS_OFFSET,
151
+
.phys_io = IQ80321_UART,
152
+
.io_pg_offst = ((IQ80321_UART) >> 18) & 0xfffc,
153
+
.map_io = iq80321_map_io,
154
+
.init_irq = iop321_init_irq,
153
155
.timer = &iop321_timer,
154
-
BOOT_PARAMS(0xa0000100)
155
-
INIT_MACHINE(iop32x_init)
156
+
.boot_params = 0xa0000100,
157
+
.init_machine = iop32x_init,
156
158
MACHINE_END
157
159
#elif defined(CONFIG_ARCH_IQ31244)
158
160
MACHINE_START(IQ31244, "Intel IQ31244")
159
-
MAINTAINER("Intel Corp.")
160
-
BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART)
161
-
MAPIO(iq31244_map_io)
162
-
INITIRQ(iop321_init_irq)
161
+
/* Maintainer: Intel Corp. */
162
+
.phys_ram = PHYS_OFFSET,
163
+
.phys_io = IQ31244_UART,
164
+
.io_pg_offst = ((IQ31244_UART) >> 18) & 0xfffc,
165
+
.map_io = iq31244_map_io,
166
+
.init_irq = iop321_init_irq,
163
167
.timer = &iop321_timer,
164
-
BOOT_PARAMS(0xa0000100)
165
-
INIT_MACHINE(iop32x_init)
168
+
.boot_params = 0xa0000100,
169
+
.init_machine = iop32x_init,
166
170
MACHINE_END
167
171
#else
168
172
#error No machine descriptor defined for this IOP3XX implementation
+16
-14
arch/arm/mach-iop3xx/iop331-setup.c
+16
-14
arch/arm/mach-iop3xx/iop331-setup.c
···
148
148
149
149
#if defined(CONFIG_ARCH_IQ80331)
150
150
MACHINE_START(IQ80331, "Intel IQ80331")
151
-
MAINTAINER("Intel Corp.")
152
-
BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
153
-
//BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
154
-
MAPIO(iq80331_map_io)
155
-
INITIRQ(iop331_init_irq)
151
+
/* Maintainer: Intel Corp. */
152
+
.phys_ram = PHYS_OFFSET,
153
+
.phys_io = 0xfefff000,
154
+
.io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
155
+
.map_io = iq80331_map_io,
156
+
.init_irq = iop331_init_irq,
156
157
.timer = &iop331_timer,
157
-
BOOT_PARAMS(0x0100)
158
-
INIT_MACHINE(iop33x_init)
158
+
.boot_params = 0x0100,
159
+
.init_machine = iop33x_init,
159
160
MACHINE_END
160
161
161
162
#elif defined(CONFIG_MACH_IQ80332)
162
163
MACHINE_START(IQ80332, "Intel IQ80332")
163
-
MAINTAINER("Intel Corp.")
164
-
BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical
165
-
//BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS)
166
-
MAPIO(iq80332_map_io)
167
-
INITIRQ(iop331_init_irq)
164
+
/* Maintainer: Intel Corp. */
165
+
.phys_ram = PHYS_OFFSET,
166
+
.phys_io = 0xfefff000,
167
+
.io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
168
+
.map_io = iq80332_map_io,
169
+
.init_irq = iop331_init_irq,
168
170
.timer = &iop331_timer,
169
-
BOOT_PARAMS(0x0100)
170
-
INIT_MACHINE(iop33x_init)
171
+
.boot_params = 0x0100,
172
+
.init_machine = iop33x_init,
171
173
MACHINE_END
172
174
173
175
#else
+8
-6
arch/arm/mach-ixp2000/enp2611.c
+8
-6
arch/arm/mach-ixp2000/enp2611.c
···
223
223
224
224
225
225
MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
226
-
MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>")
227
-
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
228
-
BOOT_PARAMS(0x00000100)
229
-
MAPIO(ixp2000_map_io)
230
-
INITIRQ(ixp2000_init_irq)
226
+
/* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
227
+
.phys_ram = 0x00000000,
228
+
.phys_io = IXP2000_UART_PHYS_BASE,
229
+
.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
230
+
.boot_params = 0x00000100,
231
+
.map_io = ixp2000_map_io,
232
+
.init_irq = ixp2000_init_irq,
231
233
.timer = &enp2611_timer,
232
-
INIT_MACHINE(enp2611_init_machine)
234
+
.init_machine = enp2611_init_machine,
233
235
MACHINE_END
234
236
235
237
+8
-6
arch/arm/mach-ixp2000/ixdp2400.c
+8
-6
arch/arm/mach-ixp2000/ixdp2400.c
···
168
168
}
169
169
170
170
MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
171
-
MAINTAINER("MontaVista Software, Inc.")
172
-
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
173
-
BOOT_PARAMS(0x00000100)
174
-
MAPIO(ixdp2x00_map_io)
175
-
INITIRQ(ixdp2400_init_irq)
171
+
/* Maintainer: MontaVista Software, Inc. */
172
+
.phys_ram = 0x00000000,
173
+
.phys_io = IXP2000_UART_PHYS_BASE,
174
+
.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
175
+
.boot_params = 0x00000100,
176
+
.map_io = ixdp2x00_map_io,
177
+
.init_irq = ixdp2400_init_irq,
176
178
.timer = &ixdp2400_timer,
177
-
INIT_MACHINE(ixdp2x00_init_machine)
179
+
.init_machine = ixdp2x00_init_machine,
178
180
MACHINE_END
179
181
+8
-6
arch/arm/mach-ixp2000/ixdp2800.c
+8
-6
arch/arm/mach-ixp2000/ixdp2800.c
···
284
284
}
285
285
286
286
MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
287
-
MAINTAINER("MontaVista Software, Inc.")
288
-
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
289
-
BOOT_PARAMS(0x00000100)
290
-
MAPIO(ixdp2x00_map_io)
291
-
INITIRQ(ixdp2800_init_irq)
287
+
/* Maintainer: MontaVista Software, Inc. */
288
+
.phys_ram = 0x00000000,
289
+
.phys_io = IXP2000_UART_PHYS_BASE,
290
+
.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
291
+
.boot_params = 0x00000100,
292
+
.map_io = ixdp2x00_map_io,
293
+
.init_irq = ixdp2800_init_irq,
292
294
.timer = &ixdp2800_timer,
293
-
INIT_MACHINE(ixdp2x00_init_machine)
295
+
.init_machine = ixdp2x00_init_machine,
294
296
MACHINE_END
295
297
+16
-12
arch/arm/mach-ixp2000/ixdp2x01.c
+16
-12
arch/arm/mach-ixp2000/ixdp2x01.c
···
375
375
376
376
#ifdef CONFIG_ARCH_IXDP2401
377
377
MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
378
-
MAINTAINER("MontaVista Software, Inc.")
379
-
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
380
-
BOOT_PARAMS(0x00000100)
381
-
MAPIO(ixdp2x01_map_io)
382
-
INITIRQ(ixdp2x01_init_irq)
378
+
/* Maintainer: MontaVista Software, Inc. */
379
+
.phys_ram = 0x00000000,
380
+
.phys_io = IXP2000_UART_PHYS_BASE,
381
+
.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
382
+
.boot_params = 0x00000100,
383
+
.map_io = ixdp2x01_map_io,
384
+
.init_irq = ixdp2x01_init_irq,
383
385
.timer = &ixdp2x01_timer,
384
-
INIT_MACHINE(ixdp2x01_init_machine)
386
+
.init_machine = ixdp2x01_init_machine,
385
387
MACHINE_END
386
388
#endif
387
389
388
390
#ifdef CONFIG_ARCH_IXDP2801
389
391
MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
390
-
MAINTAINER("MontaVista Software, Inc.")
391
-
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE)
392
-
BOOT_PARAMS(0x00000100)
393
-
MAPIO(ixdp2x01_map_io)
394
-
INITIRQ(ixdp2x01_init_irq)
392
+
/* Maintainer: MontaVista Software, Inc. */
393
+
.phys_ram = 0x00000000,
394
+
.phys_io = IXP2000_UART_PHYS_BASE,
395
+
.io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
396
+
.boot_params = 0x00000100,
397
+
.map_io = ixdp2x01_map_io,
398
+
.init_irq = ixdp2x01_init_irq,
395
399
.timer = &ixdp2x01_timer,
396
-
INIT_MACHINE(ixdp2x01_init_machine)
400
+
.init_machine = ixdp2x01_init_machine,
397
401
MACHINE_END
398
402
#endif
399
403
+16
-14
arch/arm/mach-ixp4xx/coyote-setup.c
+16
-14
arch/arm/mach-ixp4xx/coyote-setup.c
···
100
100
101
101
#ifdef CONFIG_ARCH_ADI_COYOTE
102
102
MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
103
-
MAINTAINER("MontaVista Software, Inc.")
104
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
105
-
IXP4XX_PERIPHERAL_BASE_VIRT)
106
-
MAPIO(coyote_map_io)
107
-
INITIRQ(ixp4xx_init_irq)
103
+
/* Maintainer: MontaVista Software, Inc. */
104
+
.phys_ram = PHYS_OFFSET,
105
+
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
106
+
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
107
+
.map_io = coyote_map_io,
108
+
.init_irq = ixp4xx_init_irq,
108
109
.timer = &ixp4xx_timer,
109
-
BOOT_PARAMS(0x0100)
110
-
INIT_MACHINE(coyote_init)
110
+
.boot_params = 0x0100,
111
+
.init_machine = coyote_init,
111
112
MACHINE_END
112
113
#endif
113
114
···
118
117
*/
119
118
#ifdef CONFIG_MACH_IXDPG425
120
119
MACHINE_START(IXDPG425, "Intel IXDPG425")
121
-
MAINTAINER("MontaVista Software, Inc.")
122
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
123
-
IXP4XX_PERIPHERAL_BASE_VIRT)
124
-
MAPIO(coyote_map_io)
125
-
INITIRQ(ixp4xx_init_irq)
120
+
/* Maintainer: MontaVista Software, Inc. */
121
+
.phys_ram = PHYS_OFFSET,
122
+
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
123
+
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
124
+
.map_io = coyote_map_io,
125
+
.init_irq = ixp4xx_init_irq,
126
126
.timer = &ixp4xx_timer,
127
-
BOOT_PARAMS(0x0100)
128
-
INIT_MACHINE(coyote_init)
127
+
.boot_params = 0x0100,
128
+
.init_machine = coyote_init,
129
129
MACHINE_END
130
130
#endif
131
131
+9
-8
arch/arm/mach-ixp4xx/gtwx5715-setup.c
+9
-8
arch/arm/mach-ixp4xx/gtwx5715-setup.c
···
140
140
141
141
142
142
MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
143
-
MAINTAINER("George Joseph")
144
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS,
145
-
IXP4XX_UART2_BASE_VIRT)
146
-
MAPIO(gtwx5715_map_io)
147
-
INITIRQ(ixp4xx_init_irq)
148
-
.timer = &ixp4xx_timer,
149
-
BOOT_PARAMS(0x0100)
150
-
INIT_MACHINE(gtwx5715_init)
143
+
/* Maintainer: George Joseph */
144
+
.phys_ram = PHYS_OFFSET,
145
+
.phys_io = IXP4XX_UART2_BASE_PHYS,
146
+
.io_pg_offst = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
147
+
.map_io = gtwx5715_map_io,
148
+
.init_irq = ixp4xx_init_irq,
149
+
.timer = &ixp4xx_timer,
150
+
.boot_params = 0x0100,
151
+
.init_machine = gtwx5715_init,
151
152
MACHINE_END
152
153
153
154
+32
-28
arch/arm/mach-ixp4xx/ixdp425-setup.c
+32
-28
arch/arm/mach-ixp4xx/ixdp425-setup.c
···
128
128
}
129
129
130
130
MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
131
-
MAINTAINER("MontaVista Software, Inc.")
132
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
133
-
IXP4XX_PERIPHERAL_BASE_VIRT)
134
-
MAPIO(ixdp425_map_io)
135
-
INITIRQ(ixp4xx_init_irq)
131
+
/* Maintainer: MontaVista Software, Inc. */
132
+
.phys_ram = PHYS_OFFSET,
133
+
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
134
+
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
135
+
.map_io = ixdp425_map_io,
136
+
.init_irq = ixp4xx_init_irq,
136
137
.timer = &ixp4xx_timer,
137
-
BOOT_PARAMS(0x0100)
138
-
INIT_MACHINE(ixdp425_init)
138
+
.boot_params = 0x0100,
139
+
.init_machine = ixdp425_init,
139
140
MACHINE_END
140
141
141
142
MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
142
-
MAINTAINER("MontaVista Software, Inc.")
143
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
144
-
IXP4XX_PERIPHERAL_BASE_VIRT)
145
-
MAPIO(ixdp425_map_io)
146
-
INITIRQ(ixp4xx_init_irq)
143
+
/* Maintainer: MontaVista Software, Inc. */
144
+
.phys_ram = PHYS_OFFSET,
145
+
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
146
+
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
147
+
.map_io = ixdp425_map_io,
148
+
.init_irq = ixp4xx_init_irq,
147
149
.timer = &ixp4xx_timer,
148
-
BOOT_PARAMS(0x0100)
149
-
INIT_MACHINE(ixdp425_init)
150
+
.boot_params = 0x0100,
151
+
.init_machine = ixdp425_init,
150
152
MACHINE_END
151
153
152
154
MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
153
-
MAINTAINER("MontaVista Software, Inc.")
154
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
155
-
IXP4XX_PERIPHERAL_BASE_VIRT)
156
-
MAPIO(ixdp425_map_io)
157
-
INITIRQ(ixp4xx_init_irq)
155
+
/* Maintainer: MontaVista Software, Inc. */
156
+
.phys_ram = PHYS_OFFSET,
157
+
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
158
+
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
159
+
.map_io = ixdp425_map_io,
160
+
.init_irq = ixp4xx_init_irq,
158
161
.timer = &ixp4xx_timer,
159
-
BOOT_PARAMS(0x0100)
160
-
INIT_MACHINE(ixdp425_init)
162
+
.boot_params = 0x0100,
163
+
.init_machine = ixdp425_init,
161
164
MACHINE_END
162
165
163
166
/*
···
171
168
*/
172
169
#ifdef CONFIG_ARCH_AVILA
173
170
MACHINE_START(AVILA, "Gateworks Avila Network Platform")
174
-
MAINTAINER("Deepak Saxena <dsaxena@plexity.net>")
175
-
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS,
176
-
IXP4XX_PERIPHERAL_BASE_VIRT)
177
-
MAPIO(ixdp425_map_io)
178
-
INITIRQ(ixp4xx_init_irq)
171
+
/* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
172
+
.phys_ram = PHYS_OFFSET,
173
+
.phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
174
+
.io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
175
+
.map_io = ixdp425_map_io,
176
+
.init_irq = ixp4xx_init_irq,
179
177
.timer = &ixp4xx_timer,
180
-
BOOT_PARAMS(0x0100)
181
-
INIT_MACHINE(ixdp425_init)
178
+
.boot_params = 0x0100,
179
+
.init_machine = ixdp425_init,
182
180
MACHINE_END
183
181
#endif
184
182
+6
-4
arch/arm/mach-l7200/core.c
+6
-4
arch/arm/mach-l7200/core.c
···
81
81
}
82
82
83
83
MACHINE_START(L7200, "LinkUp Systems L7200")
84
-
MAINTAINER("Steve Hill / Scott McConnell")
85
-
BOOT_MEM(0xf0000000, 0x80040000, 0xd0000000)
86
-
MAPIO(l7200_map_io)
87
-
INITIRQ(l7200_init_irq)
84
+
/* Maintainer: Steve Hill / Scott McConnell */
85
+
.phys_ram = 0xf0000000,
86
+
.phys_io = 0x80040000,
87
+
.io_pg_offst = ((0xd0000000) >> 18) & 0xfffc,
88
+
.map_io = l7200_map_io,
89
+
.init_irq = l7200_init_irq,
88
90
MACHINE_END
89
91
+7
-5
arch/arm/mach-lh7a40x/arch-kev7a400.c
+7
-5
arch/arm/mach-lh7a40x/arch-kev7a400.c
···
102
102
}
103
103
104
104
MACHINE_START (KEV7A400, "Sharp KEV7a400")
105
-
MAINTAINER ("Marc Singer")
106
-
BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
107
-
BOOT_PARAMS (0xc0000100)
108
-
MAPIO (kev7a400_map_io)
109
-
INITIRQ (lh7a400_init_irq)
105
+
/* Maintainer: Marc Singer */
106
+
.phys_ram = 0xc0000000,
107
+
.phys_io = 0x80000000,
108
+
.io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc,
109
+
.boot_params = 0xc0000100,
110
+
.map_io = kev7a400_map_io,
111
+
.init_irq = lh7a400_init_irq,
110
112
.timer = &lh7a40x_timer,
111
113
MACHINE_END
+16
-12
arch/arm/mach-lh7a40x/arch-lpd7a40x.c
+16
-12
arch/arm/mach-lh7a40x/arch-lpd7a40x.c
···
260
260
#ifdef CONFIG_MACH_LPD7A400
261
261
262
262
MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
263
-
MAINTAINER ("Marc Singer")
264
-
BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
265
-
BOOT_PARAMS (0xc0000100)
266
-
MAPIO (lpd7a400_map_io)
267
-
INITIRQ (lh7a400_init_irq)
263
+
/* Maintainer: Marc Singer */
264
+
.phys_ram = 0xc0000000,
265
+
.phys_io = 0x80000000,
266
+
.io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc,
267
+
.boot_params = 0xc0000100,
268
+
.map_io = lpd7a400_map_io,
269
+
.init_irq = lh7a400_init_irq,
268
270
.timer = &lh7a40x_timer,
269
-
INIT_MACHINE (lpd7a40x_init)
271
+
.init_machine = lpd7a40x_init,
270
272
MACHINE_END
271
273
272
274
#endif
···
276
274
#ifdef CONFIG_MACH_LPD7A404
277
275
278
276
MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10")
279
-
MAINTAINER ("Marc Singer")
280
-
BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000))
281
-
BOOT_PARAMS (0xc0000100)
282
-
MAPIO (lpd7a400_map_io)
283
-
INITIRQ (lh7a404_init_irq)
277
+
/* Maintainer: Marc Singer */
278
+
.phys_ram = 0xc0000000,
279
+
.phys_io = 0x80000000,
280
+
.io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc,
281
+
.boot_params = 0xc0000100,
282
+
.map_io = lpd7a400_map_io,
283
+
.init_irq = lh7a404_init_irq,
284
284
.timer = &lh7a40x_timer,
285
-
INIT_MACHINE (lpd7a40x_init)
285
+
.init_machine = lpd7a40x_init,
286
286
MACHINE_END
287
287
288
288
#endif
+8
-6
arch/arm/mach-omap/board-generic.c
+8
-6
arch/arm/mach-omap/board-generic.c
···
88
88
}
89
89
90
90
MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
91
-
MAINTAINER("Tony Lindgren <tony@atomide.com>")
92
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
93
-
BOOT_PARAMS(0x10000100)
94
-
MAPIO(omap_generic_map_io)
95
-
INITIRQ(omap_generic_init_irq)
96
-
INIT_MACHINE(omap_generic_init)
91
+
/* Maintainer: Tony Lindgren <tony@atomide.com> */
92
+
.phys_ram = 0x10000000,
93
+
.phys_io = 0xfff00000,
94
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
95
+
.boot_params = 0x10000100,
96
+
.map_io = omap_generic_map_io,
97
+
.init_irq = omap_generic_init_irq,
98
+
.init_machine = omap_generic_init,
97
99
.timer = &omap_timer,
98
100
MACHINE_END
+8
-6
arch/arm/mach-omap/board-h2.c
+8
-6
arch/arm/mach-omap/board-h2.c
···
177
177
}
178
178
179
179
MACHINE_START(OMAP_H2, "TI-H2")
180
-
MAINTAINER("Imre Deak <imre.deak@nokia.com>")
181
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
182
-
BOOT_PARAMS(0x10000100)
183
-
MAPIO(h2_map_io)
184
-
INITIRQ(h2_init_irq)
185
-
INIT_MACHINE(h2_init)
180
+
/* Maintainer: Imre Deak <imre.deak@nokia.com> */
181
+
.phys_ram = 0x10000000,
182
+
.phys_io = 0xfff00000,
183
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
184
+
.boot_params = 0x10000100,
185
+
.map_io = h2_map_io,
186
+
.init_irq = h2_init_irq,
187
+
.init_machine = h2_init,
186
188
.timer = &omap_timer,
187
189
MACHINE_END
+8
-6
arch/arm/mach-omap/board-h3.c
+8
-6
arch/arm/mach-omap/board-h3.c
···
195
195
}
196
196
197
197
MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
198
-
MAINTAINER("Texas Instruments, Inc.")
199
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
200
-
BOOT_PARAMS(0x10000100)
201
-
MAPIO(h3_map_io)
202
-
INITIRQ(h3_init_irq)
203
-
INIT_MACHINE(h3_init)
198
+
/* Maintainer: Texas Instruments, Inc. */
199
+
.phys_ram = 0x10000000,
200
+
.phys_io = 0xfff00000,
201
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
202
+
.boot_params = 0x10000100,
203
+
.map_io = h3_map_io,
204
+
.init_irq = h3_init_irq,
205
+
.init_machine = h3_init,
204
206
.timer = &omap_timer,
205
207
MACHINE_END
+8
-6
arch/arm/mach-omap/board-innovator.c
+8
-6
arch/arm/mach-omap/board-innovator.c
···
270
270
}
271
271
272
272
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
273
-
MAINTAINER("MontaVista Software, Inc.")
274
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
275
-
BOOT_PARAMS(0x10000100)
276
-
MAPIO(innovator_map_io)
277
-
INITIRQ(innovator_init_irq)
278
-
INIT_MACHINE(innovator_init)
273
+
/* Maintainer: MontaVista Software, Inc. */
274
+
.phys_ram = 0x10000000,
275
+
.phys_io = 0xfff00000,
276
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
277
+
.boot_params = 0x10000100,
278
+
.map_io = innovator_map_io,
279
+
.init_irq = innovator_init_irq,
280
+
.init_machine = innovator_init,
279
281
.timer = &omap_timer,
280
282
MACHINE_END
+9
-7
arch/arm/mach-omap/board-netstar.c
+9
-7
arch/arm/mach-omap/board-netstar.c
···
141
141
postcore_initcall(netstar_late_init);
142
142
143
143
MACHINE_START(NETSTAR, "NetStar OMAP5910")
144
-
MAINTAINER("Ladislav Michl <michl@2n.cz>")
145
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
146
-
BOOT_PARAMS(0x10000100)
147
-
MAPIO(netstar_map_io)
148
-
INITIRQ(netstar_init_irq)
149
-
INIT_MACHINE(netstar_init)
150
-
.timer = &omap_timer,
144
+
/* Maintainer: Ladislav Michl <michl@2n.cz> */
145
+
.phys_ram = 0x10000000,
146
+
.phys_io = 0xfff00000,
147
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
148
+
.boot_params = 0x10000100,
149
+
.map_io = netstar_map_io,
150
+
.init_irq = netstar_init_irq,
151
+
.init_machine = netstar_init,
152
+
.timer = &omap_timer,
151
153
MACHINE_END
+8
-6
arch/arm/mach-omap/board-osk.c
+8
-6
arch/arm/mach-omap/board-osk.c
···
159
159
}
160
160
161
161
MACHINE_START(OMAP_OSK, "TI-OSK")
162
-
MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>")
163
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
164
-
BOOT_PARAMS(0x10000100)
165
-
MAPIO(osk_map_io)
166
-
INITIRQ(osk_init_irq)
167
-
INIT_MACHINE(osk_init)
162
+
/* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
163
+
.phys_ram = 0x10000000,
164
+
.phys_io = 0xfff00000,
165
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
166
+
.boot_params = 0x10000100,
167
+
.map_io = osk_map_io,
168
+
.init_irq = osk_init_irq,
169
+
.init_machine = osk_init,
168
170
.timer = &omap_timer,
169
171
MACHINE_END
+8
-6
arch/arm/mach-omap/board-perseus2.c
+8
-6
arch/arm/mach-omap/board-perseus2.c
···
179
179
}
180
180
181
181
MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
182
-
MAINTAINER("Kevin Hilman <kjh@hilman.org>")
183
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
184
-
BOOT_PARAMS(0x10000100)
185
-
MAPIO(omap_perseus2_map_io)
186
-
INITIRQ(omap_perseus2_init_irq)
187
-
INIT_MACHINE(omap_perseus2_init)
182
+
/* Maintainer: Kevin Hilman <kjh@hilman.org> */
183
+
.phys_ram = 0x10000000,
184
+
.phys_io = 0xfff00000,
185
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
186
+
.boot_params = 0x10000100,
187
+
.map_io = omap_perseus2_map_io,
188
+
.init_irq = omap_perseus2_init_irq,
189
+
.init_machine = omap_perseus2_init,
188
190
.timer = &omap_timer,
189
191
MACHINE_END
+9
-7
arch/arm/mach-omap/board-voiceblue.c
+9
-7
arch/arm/mach-omap/board-voiceblue.c
···
246
246
EXPORT_SYMBOL(voiceblue_wdt_ping);
247
247
248
248
MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
249
-
MAINTAINER("Ladislav Michl <michl@2n.cz>")
250
-
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
251
-
BOOT_PARAMS(0x10000100)
252
-
MAPIO(voiceblue_map_io)
253
-
INITIRQ(voiceblue_init_irq)
254
-
INIT_MACHINE(voiceblue_init)
255
-
.timer = &omap_timer,
249
+
/* Maintainer: Ladislav Michl <michl@2n.cz> */
250
+
.phys_ram = 0x10000000,
251
+
.phys_io = 0xfff00000,
252
+
.io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
253
+
.boot_params = 0x10000100,
254
+
.map_io = voiceblue_map_io,
255
+
.init_irq = voiceblue_init_irq,
256
+
.init_machine = voiceblue_init,
257
+
.timer = &omap_timer,
256
258
MACHINE_END
-1
arch/arm/mach-omap/usb.c
-1
arch/arm/mach-omap/usb.c
···
41
41
42
42
/* These routines should handle the standard chip-specific modes
43
43
* for usb0/1/2 ports, covering basic mux and transceiver setup.
44
-
* Call omap_usb_init() once, from INIT_MACHINE().
45
44
*
46
45
* Some board-*.c files will need to set up additional mux options,
47
46
* like for suspend handling, vbus sensing, GPIOs, and the D+ pullup.
+24
-18
arch/arm/mach-pxa/corgi.c
+24
-18
arch/arm/mach-pxa/corgi.c
···
287
287
288
288
#ifdef CONFIG_MACH_CORGI
289
289
MACHINE_START(CORGI, "SHARP Corgi")
290
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
291
-
FIXUP(fixup_corgi)
292
-
MAPIO(corgi_map_io)
293
-
INITIRQ(corgi_init_irq)
294
-
.init_machine = corgi_init,
295
-
.timer = &pxa_timer,
290
+
.phys_ram = 0xa0000000,
291
+
.phys_io = 0x40000000,
292
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
293
+
.fixup = fixup_corgi,
294
+
.map_io = corgi_map_io,
295
+
.init_irq = corgi_init_irq,
296
+
.init_machine = corgi_init,
297
+
.timer = &pxa_timer,
296
298
MACHINE_END
297
299
#endif
298
300
299
301
#ifdef CONFIG_MACH_SHEPHERD
300
302
MACHINE_START(SHEPHERD, "SHARP Shepherd")
301
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
302
-
FIXUP(fixup_corgi)
303
-
MAPIO(corgi_map_io)
304
-
INITIRQ(corgi_init_irq)
305
-
.init_machine = corgi_init,
306
-
.timer = &pxa_timer,
303
+
.phys_ram = 0xa0000000,
304
+
.phys_io = 0x40000000,
305
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
306
+
.fixup = fixup_corgi,
307
+
.map_io = corgi_map_io,
308
+
.init_irq = corgi_init_irq,
309
+
.init_machine = corgi_init,
310
+
.timer = &pxa_timer,
307
311
MACHINE_END
308
312
#endif
309
313
310
314
#ifdef CONFIG_MACH_HUSKY
311
315
MACHINE_START(HUSKY, "SHARP Husky")
312
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
313
-
FIXUP(fixup_corgi)
314
-
MAPIO(corgi_map_io)
315
-
INITIRQ(corgi_init_irq)
316
-
.init_machine = corgi_init,
317
-
.timer = &pxa_timer,
316
+
.phys_ram = 0xa0000000,
317
+
.phys_io = 0x40000000,
318
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
319
+
.fixup = fixup_corgi,
320
+
.map_io = corgi_map_io,
321
+
.init_irq = corgi_init_irq,
322
+
.init_machine = corgi_init,
323
+
.timer = &pxa_timer,
318
324
MACHINE_END
319
325
#endif
320
326
+7
-5
arch/arm/mach-pxa/idp.c
+7
-5
arch/arm/mach-pxa/idp.c
···
181
181
182
182
183
183
MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
184
-
MAINTAINER("Vibren Technologies")
185
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
186
-
MAPIO(idp_map_io)
187
-
INITIRQ(idp_init_irq)
184
+
/* Maintainer: Vibren Technologies */
185
+
.phys_ram = 0xa0000000,
186
+
.phys_io = 0x40000000,
187
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
188
+
.map_io = idp_map_io,
189
+
.init_irq = idp_init_irq,
188
190
.timer = &pxa_timer,
189
-
INIT_MACHINE(idp_init)
191
+
.init_machine = idp_init,
190
192
MACHINE_END
+7
-5
arch/arm/mach-pxa/lubbock.c
+7
-5
arch/arm/mach-pxa/lubbock.c
···
268
268
}
269
269
270
270
MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
271
-
MAINTAINER("MontaVista Software Inc.")
272
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
273
-
MAPIO(lubbock_map_io)
274
-
INITIRQ(lubbock_init_irq)
271
+
/* Maintainer: MontaVista Software Inc. */
272
+
.phys_ram = 0xa0000000,
273
+
.phys_io = 0x40000000,
274
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
275
+
.map_io = lubbock_map_io,
276
+
.init_irq = lubbock_init_irq,
275
277
.timer = &pxa_timer,
276
-
INIT_MACHINE(lubbock_init)
278
+
.init_machine = lubbock_init,
277
279
MACHINE_END
+7
-5
arch/arm/mach-pxa/mainstone.c
+7
-5
arch/arm/mach-pxa/mainstone.c
···
345
345
}
346
346
347
347
MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
348
-
MAINTAINER("MontaVista Software Inc.")
349
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
350
-
MAPIO(mainstone_map_io)
351
-
INITIRQ(mainstone_init_irq)
348
+
/* Maintainer: MontaVista Software Inc. */
349
+
.phys_ram = 0xa0000000,
350
+
.phys_io = 0x40000000,
351
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
352
+
.map_io = mainstone_map_io,
353
+
.init_irq = mainstone_init_irq,
352
354
.timer = &pxa_timer,
353
-
INIT_MACHINE(mainstone_init)
355
+
.init_machine = mainstone_init,
354
356
MACHINE_END
+8
-6
arch/arm/mach-pxa/poodle.c
+8
-6
arch/arm/mach-pxa/poodle.c
···
180
180
}
181
181
182
182
MACHINE_START(POODLE, "SHARP Poodle")
183
-
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
184
-
FIXUP(fixup_poodle)
185
-
MAPIO(poodle_map_io)
186
-
INITIRQ(pxa_init_irq)
187
-
.timer = &pxa_timer,
188
-
.init_machine = poodle_init,
183
+
.phys_ram = 0xa0000000,
184
+
.phys_io = 0x40000000,
185
+
.io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
186
+
.fixup = fixup_poodle,
187
+
.map_io = poodle_map_io,
188
+
.init_irq = pxa_init_irq,
189
+
.timer = &pxa_timer,
190
+
.init_machine = poodle_init,
189
191
MACHINE_END
+9
-7
arch/arm/mach-rpc/riscpc.c
+9
-7
arch/arm/mach-rpc/riscpc.c
···
163
163
extern struct sys_timer ioc_timer;
164
164
165
165
MACHINE_START(RISCPC, "Acorn-RiscPC")
166
-
MAINTAINER("Russell King")
167
-
BOOT_MEM(0x10000000, 0x03000000, 0xe0000000)
168
-
BOOT_PARAMS(0x10000100)
169
-
DISABLE_PARPORT(0)
170
-
DISABLE_PARPORT(1)
171
-
MAPIO(rpc_map_io)
172
-
INITIRQ(rpc_init_irq)
166
+
/* Maintainer: Russell King */
167
+
.phys_ram = 0x10000000,
168
+
.phys_io = 0x03000000,
169
+
.io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
170
+
.boot_params = 0x10000100,
171
+
.reserve_lp0 = 1,
172
+
.reserve_lp1 = 1,
173
+
.map_io = rpc_map_io,
174
+
.init_irq = rpc_init_irq,
173
175
.timer = &ioc_timer,
174
176
MACHINE_END
+5
-4
arch/arm/mach-s3c2410/mach-bast.c
+5
-4
arch/arm/mach-s3c2410/mach-bast.c
···
407
407
408
408
409
409
MACHINE_START(BAST, "Simtec-BAST")
410
-
MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
411
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
412
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
413
-
410
+
/* Maintainer: Ben Dooks <ben@simtec.co.uk> */
411
+
.phys_ram = S3C2410_SDRAM_PA,
412
+
.phys_io = S3C2410_PA_UART,
413
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
414
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
414
415
.map_io = bast_map_io,
415
416
.init_irq = s3c24xx_init_irq,
416
417
.timer = &s3c24xx_timer,
+7
-5
arch/arm/mach-s3c2410/mach-h1940.c
+7
-5
arch/arm/mach-s3c2410/mach-h1940.c
···
117
117
}
118
118
119
119
MACHINE_START(H1940, "IPAQ-H1940")
120
-
MAINTAINER("Ben Dooks <ben@fluff.org>")
121
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
122
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
123
-
MAPIO(h1940_map_io)
124
-
INITIRQ(h1940_init_irq)
120
+
/* Maintainer: Ben Dooks <ben@fluff.org> */
121
+
.phys_ram = S3C2410_SDRAM_PA,
122
+
.phys_io = S3C2410_PA_UART,
123
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
124
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
125
+
.map_io = h1940_map_io,
126
+
.init_irq = h1940_init_irq,
125
127
.timer = &s3c24xx_timer,
126
128
MACHINE_END
+5
-4
arch/arm/mach-s3c2410/mach-n30.c
+5
-4
arch/arm/mach-s3c2410/mach-n30.c
···
137
137
}
138
138
139
139
MACHINE_START(N30, "Acer-N30")
140
-
MAINTAINER("Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org>")
141
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
142
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
143
-
140
+
/* Maintainer: Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org> */
141
+
.phys_ram = S3C2410_SDRAM_PA,
142
+
.phys_io = S3C2410_PA_UART,
143
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
144
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
144
145
.timer = &s3c24xx_timer,
145
146
.init_machine = n30_init,
146
147
.init_irq = n30_init_irq,
+5
-3
arch/arm/mach-s3c2410/mach-nexcoder.c
+5
-3
arch/arm/mach-s3c2410/mach-nexcoder.c
···
147
147
148
148
149
149
MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
150
-
MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
151
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
152
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
150
+
/* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
151
+
.phys_ram = S3C2410_SDRAM_PA,
152
+
.phys_io = S3C2410_PA_UART,
153
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
154
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
153
155
.map_io = nexcoder_map_io,
154
156
.init_irq = s3c24xx_init_irq,
155
157
.timer = &s3c24xx_timer,
+5
-3
arch/arm/mach-s3c2410/mach-otom.c
+5
-3
arch/arm/mach-s3c2410/mach-otom.c
···
115
115
116
116
117
117
MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
118
-
MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>")
119
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
120
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
118
+
/* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
119
+
.phys_ram = S3C2410_SDRAM_PA,
120
+
.phys_io = S3C2410_PA_UART,
121
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
122
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
121
123
.map_io = otom11_map_io,
122
124
.init_irq = s3c24xx_init_irq,
123
125
.timer = &s3c24xx_timer,
+8
-6
arch/arm/mach-s3c2410/mach-rx3715.c
+8
-6
arch/arm/mach-s3c2410/mach-rx3715.c
···
131
131
#endif
132
132
133
133
MACHINE_START(RX3715, "IPAQ-RX3715")
134
-
MAINTAINER("Ben Dooks <ben@fluff.org>")
135
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
136
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
137
-
MAPIO(rx3715_map_io)
138
-
INITIRQ(rx3715_init_irq)
139
-
INIT_MACHINE(rx3715_init_machine)
134
+
/* Maintainer: Ben Dooks <ben@fluff.org> */
135
+
.phys_ram = S3C2410_SDRAM_PA,
136
+
.phys_io = S3C2410_PA_UART,
137
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
138
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
139
+
.map_io = rx3715_map_io,
140
+
.init_irq = rx3715_init_irq,
141
+
.init_machine = rx3715_init_machine,
140
142
.timer = &s3c24xx_timer,
141
143
MACHINE_END
+7
-5
arch/arm/mach-s3c2410/mach-smdk2410.c
+7
-5
arch/arm/mach-s3c2410/mach-smdk2410.c
···
112
112
113
113
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
114
114
* to SMDK2410 */
115
-
MAINTAINER("Jonas Dietsche")
116
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
117
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
118
-
MAPIO(smdk2410_map_io)
119
-
INITIRQ(smdk2410_init_irq)
115
+
/* Maintainer: Jonas Dietsche */
116
+
.phys_ram = S3C2410_SDRAM_PA,
117
+
.phys_io = S3C2410_PA_UART,
118
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
119
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
120
+
.map_io = smdk2410_map_io,
121
+
.init_irq = smdk2410_init_irq,
120
122
.timer = &s3c24xx_timer,
121
123
MACHINE_END
122
124
+5
-3
arch/arm/mach-s3c2410/mach-smdk2440.c
+5
-3
arch/arm/mach-s3c2410/mach-smdk2440.c
···
124
124
}
125
125
126
126
MACHINE_START(S3C2440, "SMDK2440")
127
-
MAINTAINER("Ben Dooks <ben@fluff.org>")
128
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
129
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
127
+
/* Maintainer: Ben Dooks <ben@fluff.org> */
128
+
.phys_ram = S3C2410_SDRAM_PA,
129
+
.phys_io = S3C2410_PA_UART,
130
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
131
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
130
132
131
133
.init_irq = s3c24xx_init_irq,
132
134
.map_io = smdk2440_map_io,
+5
-3
arch/arm/mach-s3c2410/mach-vr1000.c
+5
-3
arch/arm/mach-s3c2410/mach-vr1000.c
···
373
373
374
374
375
375
MACHINE_START(VR1000, "Thorcom-VR1000")
376
-
MAINTAINER("Ben Dooks <ben@simtec.co.uk>")
377
-
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART)
378
-
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100)
376
+
/* Maintainer: Ben Dooks <ben@simtec.co.uk> */
377
+
.phys_ram = S3C2410_SDRAM_PA,
378
+
.phys_io = S3C2410_PA_UART,
379
+
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
380
+
.boot_params = S3C2410_SDRAM_PA + 0x100,
379
381
.map_io = vr1000_map_io,
380
382
.init_irq = s3c24xx_init_irq,
381
383
.timer = &s3c24xx_timer,
+7
-5
arch/arm/mach-sa1100/assabet.c
+7
-5
arch/arm/mach-sa1100/assabet.c
···
431
431
432
432
433
433
MACHINE_START(ASSABET, "Intel-Assabet")
434
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
435
-
BOOT_PARAMS(0xc0000100)
436
-
FIXUP(fixup_assabet)
437
-
MAPIO(assabet_map_io)
438
-
INITIRQ(sa1100_init_irq)
434
+
.phys_ram = 0xc0000000,
435
+
.phys_io = 0x80000000,
436
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
437
+
.boot_params = 0xc0000100,
438
+
.fixup = fixup_assabet,
439
+
.map_io = assabet_map_io,
440
+
.init_irq = sa1100_init_irq,
439
441
.timer = &sa1100_timer,
440
442
.init_machine = assabet_init,
441
443
MACHINE_END
+6
-4
arch/arm/mach-sa1100/badge4.c
+6
-4
arch/arm/mach-sa1100/badge4.c
···
285
285
}
286
286
287
287
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
288
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
289
-
BOOT_PARAMS(0xc0000100)
290
-
MAPIO(badge4_map_io)
291
-
INITIRQ(sa1100_init_irq)
288
+
.phys_ram = 0xc0000000,
289
+
.phys_io = 0x80000000,
290
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
291
+
.boot_params = 0xc0000100,
292
+
.map_io = badge4_map_io,
293
+
.init_irq = sa1100_init_irq,
292
294
.timer = &sa1100_timer,
293
295
MACHINE_END
+6
-4
arch/arm/mach-sa1100/cerf.c
+6
-4
arch/arm/mach-sa1100/cerf.c
···
123
123
}
124
124
125
125
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
126
-
MAINTAINER("support@intrinsyc.com")
127
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
128
-
MAPIO(cerf_map_io)
129
-
INITIRQ(cerf_init_irq)
126
+
/* Maintainer: support@intrinsyc.com */
127
+
.phys_ram = 0xc0000000,
128
+
.phys_io = 0x80000000,
129
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
130
+
.map_io = cerf_map_io,
131
+
.init_irq = cerf_init_irq,
130
132
.timer = &sa1100_timer,
131
133
.init_machine = cerf_init,
132
134
MACHINE_END
+5
-3
arch/arm/mach-sa1100/collie.c
+5
-3
arch/arm/mach-sa1100/collie.c
···
184
184
}
185
185
186
186
MACHINE_START(COLLIE, "Sharp-Collie")
187
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
188
-
MAPIO(collie_map_io)
189
-
INITIRQ(sa1100_init_irq)
187
+
.phys_ram = 0xc0000000,
188
+
.phys_io = 0x80000000,
189
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
190
+
.map_io = collie_map_io,
191
+
.init_irq = sa1100_init_irq,
190
192
.timer = &sa1100_timer,
191
193
.init_machine = collie_init,
192
194
MACHINE_END
+18
-12
arch/arm/mach-sa1100/h3600.c
+18
-12
arch/arm/mach-sa1100/h3600.c
···
380
380
}
381
381
382
382
MACHINE_START(H3100, "Compaq iPAQ H3100")
383
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
384
-
BOOT_PARAMS(0xc0000100)
385
-
MAPIO(h3100_map_io)
386
-
INITIRQ(sa1100_init_irq)
383
+
.phys_ram = 0xc0000000,
384
+
.phys_io = 0x80000000,
385
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
386
+
.boot_params = 0xc0000100,
387
+
.map_io = h3100_map_io,
388
+
.init_irq = sa1100_init_irq,
387
389
.timer = &sa1100_timer,
388
390
.init_machine = h3xxx_mach_init,
389
391
MACHINE_END
···
498
496
}
499
497
500
498
MACHINE_START(H3600, "Compaq iPAQ H3600")
501
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
502
-
BOOT_PARAMS(0xc0000100)
503
-
MAPIO(h3600_map_io)
504
-
INITIRQ(sa1100_init_irq)
499
+
.phys_ram = 0xc0000000,
500
+
.phys_io = 0x80000000,
501
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
502
+
.boot_params = 0xc0000100,
503
+
.map_io = h3600_map_io,
504
+
.init_irq = sa1100_init_irq,
505
505
.timer = &sa1100_timer,
506
506
.init_machine = h3xxx_mach_init,
507
507
MACHINE_END
···
885
881
}
886
882
887
883
MACHINE_START(H3800, "Compaq iPAQ H3800")
888
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
889
-
BOOT_PARAMS(0xc0000100)
890
-
MAPIO(h3800_map_io)
891
-
INITIRQ(h3800_init_irq)
884
+
.phys_ram = 0xc0000000,
885
+
.phys_io = 0x80000000,
886
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
887
+
.boot_params = 0xc0000100,
888
+
.map_io = h3800_map_io,
889
+
.init_irq = h3800_init_irq,
892
890
.timer = &sa1100_timer,
893
891
.init_machine = h3xxx_mach_init,
894
892
MACHINE_END
+6
-4
arch/arm/mach-sa1100/hackkit.c
+6
-4
arch/arm/mach-sa1100/hackkit.c
···
191
191
*/
192
192
193
193
MACHINE_START(HACKKIT, "HackKit Cpu Board")
194
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
195
-
BOOT_PARAMS(0xc0000100)
196
-
MAPIO(hackkit_map_io)
197
-
INITIRQ(sa1100_init_irq)
194
+
.phys_ram = 0xc0000000,
195
+
.phys_io = 0x80000000,
196
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
197
+
.boot_params = 0xc0000100,
198
+
.map_io = hackkit_map_io,
199
+
.init_irq = sa1100_init_irq,
198
200
.timer = &sa1100_timer,
199
201
.init_machine = hackkit_init,
200
202
MACHINE_END
+6
-4
arch/arm/mach-sa1100/jornada720.c
+6
-4
arch/arm/mach-sa1100/jornada720.c
···
97
97
}
98
98
99
99
MACHINE_START(JORNADA720, "HP Jornada 720")
100
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
101
-
BOOT_PARAMS(0xc0000100)
102
-
MAPIO(jornada720_map_io)
103
-
INITIRQ(sa1100_init_irq)
100
+
.phys_ram = 0xc0000000,
101
+
.phys_io = 0x80000000,
102
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
103
+
.boot_params = 0xc0000100,
104
+
.map_io = jornada720_map_io,
105
+
.init_irq = sa1100_init_irq,
104
106
.timer = &sa1100_timer,
105
107
MACHINE_END
+6
-4
arch/arm/mach-sa1100/lart.c
+6
-4
arch/arm/mach-sa1100/lart.c
···
41
41
}
42
42
43
43
MACHINE_START(LART, "LART")
44
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
45
-
BOOT_PARAMS(0xc0000100)
46
-
MAPIO(lart_map_io)
47
-
INITIRQ(sa1100_init_irq)
44
+
.phys_ram = 0xc0000000,
45
+
.phys_io = 0x80000000,
46
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
47
+
.boot_params = 0xc0000100,
48
+
.map_io = lart_map_io,
49
+
.init_irq = sa1100_init_irq,
48
50
.timer = &sa1100_timer,
49
51
MACHINE_END
+5
-3
arch/arm/mach-sa1100/pleb.c
+5
-3
arch/arm/mach-sa1100/pleb.c
···
146
146
}
147
147
148
148
MACHINE_START(PLEB, "PLEB")
149
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
150
-
MAPIO(pleb_map_io)
151
-
INITIRQ(sa1100_init_irq)
149
+
.phys_ram = 0xc0000000,
150
+
.phys_io = 0x80000000,
151
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
152
+
.map_io = pleb_map_io,
153
+
.init_irq = sa1100_init_irq,
152
154
.timer = &sa1100_timer,
153
155
.init_machine = pleb_init,
154
156
MACHINE_END
+6
-4
arch/arm/mach-sa1100/shannon.c
+6
-4
arch/arm/mach-sa1100/shannon.c
···
76
76
}
77
77
78
78
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
79
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
80
-
BOOT_PARAMS(0xc0000100)
81
-
MAPIO(shannon_map_io)
82
-
INITIRQ(sa1100_init_irq)
79
+
.phys_ram = 0xc0000000,
80
+
.phys_io = 0x80000000,
81
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
82
+
.boot_params = 0xc0000100,
83
+
.map_io = shannon_map_io,
84
+
.init_irq = sa1100_init_irq,
83
85
.timer = &sa1100_timer,
84
86
.init_machine = shannon_init,
85
87
MACHINE_END
+7
-5
arch/arm/mach-sa1100/simpad.c
+7
-5
arch/arm/mach-sa1100/simpad.c
···
215
215
216
216
217
217
MACHINE_START(SIMPAD, "Simpad")
218
-
MAINTAINER("Holger Freyther")
219
-
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000)
220
-
BOOT_PARAMS(0xc0000100)
221
-
MAPIO(simpad_map_io)
222
-
INITIRQ(sa1100_init_irq)
218
+
/* Maintainer: Holger Freyther */
219
+
.phys_ram = 0xc0000000,
220
+
.phys_io = 0x80000000,
221
+
.io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
222
+
.boot_params = 0xc0000100,
223
+
.map_io = simpad_map_io,
224
+
.init_irq = sa1100_init_irq,
223
225
.timer = &sa1100_timer,
224
226
MACHINE_END
+7
-5
arch/arm/mach-shark/core.c
+7
-5
arch/arm/mach-shark/core.c
···
105
105
};
106
106
107
107
MACHINE_START(SHARK, "Shark")
108
-
MAINTAINER("Alexander Schulz")
109
-
BOOT_MEM(0x08000000, 0x40000000, 0xe0000000)
110
-
BOOT_PARAMS(0x08003000)
111
-
MAPIO(shark_map_io)
112
-
INITIRQ(shark_init_irq)
108
+
/* Maintainer: Alexander Schulz */
109
+
.phys_ram = 0x08000000,
110
+
.phys_io = 0x40000000,
111
+
.io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
112
+
.boot_params = 0x08003000,
113
+
.map_io = shark_map_io,
114
+
.init_irq = shark_init_irq,
113
115
.timer = &shark_timer,
114
116
MACHINE_END
+8
-6
arch/arm/mach-versatile/versatile_ab.c
+8
-6
arch/arm/mach-versatile/versatile_ab.c
···
35
35
#include "core.h"
36
36
37
37
MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
38
-
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
39
-
BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
40
-
BOOT_PARAMS(0x00000100)
41
-
MAPIO(versatile_map_io)
42
-
INITIRQ(versatile_init_irq)
38
+
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
39
+
.phys_ram = 0x00000000,
40
+
.phys_io = 0x101f1000,
41
+
.io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc,
42
+
.boot_params = 0x00000100,
43
+
.map_io = versatile_map_io,
44
+
.init_irq = versatile_init_irq,
43
45
.timer = &versatile_timer,
44
-
INIT_MACHINE(versatile_init)
46
+
.init_machine = versatile_init,
45
47
MACHINE_END
+8
-6
arch/arm/mach-versatile/versatile_pb.c
+8
-6
arch/arm/mach-versatile/versatile_pb.c
···
99
99
arch_initcall(versatile_pb_init);
100
100
101
101
MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
102
-
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd")
103
-
BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000)
104
-
BOOT_PARAMS(0x00000100)
105
-
MAPIO(versatile_map_io)
106
-
INITIRQ(versatile_init_irq)
102
+
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
103
+
.phys_ram = 0x00000000,
104
+
.phys_io = 0x101f1000,
105
+
.io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc,
106
+
.boot_params = 0x00000100,
107
+
.map_io = versatile_map_io,
108
+
.init_irq = versatile_init_irq,
107
109
.timer = &versatile_timer,
108
-
INIT_MACHINE(versatile_init)
110
+
.init_machine = versatile_init,
109
111
MACHINE_END
+2
-1
arch/arm/mm/blockops.c
+2
-1
arch/arm/mm/blockops.c
···
25
25
{
26
26
asm(
27
27
"add r1, r0, %0 \n\
28
+
sub r1, r1, %1 \n\
28
29
1: .word 0xec401f0e @ mcrr p15, 0, r0, r1, c14, 0 @ blocking \n\
29
30
mov r0, #0 \n\
30
31
mcr p15, 0, r0, c7, c5, 0 \n\
31
32
mcr p15, 0, r0, c7, c10, 4 \n\
32
33
mov pc, lr"
33
34
:
34
-
: "I" (PAGE_SIZE));
35
+
: "I" (PAGE_SIZE), "I" (L1_CACHE_BYTES));
35
36
}
36
37
37
38
/*
-5
drivers/serial/s3c2410.c
-5
drivers/serial/s3c2410.c
···
522
522
static int s3c24xx_serial_startup(struct uart_port *port)
523
523
{
524
524
struct s3c24xx_uart_port *ourport = to_ourport(port);
525
-
unsigned long flags;
526
525
int ret;
527
526
528
527
dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
529
528
port->mapbase, port->membase);
530
-
531
-
local_irq_save(flags);
532
529
533
530
rx_enabled(port) = 1;
534
531
···
560
563
/* the port reset code should have done the correct
561
564
* register setup for the port controls */
562
565
563
-
local_irq_restore(flags);
564
566
return ret;
565
567
566
568
err:
567
569
s3c24xx_serial_shutdown(port);
568
-
local_irq_restore(flags);
569
570
return ret;
570
571
}
571
572
-32
include/asm-arm/mach/arch.h
-32
include/asm-arm/mach/arch.h
···
54
54
.nr = MACH_TYPE_##_type, \
55
55
.name = _name,
56
56
57
-
#define MAINTAINER(n)
58
-
59
-
#define BOOT_MEM(_pram,_pio,_vio) \
60
-
.phys_ram = _pram, \
61
-
.phys_io = _pio, \
62
-
.io_pg_offst = ((_vio)>>18)&0xfffc,
63
-
64
-
#define BOOT_PARAMS(_params) \
65
-
.param_offset = _params,
66
-
67
-
#define VIDEO(_start,_end) \
68
-
.video_start = _start, \
69
-
.video_end = _end,
70
-
71
-
#define DISABLE_PARPORT(_n) \
72
-
.reserve_lp##_n = 1,
73
-
74
-
#define SOFT_REBOOT \
75
-
.soft_reboot = 1,
76
-
77
-
#define FIXUP(_func) \
78
-
.fixup = _func,
79
-
80
-
#define MAPIO(_func) \
81
-
.map_io = _func,
82
-
83
-
#define INITIRQ(_func) \
84
-
.init_irq = _func,
85
-
86
-
#define INIT_MACHINE(_func) \
87
-
.init_machine = _func,
88
-
89
57
#define MACHINE_END \
90
58
};
91
59