Skip to content

L
linux
Commit 19f7241a authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents 08ab8c20 0d670b41
Show whitespace changes
Inline Side-by-side
Showing with 609 additions and 491 deletions
arch/arm/mach-aaec2000/aaed2000.c
View file @ 19f7241a
...@@ -40,9 +40,11 @@ static void __init aaed2000_map_io(void) ...@@ -40,9 +40,11 @@ static void __init aaed2000_map_io(void)
} }
MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform") MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")
MAINTAINER("Nicolas Bellido Y Ortega") /* Maintainer: Nicolas Bellido Y Ortega */
BOOT_MEM(0xf0000000, PIO_BASE, VIO_BASE) .phys_ram = 0xf0000000,
MAPIO(aaed2000_map_io) .phys_io = PIO_BASE,
INITIRQ(aaed2000_init_irq) .io_pg_offst = ((VIO_BASE) >> 18) & 0xfffc,
.map_io = aaed2000_map_io,
.init_irq = aaed2000_init_irq,
.timer = &aaec2000_timer, .timer = &aaec2000_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/autcpu12.c
View file @ 19f7241a
...@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void) ...@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void)
} }
MACHINE_START(AUTCPU12, "autronix autcpu12") MACHINE_START(AUTCPU12, "autronix autcpu12")
MAINTAINER("Thomas Gleixner") /* Maintainer: Thomas Gleixner */
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0020000) .phys_io = 0x80000000,
MAPIO(autcpu12_map_io) .io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
INITIRQ(clps711x_init_irq) .boot_params = 0xc0020000,
.map_io = autcpu12_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/cdb89712.c
View file @ 19f7241a
...@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void) ...@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void)
} }
MACHINE_START(CDB89712, "Cirrus-CDB89712") MACHINE_START(CDB89712, "Cirrus-CDB89712")
MAINTAINER("Ray Lehtiniemi") /* Maintainer: Ray Lehtiniemi */
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(cdb89712_map_io) .io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
INITIRQ(clps711x_init_irq) .boot_params = 0xc0000100,
.map_io = cdb89712_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/ceiva.c
View file @ 19f7241a
...@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void) ...@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void)
MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame") MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")
MAINTAINER("Rob Scott") /* Maintainer: Rob Scott */
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(ceiva_map_io) .io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
INITIRQ(clps711x_init_irq) .boot_params = 0xc0000100,
.map_io = ceiva_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/clep7312.c
View file @ 19f7241a
...@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, ...@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags,
MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312") MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
MAINTAINER("Nobody") /* Maintainer: Nobody */
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
FIXUP(fixup_clep7312) .io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
MAPIO(clps711x_map_io) .boot_params = 0xc0000100,
INITIRQ(clps711x_init_irq) .fixup = fixup_clep7312,
.map_io = clps711x_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/edb7211-arch.c
View file @ 19f7241a
...@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags, ...@@ -51,11 +51,13 @@ fixup_edb7211(struct machine_desc *desc, struct tag *tags,
} }
MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)") MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
MAINTAINER("Jon McClintock") /* Maintainer: Jon McClintock */
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0020100) /* 0xc0000000 - 0xc001ffff can be video RAM */ .phys_io = 0x80000000,
FIXUP(fixup_edb7211) .io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
MAPIO(edb7211_map_io) .boot_params = 0xc0020100, /* 0xc0000000 - 0xc001ffff can be video RAM */
INITIRQ(clps711x_init_irq) .fixup = fixup_edb7211,
.map_io = edb7211_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/fortunet.c
View file @ 19f7241a
...@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags, ...@@ -75,11 +75,13 @@ fortunet_fixup(struct machine_desc *desc, struct tag *tags,
} }
MACHINE_START(FORTUNET, "ARM-FortuNet") MACHINE_START(FORTUNET, "ARM-FortuNet")
MAINTAINER("FortuNet Inc.") /* Maintainer: FortuNet Inc. */
BOOT_MEM(0xc0000000, 0x80000000, 0xf0000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0x00000000) .phys_io = 0x80000000,
FIXUP(fortunet_fixup) .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
MAPIO(clps711x_map_io) .boot_params = 0x00000000,
INITIRQ(clps711x_init_irq) .fixup = fortunet_fixup,
.map_io = clps711x_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-clps711x/p720t.c
View file @ 19f7241a
...@@ -79,12 +79,14 @@ static void __init p720t_map_io(void) ...@@ -79,12 +79,14 @@ static void __init p720t_map_io(void)
} }
MACHINE_START(P720T, "ARM-Prospector720T") MACHINE_START(P720T, "ARM-Prospector720T")
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
BOOT_MEM(0xc0000000, 0x80000000, 0xff000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
FIXUP(fixup_p720t) .io_pg_offst = ((0xff000000) >> 18) & 0xfffc,
MAPIO(p720t_map_io) .boot_params = 0xc0000100,
INITIRQ(clps711x_init_irq) .fixup = fixup_p720t,
.map_io = p720t_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,
MACHINE_END MACHINE_END
......
arch/arm/mach-clps7500/core.c
View file @ 19f7241a
...@@ -366,10 +366,12 @@ static void __init clps7500_init(void) ...@@ -366,10 +366,12 @@ static void __init clps7500_init(void)
} }
MACHINE_START(CLPS7500, "CL-PS7500") MACHINE_START(CLPS7500, "CL-PS7500")
MAINTAINER("Philip Blundell") /* Maintainer: Philip Blundell */
BOOT_MEM(0x10000000, 0x03000000, 0xe0000000) .phys_ram = 0x10000000,
MAPIO(clps7500_map_io) .phys_io = 0x03000000,
INITIRQ(clps7500_init_irq) .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
.map_io = clps7500_map_io,
.init_irq = clps7500_init_irq,
.init_machine = clps7500_init, .init_machine = clps7500_init,
.timer = &clps7500_timer, .timer = &clps7500_timer,
MACHINE_END MACHINE_END
......
arch/arm/mach-ebsa110/core.c
View file @ 19f7241a
...@@ -233,13 +233,15 @@ static int __init ebsa110_init(void) ...@@ -233,13 +233,15 @@ static int __init ebsa110_init(void)
arch_initcall(ebsa110_init); arch_initcall(ebsa110_init);
MACHINE_START(EBSA110, "EBSA110") MACHINE_START(EBSA110, "EBSA110")
MAINTAINER("Russell King") /* Maintainer: Russell King */
BOOT_MEM(0x00000000, 0xe0000000, 0xe0000000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000400) .phys_io = 0xe0000000,
DISABLE_PARPORT(0) .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
DISABLE_PARPORT(2) .boot_params = 0x00000400,
SOFT_REBOOT .reserve_lp0 = 1,
MAPIO(ebsa110_map_io) .reserve_lp2 = 1,
INITIRQ(ebsa110_init_irq) .soft_reboot = 1,
.map_io = ebsa110_map_io,
.init_irq = ebsa110_init_irq,
.timer = &ebsa110_timer, .timer = &ebsa110_timer,
MACHINE_END MACHINE_END
arch/arm/mach-epxa10db/arch.c
View file @ 19f7241a
...@@ -63,10 +63,12 @@ extern void epxa10db_init_irq(void); ...@@ -63,10 +63,12 @@ extern void epxa10db_init_irq(void);
extern struct sys_timer epxa10db_timer; extern struct sys_timer epxa10db_timer;
MACHINE_START(CAMELOT, "Altera Epxa10db") MACHINE_START(CAMELOT, "Altera Epxa10db")
MAINTAINER("Altera Corporation") /* Maintainer: Altera Corporation */
BOOT_MEM(0x00000000, 0x7fffc000, 0xffffc000) .phys_ram = 0x00000000,
MAPIO(epxa10db_map_io) .phys_io = 0x7fffc000,
INITIRQ(epxa10db_init_irq) .io_pg_offst = ((0xffffc000) >> 18) & 0xfffc,
.map_io = epxa10db_map_io,
.init_irq = epxa10db_init_irq,
.timer = &epxa10db_timer, .timer = &epxa10db_timer,
MACHINE_END MACHINE_END
arch/arm/mach-footbridge/cats-hw.c
View file @ 19f7241a
...@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags, ...@@ -84,12 +84,14 @@ fixup_cats(struct machine_desc *desc, struct tag *tags,
} }
MACHINE_START(CATS, "Chalice-CATS") MACHINE_START(CATS, "Chalice-CATS")
MAINTAINER("Philip Blundell") /* Maintainer: Philip Blundell */
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = DC21285_ARMCSR_BASE,
SOFT_REBOOT .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
FIXUP(fixup_cats) .boot_params = 0x00000100,
MAPIO(footbridge_map_io) .soft_reboot = 1,
INITIRQ(footbridge_init_irq) .fixup = fixup_cats,
.map_io = footbridge_map_io,
.init_irq = footbridge_init_irq,
.timer = &isa_timer, .timer = &isa_timer,
MACHINE_END MACHINE_END
arch/arm/mach-footbridge/co285.c
View file @ 19f7241a
...@@ -28,11 +28,13 @@ fixup_coebsa285(struct machine_desc *desc, struct tag *tags, ...@@ -28,11 +28,13 @@ fixup_coebsa285(struct machine_desc *desc, struct tag *tags,
} }
MACHINE_START(CO285, "co-EBSA285") MACHINE_START(CO285, "co-EBSA285")
MAINTAINER("Mark van Doesburg") /* Maintainer: Mark van Doesburg */
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0x7cf00000) .phys_ram = 0x00000000,
FIXUP(fixup_coebsa285) .phys_io = DC21285_ARMCSR_BASE,
MAPIO(footbridge_map_io) .io_pg_offst = ((0x7cf00000) >> 18) & 0xfffc,
INITIRQ(footbridge_init_irq) .fixup = fixup_coebsa285,
.map_io = footbridge_map_io,
.init_irq = footbridge_init_irq,
.timer = &footbridge_timer, .timer = &footbridge_timer,
MACHINE_END MACHINE_END
arch/arm/mach-footbridge/ebsa285.c
View file @ 19f7241a
...@@ -13,12 +13,15 @@ ...@@ -13,12 +13,15 @@
#include "common.h" #include "common.h"
MACHINE_START(EBSA285, "EBSA285") MACHINE_START(EBSA285, "EBSA285")
MAINTAINER("Russell King") /* Maintainer: Russell King */
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = DC21285_ARMCSR_BASE,
VIDEO(0x000a0000, 0x000bffff) .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
MAPIO(footbridge_map_io) .boot_params = 0x00000100,
INITIRQ(footbridge_init_irq) .video_start = 0x000a0000,
.video_end = 0x000bffff,
.map_io = footbridge_map_io,
.init_irq = footbridge_init_irq,
.timer = &footbridge_timer, .timer = &footbridge_timer,
MACHINE_END MACHINE_END
arch/arm/mach-footbridge/netwinder-hw.c
View file @ 19f7241a
...@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags, ...@@ -647,14 +647,17 @@ fixup_netwinder(struct machine_desc *desc, struct tag *tags,
} }
MACHINE_START(NETWINDER, "Rebel-NetWinder") MACHINE_START(NETWINDER, "Rebel-NetWinder")
MAINTAINER("Russell King/Rebel.com") /* Maintainer: Russell King/Rebel.com */
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = DC21285_ARMCSR_BASE,
VIDEO(0x000a0000, 0x000bffff) .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
DISABLE_PARPORT(0) .boot_params = 0x00000100,
DISABLE_PARPORT(2) .video_start = 0x000a0000,
FIXUP(fixup_netwinder) .video_end = 0x000bffff,
MAPIO(footbridge_map_io) .reserve_lp0 = 1,
INITIRQ(footbridge_init_irq) .reserve_lp2 = 1,
.fixup = fixup_netwinder,
.map_io = footbridge_map_io,
.init_irq = footbridge_init_irq,
.timer = &isa_timer, .timer = &isa_timer,
MACHINE_END MACHINE_END
arch/arm/mach-footbridge/personal.c
View file @ 19f7241a
...@@ -13,11 +13,13 @@ ...@@ -13,11 +13,13 @@
#include "common.h" #include "common.h"
MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer") MACHINE_START(PERSONAL_SERVER, "Compaq-PersonalServer")
MAINTAINER("Jamey Hicks / George France") /* Maintainer: Jamey Hicks / George France */
BOOT_MEM(0x00000000, DC21285_ARMCSR_BASE, 0xfe000000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = DC21285_ARMCSR_BASE,
MAPIO(footbridge_map_io) .io_pg_offst = ((0xfe000000) >> 18) & 0xfffc,
INITIRQ(footbridge_init_irq) .boot_params = 0x00000100,
.map_io = footbridge_map_io,
.init_irq = footbridge_init_irq,
.timer = &footbridge_timer, .timer = &footbridge_timer,
MACHINE_END MACHINE_END
arch/arm/mach-h720x/h7201-eval.c
View file @ 19f7241a
...@@ -30,10 +30,12 @@ ...@@ -30,10 +30,12 @@
#include "common.h" #include "common.h"
MACHINE_START(H7201, "Hynix GMS30C7201") MACHINE_START(H7201, "Hynix GMS30C7201")
MAINTAINER("Robert Schwebel, Pengutronix") /* Maintainer: Robert Schwebel, Pengutronix */
BOOT_MEM(0x40000000, 0x80000000, 0xf0000000) .phys_ram = 0x40000000,
BOOT_PARAMS(0xc0001000) .phys_io = 0x80000000,
MAPIO(h720x_map_io) .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
INITIRQ(h720x_init_irq) .boot_params = 0xc0001000,
.map_io = h720x_map_io,
.init_irq = h720x_init_irq,
.timer = &h7201_timer, .timer = &h7201_timer,
MACHINE_END MACHINE_END
arch/arm/mach-h720x/h7202-eval.c
View file @ 19f7241a
...@@ -71,11 +71,13 @@ static void __init init_eval_h7202(void) ...@@ -71,11 +71,13 @@ static void __init init_eval_h7202(void)
} }
MACHINE_START(H7202, "Hynix HMS30C7202") MACHINE_START(H7202, "Hynix HMS30C7202")
MAINTAINER("Robert Schwebel, Pengutronix") /* Maintainer: Robert Schwebel, Pengutronix */
BOOT_MEM(0x40000000, 0x80000000, 0xf0000000) .phys_ram = 0x40000000,
BOOT_PARAMS(0x40000100) .phys_io = 0x80000000,
MAPIO(h720x_map_io) .io_pg_offst = ((0xf0000000) >> 18) & 0xfffc,
INITIRQ(h7202_init_irq) .boot_params = 0x40000100,
.map_io = h720x_map_io,
.init_irq = h7202_init_irq,
.timer = &h7202_timer, .timer = &h7202_timer,
INIT_MACHINE(init_eval_h7202) .init_machine = init_eval_h7202,
MACHINE_END MACHINE_END
arch/arm/mach-imx/mx1ads.c
View file @ 19f7241a
...@@ -78,11 +78,13 @@ mx1ads_map_io(void) ...@@ -78,11 +78,13 @@ mx1ads_map_io(void)
} }
MACHINE_START(MX1ADS, "Motorola MX1ADS") MACHINE_START(MX1ADS, "Motorola MX1ADS")
MAINTAINER("Sascha Hauer, Pengutronix") /* Maintainer: Sascha Hauer, Pengutronix */
BOOT_MEM(0x08000000, 0x00200000, 0xe0200000) .phys_ram = 0x08000000,
BOOT_PARAMS(0x08000100) .phys_io = 0x00200000,
MAPIO(mx1ads_map_io) .io_pg_offst = ((0xe0200000) >> 18) & 0xfffc,
INITIRQ(imx_init_irq) .boot_params = 0x08000100,
.map_io = mx1ads_map_io,
.init_irq = imx_init_irq,
.timer = &imx_timer, .timer = &imx_timer,
INIT_MACHINE(mx1ads_init) .init_machine = mx1ads_init,
MACHINE_END MACHINE_END
arch/arm/mach-integrator/integrator_ap.c
View file @ 19f7241a
...@@ -292,11 +292,13 @@ static struct sys_timer ap_timer = { ...@@ -292,11 +292,13 @@ static struct sys_timer ap_timer = {
}; };
MACHINE_START(INTEGRATOR, "ARM-Integrator") MACHINE_START(INTEGRATOR, "ARM-Integrator")
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
BOOT_MEM(0x00000000, 0x16000000, 0xf1600000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = 0x16000000,
MAPIO(ap_map_io) .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc,
INITIRQ(ap_init_irq) .boot_params = 0x00000100,
.map_io = ap_map_io,
.init_irq = ap_init_irq,
.timer = &ap_timer, .timer = &ap_timer,
INIT_MACHINE(ap_init) .init_machine = ap_init,
MACHINE_END MACHINE_END
arch/arm/mach-integrator/integrator_cp.c
View file @ 19f7241a
...@@ -532,11 +532,13 @@ static struct sys_timer cp_timer = { ...@@ -532,11 +532,13 @@ static struct sys_timer cp_timer = {
}; };
MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP") MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
BOOT_MEM(0x00000000, 0x16000000, 0xf1600000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = 0x16000000,
MAPIO(intcp_map_io) .io_pg_offst = ((0xf1600000) >> 18) & 0xfffc,
INITIRQ(intcp_init_irq) .boot_params = 0x00000100,
.map_io = intcp_map_io,
.init_irq = intcp_init_irq,
.timer = &cp_timer, .timer = &cp_timer,
INIT_MACHINE(intcp_init) .init_machine = intcp_init,
MACHINE_END MACHINE_END
arch/arm/mach-iop3xx/iop321-setup.c
View file @ 19f7241a
...@@ -146,23 +146,27 @@ extern void iop321_init_time(void); ...@@ -146,23 +146,27 @@ extern void iop321_init_time(void);
#if defined(CONFIG_ARCH_IQ80321) #if defined(CONFIG_ARCH_IQ80321)
MACHINE_START(IQ80321, "Intel IQ80321") MACHINE_START(IQ80321, "Intel IQ80321")
MAINTAINER("Intel Corporation") /* Maintainer: Intel Corporation */
BOOT_MEM(PHYS_OFFSET, IQ80321_UART, IQ80321_UART) .phys_ram = PHYS_OFFSET,
MAPIO(iq80321_map_io) .phys_io = IQ80321_UART,
INITIRQ(iop321_init_irq) .io_pg_offst = ((IQ80321_UART) >> 18) & 0xfffc,
.map_io = iq80321_map_io,
.init_irq = iop321_init_irq,
.timer = &iop321_timer, .timer = &iop321_timer,
BOOT_PARAMS(0xa0000100) .boot_params = 0xa0000100,
INIT_MACHINE(iop32x_init) .init_machine = iop32x_init,
MACHINE_END MACHINE_END
#elif defined(CONFIG_ARCH_IQ31244) #elif defined(CONFIG_ARCH_IQ31244)
MACHINE_START(IQ31244, "Intel IQ31244") MACHINE_START(IQ31244, "Intel IQ31244")
MAINTAINER("Intel Corp.") /* Maintainer: Intel Corp. */
BOOT_MEM(PHYS_OFFSET, IQ31244_UART, IQ31244_UART) .phys_ram = PHYS_OFFSET,
MAPIO(iq31244_map_io) .phys_io = IQ31244_UART,
INITIRQ(iop321_init_irq) .io_pg_offst = ((IQ31244_UART) >> 18) & 0xfffc,
.map_io = iq31244_map_io,
.init_irq = iop321_init_irq,
.timer = &iop321_timer, .timer = &iop321_timer,
BOOT_PARAMS(0xa0000100) .boot_params = 0xa0000100,
INIT_MACHINE(iop32x_init) .init_machine = iop32x_init,
MACHINE_END MACHINE_END
#else #else
#error No machine descriptor defined for this IOP3XX implementation #error No machine descriptor defined for this IOP3XX implementation
......
arch/arm/mach-iop3xx/iop331-setup.c
View file @ 19f7241a
...@@ -148,26 +148,28 @@ extern void iq80332_map_io(void); ...@@ -148,26 +148,28 @@ extern void iq80332_map_io(void);
#if defined(CONFIG_ARCH_IQ80331) #if defined(CONFIG_ARCH_IQ80331)
MACHINE_START(IQ80331, "Intel IQ80331") MACHINE_START(IQ80331, "Intel IQ80331")
MAINTAINER("Intel Corp.") /* Maintainer: Intel Corp. */
BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical .phys_ram = PHYS_OFFSET,
//BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS) .phys_io = 0xfefff000,
MAPIO(iq80331_map_io) .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
INITIRQ(iop331_init_irq) .map_io = iq80331_map_io,
.init_irq = iop331_init_irq,
.timer = &iop331_timer, .timer = &iop331_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(iop33x_init) .init_machine = iop33x_init,
MACHINE_END MACHINE_END
#elif defined(CONFIG_MACH_IQ80332) #elif defined(CONFIG_MACH_IQ80332)
MACHINE_START(IQ80332, "Intel IQ80332") MACHINE_START(IQ80332, "Intel IQ80332")
MAINTAINER("Intel Corp.") /* Maintainer: Intel Corp. */
BOOT_MEM(PHYS_OFFSET, 0xfefff000, 0xfffff000) // virtual, physical .phys_ram = PHYS_OFFSET,
//BOOT_MEM(PHYS_OFFSET, IOP331_UART0_VIRT, IOP331_UART0_PHYS) .phys_io = 0xfefff000,
MAPIO(iq80332_map_io) .io_pg_offst = ((0xfffff000) >> 18) & 0xfffc, // virtual, physical
INITIRQ(iop331_init_irq) .map_io = iq80332_map_io,
.init_irq = iop331_init_irq,
.timer = &iop331_timer, .timer = &iop331_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(iop33x_init) .init_machine = iop33x_init,
MACHINE_END MACHINE_END
#else #else
......
arch/arm/mach-ixp2000/enp2611.c
View file @ 19f7241a
...@@ -223,13 +223,15 @@ static void __init enp2611_init_machine(void) ...@@ -223,13 +223,15 @@ static void __init enp2611_init_machine(void)
MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board") MACHINE_START(ENP2611, "Radisys ENP-2611 PCI network processor board")
MAINTAINER("Lennert Buytenhek <buytenh@wantstofly.org>") /* Maintainer: Lennert Buytenhek <buytenh@wantstofly.org> */
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = IXP2000_UART_PHYS_BASE,
MAPIO(ixp2000_map_io) .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
INITIRQ(ixp2000_init_irq) .boot_params = 0x00000100,
.map_io = ixp2000_map_io,
.init_irq = ixp2000_init_irq,
.timer = &enp2611_timer, .timer = &enp2611_timer,
INIT_MACHINE(enp2611_init_machine) .init_machine = enp2611_init_machine,
MACHINE_END MACHINE_END
arch/arm/mach-ixp2000/ixdp2400.c
View file @ 19f7241a
...@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void) ...@@ -168,12 +168,14 @@ void ixdp2400_init_irq(void)
} }
MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform") MACHINE_START(IXDP2400, "Intel IXDP2400 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = IXP2000_UART_PHYS_BASE,
MAPIO(ixdp2x00_map_io) .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
INITIRQ(ixdp2400_init_irq) .boot_params = 0x00000100,
.map_io = ixdp2x00_map_io,
.init_irq = ixdp2400_init_irq,
.timer = &ixdp2400_timer, .timer = &ixdp2400_timer,
INIT_MACHINE(ixdp2x00_init_machine) .init_machine = ixdp2x00_init_machine,
MACHINE_END MACHINE_END
arch/arm/mach-ixp2000/ixdp2800.c
View file @ 19f7241a
...@@ -284,12 +284,14 @@ void ixdp2800_init_irq(void) ...@@ -284,12 +284,14 @@ void ixdp2800_init_irq(void)
} }
MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform") MACHINE_START(IXDP2800, "Intel IXDP2800 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = IXP2000_UART_PHYS_BASE,
MAPIO(ixdp2x00_map_io) .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
INITIRQ(ixdp2800_init_irq) .boot_params = 0x00000100,
.map_io = ixdp2x00_map_io,
.init_irq = ixdp2800_init_irq,
.timer = &ixdp2800_timer, .timer = &ixdp2800_timer,
INIT_MACHINE(ixdp2x00_init_machine) .init_machine = ixdp2x00_init_machine,
MACHINE_END MACHINE_END
arch/arm/mach-ixp2000/ixdp2x01.c
View file @ 19f7241a
...@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void) ...@@ -375,25 +375,29 @@ static void __init ixdp2x01_init_machine(void)
#ifdef CONFIG_ARCH_IXDP2401 #ifdef CONFIG_ARCH_IXDP2401
MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform") MACHINE_START(IXDP2401, "Intel IXDP2401 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = IXP2000_UART_PHYS_BASE,
MAPIO(ixdp2x01_map_io) .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
INITIRQ(ixdp2x01_init_irq) .boot_params = 0x00000100,
.map_io = ixdp2x01_map_io,
.init_irq = ixdp2x01_init_irq,
.timer = &ixdp2x01_timer, .timer = &ixdp2x01_timer,
INIT_MACHINE(ixdp2x01_init_machine) .init_machine = ixdp2x01_init_machine,
MACHINE_END MACHINE_END
#endif #endif
#ifdef CONFIG_ARCH_IXDP2801 #ifdef CONFIG_ARCH_IXDP2801
MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform") MACHINE_START(IXDP2801, "Intel IXDP2801 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(0x00000000, IXP2000_UART_PHYS_BASE, IXP2000_UART_VIRT_BASE) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = IXP2000_UART_PHYS_BASE,
MAPIO(ixdp2x01_map_io) .io_pg_offst = ((IXP2000_UART_VIRT_BASE) >> 18) & 0xfffc,
INITIRQ(ixdp2x01_init_irq) .boot_params = 0x00000100,
.map_io = ixdp2x01_map_io,
.init_irq = ixdp2x01_init_irq,
.timer = &ixdp2x01_timer, .timer = &ixdp2x01_timer,
INIT_MACHINE(ixdp2x01_init_machine) .init_machine = ixdp2x01_init_machine,
MACHINE_END MACHINE_END
#endif #endif
......
arch/arm/mach-ixp4xx/coyote-setup.c
View file @ 19f7241a
...@@ -100,14 +100,15 @@ static void __init coyote_init(void) ...@@ -100,14 +100,15 @@ static void __init coyote_init(void)
#ifdef CONFIG_ARCH_ADI_COYOTE #ifdef CONFIG_ARCH_ADI_COYOTE
MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote") MACHINE_START(ADI_COYOTE, "ADI Engineering Coyote")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_PERIPHERAL_BASE_VIRT) .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
MAPIO(coyote_map_io) .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = coyote_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(coyote_init) .init_machine = coyote_init,
MACHINE_END MACHINE_END
#endif #endif
...@@ -117,14 +118,15 @@ MACHINE_END ...@@ -117,14 +118,15 @@ MACHINE_END
*/ */
#ifdef CONFIG_MACH_IXDPG425 #ifdef CONFIG_MACH_IXDPG425
MACHINE_START(IXDPG425, "Intel IXDPG425") MACHINE_START(IXDPG425, "Intel IXDPG425")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_PERIPHERAL_BASE_VIRT) .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
MAPIO(coyote_map_io) .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = coyote_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(coyote_init) .init_machine = coyote_init,
MACHINE_END MACHINE_END
#endif #endif
arch/arm/mach-ixp4xx/gtwx5715-setup.c
View file @ 19f7241a
...@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void) ...@@ -140,14 +140,15 @@ static void __init gtwx5715_init(void)
MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)") MACHINE_START(GTWX5715, "Gemtek GTWX5715 (Linksys WRV54G)")
MAINTAINER("George Joseph") /* Maintainer: George Joseph */
BOOT_MEM(PHYS_OFFSET, IXP4XX_UART2_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_UART2_BASE_VIRT) .phys_io = IXP4XX_UART2_BASE_PHYS,
MAPIO(gtwx5715_map_io) .io_pg_offst = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = gtwx5715_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(gtwx5715_init) .init_machine = gtwx5715_init,
MACHINE_END MACHINE_END
arch/arm/mach-ixp4xx/ixdp425-setup.c
View file @ 19f7241a
...@@ -128,36 +128,39 @@ static void __init ixdp425_init(void) ...@@ -128,36 +128,39 @@ static void __init ixdp425_init(void)
} }
MACHINE_START(IXDP425, "Intel IXDP425 Development Platform") MACHINE_START(IXDP425, "Intel IXDP425 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_PERIPHERAL_BASE_VIRT) .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
MAPIO(ixdp425_map_io) .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = ixdp425_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(ixdp425_init) .init_machine = ixdp425_init,
MACHINE_END MACHINE_END
MACHINE_START(IXDP465, "Intel IXDP465 Development Platform") MACHINE_START(IXDP465, "Intel IXDP465 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_PERIPHERAL_BASE_VIRT) .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
MAPIO(ixdp425_map_io) .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = ixdp425_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(ixdp425_init) .init_machine = ixdp425_init,
MACHINE_END MACHINE_END
MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform") MACHINE_START(IXCDP1100, "Intel IXCDP1100 Development Platform")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_PERIPHERAL_BASE_VIRT) .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
MAPIO(ixdp425_map_io) .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = ixdp425_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(ixdp425_init) .init_machine = ixdp425_init,
MACHINE_END MACHINE_END
/* /*
...@@ -168,14 +171,15 @@ MACHINE_END ...@@ -168,14 +171,15 @@ MACHINE_END
*/ */
#ifdef CONFIG_ARCH_AVILA #ifdef CONFIG_ARCH_AVILA
MACHINE_START(AVILA, "Gateworks Avila Network Platform") MACHINE_START(AVILA, "Gateworks Avila Network Platform")
MAINTAINER("Deepak Saxena <dsaxena@plexity.net>") /* Maintainer: Deepak Saxena <dsaxena@plexity.net> */
BOOT_MEM(PHYS_OFFSET, IXP4XX_PERIPHERAL_BASE_PHYS, .phys_ram = PHYS_OFFSET,
IXP4XX_PERIPHERAL_BASE_VIRT) .phys_io = IXP4XX_PERIPHERAL_BASE_PHYS,
MAPIO(ixdp425_map_io) .io_pg_offst = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc,
INITIRQ(ixp4xx_init_irq) .map_io = ixdp425_map_io,
.init_irq = ixp4xx_init_irq,
.timer = &ixp4xx_timer, .timer = &ixp4xx_timer,
BOOT_PARAMS(0x0100) .boot_params = 0x0100,
INIT_MACHINE(ixdp425_init) .init_machine = ixdp425_init,
MACHINE_END MACHINE_END
#endif #endif
arch/arm/mach-l7200/core.c
View file @ 19f7241a
...@@ -81,9 +81,11 @@ static void __init l7200_map_io(void) ...@@ -81,9 +81,11 @@ static void __init l7200_map_io(void)
} }
MACHINE_START(L7200, "LinkUp Systems L7200") MACHINE_START(L7200, "LinkUp Systems L7200")
MAINTAINER("Steve Hill / Scott McConnell") /* Maintainer: Steve Hill / Scott McConnell */
BOOT_MEM(0xf0000000, 0x80040000, 0xd0000000) .phys_ram = 0xf0000000,
MAPIO(l7200_map_io) .phys_io = 0x80040000,
INITIRQ(l7200_init_irq) .io_pg_offst = ((0xd0000000) >> 18) & 0xfffc,
.map_io = l7200_map_io,
.init_irq = l7200_init_irq,
MACHINE_END MACHINE_END
arch/arm/mach-lh7a40x/arch-kev7a400.c
View file @ 19f7241a
...@@ -102,10 +102,12 @@ void __init lh7a40x_init_board_irq (void) ...@@ -102,10 +102,12 @@ void __init lh7a40x_init_board_irq (void)
} }
MACHINE_START (KEV7A400, "Sharp KEV7a400") MACHINE_START (KEV7A400, "Sharp KEV7a400")
MAINTAINER ("Marc Singer") /* Maintainer: Marc Singer */
BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000)) .phys_ram = 0xc0000000,
BOOT_PARAMS (0xc0000100) .phys_io = 0x80000000,
MAPIO (kev7a400_map_io) .io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc,
INITIRQ (lh7a400_init_irq) .boot_params = 0xc0000100,
.map_io = kev7a400_map_io,
.init_irq = lh7a400_init_irq,
.timer = &lh7a40x_timer, .timer = &lh7a40x_timer,
MACHINE_END MACHINE_END
arch/arm/mach-lh7a40x/arch-lpd7a40x.c
View file @ 19f7241a
...@@ -260,13 +260,15 @@ lpd7a400_map_io(void) ...@@ -260,13 +260,15 @@ lpd7a400_map_io(void)
#ifdef CONFIG_MACH_LPD7A400 #ifdef CONFIG_MACH_LPD7A400
MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10") MACHINE_START (LPD7A400, "Logic Product Development LPD7A400-10")
MAINTAINER ("Marc Singer") /* Maintainer: Marc Singer */
BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000)) .phys_ram = 0xc0000000,
BOOT_PARAMS (0xc0000100) .phys_io = 0x80000000,
MAPIO (lpd7a400_map_io) .io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc,
INITIRQ (lh7a400_init_irq) .boot_params = 0xc0000100,
.map_io = lpd7a400_map_io,
.init_irq = lh7a400_init_irq,
.timer = &lh7a40x_timer, .timer = &lh7a40x_timer,
INIT_MACHINE (lpd7a40x_init) .init_machine = lpd7a40x_init,
MACHINE_END MACHINE_END
#endif #endif
...@@ -274,13 +276,15 @@ MACHINE_END ...@@ -274,13 +276,15 @@ MACHINE_END
#ifdef CONFIG_MACH_LPD7A404 #ifdef CONFIG_MACH_LPD7A404
MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10") MACHINE_START (LPD7A404, "Logic Product Development LPD7A404-10")
MAINTAINER ("Marc Singer") /* Maintainer: Marc Singer */
BOOT_MEM (0xc0000000, 0x80000000, io_p2v (0x80000000)) .phys_ram = 0xc0000000,
BOOT_PARAMS (0xc0000100) .phys_io = 0x80000000,
MAPIO (lpd7a400_map_io) .io_pg_offst = ((io_p2v (0x80000000))>>18) & 0xfffc,
INITIRQ (lh7a404_init_irq) .boot_params = 0xc0000100,
.map_io = lpd7a400_map_io,
.init_irq = lh7a404_init_irq,
.timer = &lh7a40x_timer, .timer = &lh7a40x_timer,
INIT_MACHINE (lpd7a40x_init) .init_machine = lpd7a40x_init,
MACHINE_END MACHINE_END
#endif #endif
arch/arm/mach-omap/board-generic.c
View file @ 19f7241a
...@@ -88,11 +88,13 @@ static void __init omap_generic_map_io(void) ...@@ -88,11 +88,13 @@ static void __init omap_generic_map_io(void)
} }
MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710") MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
MAINTAINER("Tony Lindgren <tony@atomide.com>") /* Maintainer: Tony Lindgren <tony@atomide.com> */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(omap_generic_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(omap_generic_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(omap_generic_init) .map_io = omap_generic_map_io,
.init_irq = omap_generic_init_irq,
.init_machine = omap_generic_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-h2.c
View file @ 19f7241a
...@@ -177,11 +177,13 @@ static void __init h2_map_io(void) ...@@ -177,11 +177,13 @@ static void __init h2_map_io(void)
} }
MACHINE_START(OMAP_H2, "TI-H2") MACHINE_START(OMAP_H2, "TI-H2")
MAINTAINER("Imre Deak <imre.deak@nokia.com>") /* Maintainer: Imre Deak <imre.deak@nokia.com> */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(h2_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(h2_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(h2_init) .map_io = h2_map_io,
.init_irq = h2_init_irq,
.init_machine = h2_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-h3.c
View file @ 19f7241a
...@@ -195,11 +195,13 @@ static void __init h3_map_io(void) ...@@ -195,11 +195,13 @@ static void __init h3_map_io(void)
} }
MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board") MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
MAINTAINER("Texas Instruments, Inc.") /* Maintainer: Texas Instruments, Inc. */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(h3_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(h3_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(h3_init) .map_io = h3_map_io,
.init_irq = h3_init_irq,
.init_machine = h3_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-innovator.c
View file @ 19f7241a
...@@ -270,11 +270,13 @@ static void __init innovator_map_io(void) ...@@ -270,11 +270,13 @@ static void __init innovator_map_io(void)
} }
MACHINE_START(OMAP_INNOVATOR, "TI-Innovator") MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
MAINTAINER("MontaVista Software, Inc.") /* Maintainer: MontaVista Software, Inc. */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(innovator_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(innovator_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(innovator_init) .map_io = innovator_map_io,
.init_irq = innovator_init_irq,
.init_machine = innovator_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-netstar.c
View file @ 19f7241a
...@@ -141,11 +141,13 @@ static int __init netstar_late_init(void) ...@@ -141,11 +141,13 @@ static int __init netstar_late_init(void)
postcore_initcall(netstar_late_init); postcore_initcall(netstar_late_init);
MACHINE_START(NETSTAR, "NetStar OMAP5910") MACHINE_START(NETSTAR, "NetStar OMAP5910")
MAINTAINER("Ladislav Michl <michl@2n.cz>") /* Maintainer: Ladislav Michl <michl@2n.cz> */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(netstar_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(netstar_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(netstar_init) .map_io = netstar_map_io,
.init_irq = netstar_init_irq,
.init_machine = netstar_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-osk.c
View file @ 19f7241a
...@@ -159,11 +159,13 @@ static void __init osk_map_io(void) ...@@ -159,11 +159,13 @@ static void __init osk_map_io(void)
} }
MACHINE_START(OMAP_OSK, "TI-OSK") MACHINE_START(OMAP_OSK, "TI-OSK")
MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>") /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(osk_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(osk_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(osk_init) .map_io = osk_map_io,
.init_irq = osk_init_irq,
.init_machine = osk_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-perseus2.c
View file @ 19f7241a
...@@ -179,11 +179,13 @@ static void __init omap_perseus2_map_io(void) ...@@ -179,11 +179,13 @@ static void __init omap_perseus2_map_io(void)
} }
MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2") MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
MAINTAINER("Kevin Hilman <kjh@hilman.org>") /* Maintainer: Kevin Hilman <kjh@hilman.org> */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(omap_perseus2_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(omap_perseus2_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(omap_perseus2_init) .map_io = omap_perseus2_map_io,
.init_irq = omap_perseus2_init_irq,
.init_machine = omap_perseus2_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/board-voiceblue.c
View file @ 19f7241a
...@@ -246,11 +246,13 @@ EXPORT_SYMBOL(voiceblue_wdt_disable); ...@@ -246,11 +246,13 @@ EXPORT_SYMBOL(voiceblue_wdt_disable);
EXPORT_SYMBOL(voiceblue_wdt_ping); EXPORT_SYMBOL(voiceblue_wdt_ping);
MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910") MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
MAINTAINER("Ladislav Michl <michl@2n.cz>") /* Maintainer: Ladislav Michl <michl@2n.cz> */
BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0xfff00000,
MAPIO(voiceblue_map_io) .io_pg_offst = ((0xfef00000) >> 18) & 0xfffc,
INITIRQ(voiceblue_init_irq) .boot_params = 0x10000100,
INIT_MACHINE(voiceblue_init) .map_io = voiceblue_map_io,
.init_irq = voiceblue_init_irq,
.init_machine = voiceblue_init,
.timer = &omap_timer, .timer = &omap_timer,
MACHINE_END MACHINE_END
arch/arm/mach-omap/usb.c
View file @ 19f7241a
...@@ -41,7 +41,6 @@ ...@@ -41,7 +41,6 @@
/* These routines should handle the standard chip-specific modes /* These routines should handle the standard chip-specific modes
* for usb0/1/2 ports, covering basic mux and transceiver setup. * for usb0/1/2 ports, covering basic mux and transceiver setup.
* Call omap_usb_init() once, from INIT_MACHINE().
* *
* Some board-*.c files will need to set up additional mux options, * Some board-*.c files will need to set up additional mux options,
* like for suspend handling, vbus sensing, GPIOs, and the D+ pullup. * like for suspend handling, vbus sensing, GPIOs, and the D+ pullup.
......
arch/arm/mach-pxa/corgi.c
View file @ 19f7241a
...@@ -287,10 +287,12 @@ static void __init corgi_map_io(void) ...@@ -287,10 +287,12 @@ static void __init corgi_map_io(void)
#ifdef CONFIG_MACH_CORGI #ifdef CONFIG_MACH_CORGI
MACHINE_START(CORGI, "SHARP Corgi") MACHINE_START(CORGI, "SHARP Corgi")
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
FIXUP(fixup_corgi) .phys_io = 0x40000000,
MAPIO(corgi_map_io) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
INITIRQ(corgi_init_irq) .fixup = fixup_corgi,
.map_io = corgi_map_io,
.init_irq = corgi_init_irq,
.init_machine = corgi_init, .init_machine = corgi_init,
.timer = &pxa_timer, .timer = &pxa_timer,
MACHINE_END MACHINE_END
...@@ -298,10 +300,12 @@ MACHINE_END ...@@ -298,10 +300,12 @@ MACHINE_END
#ifdef CONFIG_MACH_SHEPHERD #ifdef CONFIG_MACH_SHEPHERD
MACHINE_START(SHEPHERD, "SHARP Shepherd") MACHINE_START(SHEPHERD, "SHARP Shepherd")
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
FIXUP(fixup_corgi) .phys_io = 0x40000000,
MAPIO(corgi_map_io) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
INITIRQ(corgi_init_irq) .fixup = fixup_corgi,
.map_io = corgi_map_io,
.init_irq = corgi_init_irq,
.init_machine = corgi_init, .init_machine = corgi_init,
.timer = &pxa_timer, .timer = &pxa_timer,
MACHINE_END MACHINE_END
...@@ -309,10 +313,12 @@ MACHINE_END ...@@ -309,10 +313,12 @@ MACHINE_END
#ifdef CONFIG_MACH_HUSKY #ifdef CONFIG_MACH_HUSKY
MACHINE_START(HUSKY, "SHARP Husky") MACHINE_START(HUSKY, "SHARP Husky")
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
FIXUP(fixup_corgi) .phys_io = 0x40000000,
MAPIO(corgi_map_io) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
INITIRQ(corgi_init_irq) .fixup = fixup_corgi,
.map_io = corgi_map_io,
.init_irq = corgi_init_irq,
.init_machine = corgi_init, .init_machine = corgi_init,
.timer = &pxa_timer, .timer = &pxa_timer,
MACHINE_END MACHINE_END
......
arch/arm/mach-pxa/idp.c
View file @ 19f7241a
...@@ -181,10 +181,12 @@ static void __init idp_map_io(void) ...@@ -181,10 +181,12 @@ static void __init idp_map_io(void)
MACHINE_START(PXA_IDP, "Vibren PXA255 IDP") MACHINE_START(PXA_IDP, "Vibren PXA255 IDP")
MAINTAINER("Vibren Technologies") /* Maintainer: Vibren Technologies */
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
MAPIO(idp_map_io) .phys_io = 0x40000000,
INITIRQ(idp_init_irq) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
.map_io = idp_map_io,
.init_irq = idp_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
INIT_MACHINE(idp_init) .init_machine = idp_init,
MACHINE_END MACHINE_END
arch/arm/mach-pxa/lubbock.c
View file @ 19f7241a
...@@ -268,10 +268,12 @@ static void __init lubbock_map_io(void) ...@@ -268,10 +268,12 @@ static void __init lubbock_map_io(void)
} }
MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)") MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
MAINTAINER("MontaVista Software Inc.") /* Maintainer: MontaVista Software Inc. */
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
MAPIO(lubbock_map_io) .phys_io = 0x40000000,
INITIRQ(lubbock_init_irq) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
.map_io = lubbock_map_io,
.init_irq = lubbock_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
INIT_MACHINE(lubbock_init) .init_machine = lubbock_init,
MACHINE_END MACHINE_END
arch/arm/mach-pxa/mainstone.c
View file @ 19f7241a
...@@ -345,10 +345,12 @@ static void __init mainstone_map_io(void) ...@@ -345,10 +345,12 @@ static void __init mainstone_map_io(void)
} }
MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)") MACHINE_START(MAINSTONE, "Intel HCDDBBVA0 Development Platform (aka Mainstone)")
MAINTAINER("MontaVista Software Inc.") /* Maintainer: MontaVista Software Inc. */
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
MAPIO(mainstone_map_io) .phys_io = 0x40000000,
INITIRQ(mainstone_init_irq) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
.map_io = mainstone_map_io,
.init_irq = mainstone_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
INIT_MACHINE(mainstone_init) .init_machine = mainstone_init,
MACHINE_END MACHINE_END
arch/arm/mach-pxa/poodle.c
View file @ 19f7241a
...@@ -180,10 +180,12 @@ static void __init poodle_map_io(void) ...@@ -180,10 +180,12 @@ static void __init poodle_map_io(void)
} }
MACHINE_START(POODLE, "SHARP Poodle") MACHINE_START(POODLE, "SHARP Poodle")
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000)) .phys_ram = 0xa0000000,
FIXUP(fixup_poodle) .phys_io = 0x40000000,
MAPIO(poodle_map_io) .io_pg_offst = ((io_p2v(0x40000000) >> 18) & 0xfffc,)
INITIRQ(pxa_init_irq) .fixup = fixup_poodle,
.map_io = poodle_map_io,
.init_irq = pxa_init_irq,
.timer = &pxa_timer, .timer = &pxa_timer,
.init_machine = poodle_init, .init_machine = poodle_init,
MACHINE_END MACHINE_END
arch/arm/mach-rpc/riscpc.c
View file @ 19f7241a
...@@ -163,12 +163,14 @@ arch_initcall(rpc_init); ...@@ -163,12 +163,14 @@ arch_initcall(rpc_init);
extern struct sys_timer ioc_timer; extern struct sys_timer ioc_timer;
MACHINE_START(RISCPC, "Acorn-RiscPC") MACHINE_START(RISCPC, "Acorn-RiscPC")
MAINTAINER("Russell King") /* Maintainer: Russell King */
BOOT_MEM(0x10000000, 0x03000000, 0xe0000000) .phys_ram = 0x10000000,
BOOT_PARAMS(0x10000100) .phys_io = 0x03000000,
DISABLE_PARPORT(0) .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
DISABLE_PARPORT(1) .boot_params = 0x10000100,
MAPIO(rpc_map_io) .reserve_lp0 = 1,
INITIRQ(rpc_init_irq) .reserve_lp1 = 1,
.map_io = rpc_map_io,
.init_irq = rpc_init_irq,
.timer = &ioc_timer, .timer = &ioc_timer,
MACHINE_END MACHINE_END
arch/arm/mach-s3c2410/mach-bast.c
View file @ 19f7241a
...@@ -407,10 +407,11 @@ void __init bast_map_io(void) ...@@ -407,10 +407,11 @@ void __init bast_map_io(void)
MACHINE_START(BAST, "Simtec-BAST") MACHINE_START(BAST, "Simtec-BAST")
MAINTAINER("Ben Dooks <ben@simtec.co.uk>") /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = bast_map_io, .map_io = bast_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
......
arch/arm/mach-s3c2410/mach-h1940.c
View file @ 19f7241a
...@@ -117,10 +117,12 @@ void __init h1940_init_irq(void) ...@@ -117,10 +117,12 @@ void __init h1940_init_irq(void)
} }
MACHINE_START(H1940, "IPAQ-H1940") MACHINE_START(H1940, "IPAQ-H1940")
MAINTAINER("Ben Dooks <ben@fluff.org>") /* Maintainer: Ben Dooks <ben@fluff.org> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
MAPIO(h1940_map_io) .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
INITIRQ(h1940_init_irq) .boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = h1940_map_io,
.init_irq = h1940_init_irq,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
MACHINE_END MACHINE_END
arch/arm/mach-s3c2410/mach-n30.c
View file @ 19f7241a
...@@ -137,10 +137,11 @@ void __init n30_init(void) ...@@ -137,10 +137,11 @@ void __init n30_init(void)
} }
MACHINE_START(N30, "Acer-N30") MACHINE_START(N30, "Acer-N30")
MAINTAINER("Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org>") /* Maintainer: Christer Weinigel <christer@weinigel.se>, Ben Dooks <ben-linux@fluff.org> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
.init_machine = n30_init, .init_machine = n30_init,
.init_irq = n30_init_irq, .init_irq = n30_init_irq,
......
arch/arm/mach-s3c2410/mach-nexcoder.c
View file @ 19f7241a
...@@ -147,9 +147,11 @@ void __init nexcoder_map_io(void) ...@@ -147,9 +147,11 @@ void __init nexcoder_map_io(void)
MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440") MACHINE_START(NEXCODER_2440, "NexVision - Nexcoder 2440")
MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>") /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = nexcoder_map_io, .map_io = nexcoder_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
......
arch/arm/mach-s3c2410/mach-otom.c
View file @ 19f7241a
...@@ -115,9 +115,11 @@ void __init otom11_map_io(void) ...@@ -115,9 +115,11 @@ void __init otom11_map_io(void)
MACHINE_START(OTOM, "Nex Vision - Otom 1.1") MACHINE_START(OTOM, "Nex Vision - Otom 1.1")
MAINTAINER("Guillaume GOURAT <guillaume.gourat@nexvision.tv>") /* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = otom11_map_io, .map_io = otom11_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
......
arch/arm/mach-s3c2410/mach-rx3715.c
View file @ 19f7241a
...@@ -131,11 +131,13 @@ static void __init rx3715_init_machine(void) ...@@ -131,11 +131,13 @@ static void __init rx3715_init_machine(void)
#endif #endif
MACHINE_START(RX3715, "IPAQ-RX3715") MACHINE_START(RX3715, "IPAQ-RX3715")
MAINTAINER("Ben Dooks <ben@fluff.org>") /* Maintainer: Ben Dooks <ben@fluff.org> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
MAPIO(rx3715_map_io) .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
INITIRQ(rx3715_init_irq) .boot_params = S3C2410_SDRAM_PA + 0x100,
INIT_MACHINE(rx3715_init_machine) .map_io = rx3715_map_io,
.init_irq = rx3715_init_irq,
.init_machine = rx3715_init_machine,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
MACHINE_END MACHINE_END
arch/arm/mach-s3c2410/mach-smdk2410.c
View file @ 19f7241a
...@@ -112,11 +112,13 @@ void __init smdk2410_init_irq(void) ...@@ -112,11 +112,13 @@ void __init smdk2410_init_irq(void)
MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch MACHINE_START(SMDK2410, "SMDK2410") /* @TODO: request a new identifier and switch
* to SMDK2410 */ * to SMDK2410 */
MAINTAINER("Jonas Dietsche") /* Maintainer: Jonas Dietsche */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
MAPIO(smdk2410_map_io) .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
INITIRQ(smdk2410_init_irq) .boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = smdk2410_map_io,
.init_irq = smdk2410_init_irq,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
MACHINE_END MACHINE_END
......
arch/arm/mach-s3c2410/mach-smdk2440.c
View file @ 19f7241a
...@@ -124,9 +124,11 @@ void __init smdk2440_machine_init(void) ...@@ -124,9 +124,11 @@ void __init smdk2440_machine_init(void)
} }
MACHINE_START(S3C2440, "SMDK2440") MACHINE_START(S3C2440, "SMDK2440")
MAINTAINER("Ben Dooks <ben@fluff.org>") /* Maintainer: Ben Dooks <ben@fluff.org> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.map_io = smdk2440_map_io, .map_io = smdk2440_map_io,
......
arch/arm/mach-s3c2410/mach-vr1000.c
View file @ 19f7241a
...@@ -373,9 +373,11 @@ void __init vr1000_map_io(void) ...@@ -373,9 +373,11 @@ void __init vr1000_map_io(void)
MACHINE_START(VR1000, "Thorcom-VR1000") MACHINE_START(VR1000, "Thorcom-VR1000")
MAINTAINER("Ben Dooks <ben@simtec.co.uk>") /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
BOOT_MEM(S3C2410_SDRAM_PA, S3C2410_PA_UART, (u32)S3C24XX_VA_UART) .phys_ram = S3C2410_SDRAM_PA,
BOOT_PARAMS(S3C2410_SDRAM_PA + 0x100) .phys_io = S3C2410_PA_UART,
.io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
.boot_params = S3C2410_SDRAM_PA + 0x100,
.map_io = vr1000_map_io, .map_io = vr1000_map_io,
.init_irq = s3c24xx_init_irq, .init_irq = s3c24xx_init_irq,
.timer = &s3c24xx_timer, .timer = &s3c24xx_timer,
......
arch/arm/mach-sa1100/assabet.c
View file @ 19f7241a
...@@ -431,11 +431,13 @@ static void __init assabet_map_io(void) ...@@ -431,11 +431,13 @@ static void __init assabet_map_io(void)
MACHINE_START(ASSABET, "Intel-Assabet") MACHINE_START(ASSABET, "Intel-Assabet")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
FIXUP(fixup_assabet) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
MAPIO(assabet_map_io) .boot_params = 0xc0000100,
INITIRQ(sa1100_init_irq) .fixup = fixup_assabet,
.map_io = assabet_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = assabet_init, .init_machine = assabet_init,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/badge4.c
View file @ 19f7241a
...@@ -285,9 +285,11 @@ static void __init badge4_map_io(void) ...@@ -285,9 +285,11 @@ static void __init badge4_map_io(void)
} }
MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(badge4_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = badge4_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/cerf.c
View file @ 19f7241a
...@@ -123,10 +123,12 @@ static void __init cerf_init(void) ...@@ -123,10 +123,12 @@ static void __init cerf_init(void)
} }
MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube") MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")
MAINTAINER("support@intrinsyc.com") /* Maintainer: support@intrinsyc.com */
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
MAPIO(cerf_map_io) .phys_io = 0x80000000,
INITIRQ(cerf_init_irq) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.map_io = cerf_map_io,
.init_irq = cerf_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = cerf_init, .init_machine = cerf_init,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/collie.c
View file @ 19f7241a
...@@ -184,9 +184,11 @@ static void __init collie_map_io(void) ...@@ -184,9 +184,11 @@ static void __init collie_map_io(void)
} }
MACHINE_START(COLLIE, "Sharp-Collie") MACHINE_START(COLLIE, "Sharp-Collie")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
MAPIO(collie_map_io) .phys_io = 0x80000000,
INITIRQ(sa1100_init_irq) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.map_io = collie_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = collie_init, .init_machine = collie_init,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/h3600.c
View file @ 19f7241a
...@@ -380,10 +380,12 @@ static void __init h3100_map_io(void) ...@@ -380,10 +380,12 @@ static void __init h3100_map_io(void)
} }
MACHINE_START(H3100, "Compaq iPAQ H3100") MACHINE_START(H3100, "Compaq iPAQ H3100")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(h3100_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = h3100_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = h3xxx_mach_init, .init_machine = h3xxx_mach_init,
MACHINE_END MACHINE_END
...@@ -496,10 +498,12 @@ static void __init h3600_map_io(void) ...@@ -496,10 +498,12 @@ static void __init h3600_map_io(void)
} }
MACHINE_START(H3600, "Compaq iPAQ H3600") MACHINE_START(H3600, "Compaq iPAQ H3600")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(h3600_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = h3600_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = h3xxx_mach_init, .init_machine = h3xxx_mach_init,
MACHINE_END MACHINE_END
...@@ -881,10 +885,12 @@ static void __init h3800_map_io(void) ...@@ -881,10 +885,12 @@ static void __init h3800_map_io(void)
} }
MACHINE_START(H3800, "Compaq iPAQ H3800") MACHINE_START(H3800, "Compaq iPAQ H3800")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(h3800_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(h3800_init_irq) .boot_params = 0xc0000100,
.map_io = h3800_map_io,
.init_irq = h3800_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = h3xxx_mach_init, .init_machine = h3xxx_mach_init,
MACHINE_END MACHINE_END
......
arch/arm/mach-sa1100/hackkit.c
View file @ 19f7241a
...@@ -191,10 +191,12 @@ static void __init hackkit_init(void) ...@@ -191,10 +191,12 @@ static void __init hackkit_init(void)
*/ */
MACHINE_START(HACKKIT, "HackKit Cpu Board") MACHINE_START(HACKKIT, "HackKit Cpu Board")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(hackkit_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = hackkit_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = hackkit_init, .init_machine = hackkit_init,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/jornada720.c
View file @ 19f7241a
...@@ -97,9 +97,11 @@ static void __init jornada720_map_io(void) ...@@ -97,9 +97,11 @@ static void __init jornada720_map_io(void)
} }
MACHINE_START(JORNADA720, "HP Jornada 720") MACHINE_START(JORNADA720, "HP Jornada 720")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(jornada720_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = jornada720_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/lart.c
View file @ 19f7241a
...@@ -41,9 +41,11 @@ static void __init lart_map_io(void) ...@@ -41,9 +41,11 @@ static void __init lart_map_io(void)
} }
MACHINE_START(LART, "LART") MACHINE_START(LART, "LART")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(lart_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = lart_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/pleb.c
View file @ 19f7241a
...@@ -146,9 +146,11 @@ static void __init pleb_map_io(void) ...@@ -146,9 +146,11 @@ static void __init pleb_map_io(void)
} }
MACHINE_START(PLEB, "PLEB") MACHINE_START(PLEB, "PLEB")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
MAPIO(pleb_map_io) .phys_io = 0x80000000,
INITIRQ(sa1100_init_irq) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
.map_io = pleb_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = pleb_init, .init_machine = pleb_init,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/shannon.c
View file @ 19f7241a
...@@ -76,10 +76,12 @@ static void __init shannon_map_io(void) ...@@ -76,10 +76,12 @@ static void __init shannon_map_io(void)
} }
MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)") MACHINE_START(SHANNON, "Shannon (AKA: Tuxscreen)")
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(shannon_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = shannon_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
.init_machine = shannon_init, .init_machine = shannon_init,
MACHINE_END MACHINE_END
arch/arm/mach-sa1100/simpad.c
View file @ 19f7241a
...@@ -215,10 +215,12 @@ arch_initcall(simpad_init); ...@@ -215,10 +215,12 @@ arch_initcall(simpad_init);
MACHINE_START(SIMPAD, "Simpad") MACHINE_START(SIMPAD, "Simpad")
MAINTAINER("Holger Freyther") /* Maintainer: Holger Freyther */
BOOT_MEM(0xc0000000, 0x80000000, 0xf8000000) .phys_ram = 0xc0000000,
BOOT_PARAMS(0xc0000100) .phys_io = 0x80000000,
MAPIO(simpad_map_io) .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
INITIRQ(sa1100_init_irq) .boot_params = 0xc0000100,
.map_io = simpad_map_io,
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer, .timer = &sa1100_timer,
MACHINE_END MACHINE_END
arch/arm/mach-shark/core.c
View file @ 19f7241a
...@@ -105,10 +105,12 @@ static struct sys_timer shark_timer = { ...@@ -105,10 +105,12 @@ static struct sys_timer shark_timer = {
}; };
MACHINE_START(SHARK, "Shark") MACHINE_START(SHARK, "Shark")
MAINTAINER("Alexander Schulz") /* Maintainer: Alexander Schulz */
BOOT_MEM(0x08000000, 0x40000000, 0xe0000000) .phys_ram = 0x08000000,
BOOT_PARAMS(0x08003000) .phys_io = 0x40000000,
MAPIO(shark_map_io) .io_pg_offst = ((0xe0000000) >> 18) & 0xfffc,
INITIRQ(shark_init_irq) .boot_params = 0x08003000,
.map_io = shark_map_io,
.init_irq = shark_init_irq,
.timer = &shark_timer, .timer = &shark_timer,
MACHINE_END MACHINE_END
arch/arm/mach-versatile/versatile_ab.c
View file @ 19f7241a
...@@ -35,11 +35,13 @@ ...@@ -35,11 +35,13 @@
#include "core.h" #include "core.h"
MACHINE_START(VERSATILE_AB, "ARM-Versatile AB") MACHINE_START(VERSATILE_AB, "ARM-Versatile AB")
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = 0x101f1000,
MAPIO(versatile_map_io) .io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc,
INITIRQ(versatile_init_irq) .boot_params = 0x00000100,
.map_io = versatile_map_io,
.init_irq = versatile_init_irq,
.timer = &versatile_timer, .timer = &versatile_timer,
INIT_MACHINE(versatile_init) .init_machine = versatile_init,
MACHINE_END MACHINE_END
arch/arm/mach-versatile/versatile_pb.c
View file @ 19f7241a
...@@ -99,11 +99,13 @@ static int __init versatile_pb_init(void) ...@@ -99,11 +99,13 @@ static int __init versatile_pb_init(void)
arch_initcall(versatile_pb_init); arch_initcall(versatile_pb_init);
MACHINE_START(VERSATILE_PB, "ARM-Versatile PB") MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
MAINTAINER("ARM Ltd/Deep Blue Solutions Ltd") /* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
BOOT_MEM(0x00000000, 0x101f1000, 0xf11f1000) .phys_ram = 0x00000000,
BOOT_PARAMS(0x00000100) .phys_io = 0x101f1000,
MAPIO(versatile_map_io) .io_pg_offst = ((0xf11f1000) >> 18) & 0xfffc,
INITIRQ(versatile_init_irq) .boot_params = 0x00000100,
.map_io = versatile_map_io,
.init_irq = versatile_init_irq,
.timer = &versatile_timer, .timer = &versatile_timer,
INIT_MACHINE(versatile_init) .init_machine = versatile_init,
MACHINE_END MACHINE_END
arch/arm/mm/blockops.c
View file @ 19f7241a
...@@ -25,13 +25,14 @@ blk_flush_kern_dcache_page(void *kaddr) ...@@ -25,13 +25,14 @@ blk_flush_kern_dcache_page(void *kaddr)
{ {
asm( asm(
"add r1, r0, %0 \n\ "add r1, r0, %0 \n\
sub r1, r1, %1 \n\
1: .word 0xec401f0e @ mcrr p15, 0, r0, r1, c14, 0 @ blocking \n\ 1: .word 0xec401f0e @ mcrr p15, 0, r0, r1, c14, 0 @ blocking \n\
mov r0, #0 \n\ mov r0, #0 \n\
mcr p15, 0, r0, c7, c5, 0 \n\ mcr p15, 0, r0, c7, c5, 0 \n\
mcr p15, 0, r0, c7, c10, 4 \n\ mcr p15, 0, r0, c7, c10, 4 \n\
mov pc, lr" mov pc, lr"
: :
: "I" (PAGE_SIZE)); : "I" (PAGE_SIZE), "I" (L1_CACHE_BYTES));
} }
/* /*
......
drivers/serial/s3c2410.c
View file @ 19f7241a
...@@ -522,14 +522,11 @@ static void s3c24xx_serial_shutdown(struct uart_port *port) ...@@ -522,14 +522,11 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
static int s3c24xx_serial_startup(struct uart_port *port) static int s3c24xx_serial_startup(struct uart_port *port)
{ {
struct s3c24xx_uart_port *ourport = to_ourport(port); struct s3c24xx_uart_port *ourport = to_ourport(port);
unsigned long flags;
int ret; int ret;
dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n", dbg("s3c24xx_serial_startup: port=%p (%08lx,%p)\n",
port->mapbase, port->membase); port->mapbase, port->membase);
local_irq_save(flags);
rx_enabled(port) = 1; rx_enabled(port) = 1;
ret = request_irq(RX_IRQ(port), ret = request_irq(RX_IRQ(port),
...@@ -563,12 +560,10 @@ static int s3c24xx_serial_startup(struct uart_port *port) ...@@ -563,12 +560,10 @@ static int s3c24xx_serial_startup(struct uart_port *port)
/* the port reset code should have done the correct /* the port reset code should have done the correct
* register setup for the port controls */ * register setup for the port controls */
local_irq_restore(flags);
return ret; return ret;
err: err:
s3c24xx_serial_shutdown(port); s3c24xx_serial_shutdown(port);
local_irq_restore(flags);
return ret; return ret;
} }
......
include/asm-arm/mach/arch.h
View file @ 19f7241a
...@@ -54,38 +54,6 @@ const struct machine_desc __mach_desc_##_type \ ...@@ -54,38 +54,6 @@ const struct machine_desc __mach_desc_##_type \
.nr = MACH_TYPE_##_type, \ .nr = MACH_TYPE_##_type, \
.name = _name, .name = _name,
#define MAINTAINER(n)
#define BOOT_MEM(_pram,_pio,_vio) \
.phys_ram = _pram, \
.phys_io = _pio, \
.io_pg_offst = ((_vio)>>18)&0xfffc,
#define BOOT_PARAMS(_params) \
.param_offset = _params,
#define VIDEO(_start,_end) \
.video_start = _start, \
.video_end = _end,
#define DISABLE_PARPORT(_n) \
.reserve_lp##_n = 1,
#define SOFT_REBOOT \
.soft_reboot = 1,
#define FIXUP(_func) \
.fixup = _func,
#define MAPIO(_func) \
.map_io = _func,
#define INITIRQ(_func) \
.init_irq = _func,
#define INIT_MACHINE(_func) \
.init_machine = _func,
#define MACHINE_END \ #define MACHINE_END \
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7