Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

parents 08ab8c20 0d670b41

arch/arm/mach-aaec2000/aaed2000.c

+6 −4
Original line number Diff line number Diff line
@@ -40,9 +40,11 @@ static void __init aaed2000_map_io(void) 
}



MACHINE_START(AAED2000, "Agilent AAED-2000 Development Platform")

	MAINTAINER("Nicolas Bellido Y Ortega")

	BOOT_MEM(0xf0000000, PIO_BASE, VIO_BASE)

	MAPIO(aaed2000_map_io)

	INITIRQ(aaed2000_init_irq)

	/* Maintainer: Nicolas Bellido Y Ortega */

	.phys_ram	= 0xf0000000,

	.phys_io	= PIO_BASE,

	.io_pg_offst	= ((VIO_BASE) >> 18) & 0xfffc,

	.map_io		= aaed2000_map_io,

	.init_irq	= aaed2000_init_irq,

	.timer		= &aaec2000_timer,

MACHINE_END

arch/arm/mach-clps711x/autcpu12.c

+7 −5
Original line number Diff line number Diff line
@@ -59,11 +59,13 @@ void __init autcpu12_map_io(void) 
}



MACHINE_START(AUTCPU12, "autronix autcpu12")

	MAINTAINER("Thomas Gleixner")

        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)

	BOOT_PARAMS(0xc0020000)

	MAPIO(autcpu12_map_io)

	INITIRQ(clps711x_init_irq)

	/* Maintainer: Thomas Gleixner */

	.phys_ram	= 0xc0000000,

	.phys_io	= 0x80000000,

	.io_pg_offst	= ((0xff000000) >> 18) & 0xfffc,

	.boot_params	= 0xc0020000,

	.map_io		= autcpu12_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

MACHINE_END

arch/arm/mach-clps711x/cdb89712.c

+7 −5
Original line number Diff line number Diff line
@@ -49,10 +49,12 @@ static void __init cdb89712_map_io(void) 
}



MACHINE_START(CDB89712, "Cirrus-CDB89712")

	MAINTAINER("Ray Lehtiniemi")

	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)

	BOOT_PARAMS(0xc0000100)

	MAPIO(cdb89712_map_io)

	INITIRQ(clps711x_init_irq)

	/* Maintainer: Ray Lehtiniemi */

	.phys_ram	= 0xc0000000,

	.phys_io	= 0x80000000,

	.io_pg_offst	= ((0xff000000) >> 18) & 0xfffc,

	.boot_params	= 0xc0000100,

	.map_io		= cdb89712_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

MACHINE_END

arch/arm/mach-clps711x/ceiva.c

+7 −5
Original line number Diff line number Diff line
@@ -53,10 +53,12 @@ static void __init ceiva_map_io(void) 




MACHINE_START(CEIVA, "CEIVA/Polaroid Photo MAX Digital Picture Frame")

	MAINTAINER("Rob Scott")

	BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)

	BOOT_PARAMS(0xc0000100)

	MAPIO(ceiva_map_io)

	INITIRQ(clps711x_init_irq)

	/* Maintainer: Rob Scott */

	.phys_ram	= 0xc0000000,

	.phys_io	= 0x80000000,

	.io_pg_offst	= ((0xff000000) >> 18) & 0xfffc,

	.boot_params	= 0xc0000100,

	.map_io		= ceiva_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

MACHINE_END

arch/arm/mach-clps711x/clep7312.c

+8 −6
Original line number Diff line number Diff line
@@ -37,12 +37,14 @@ fixup_clep7312(struct machine_desc *desc, struct tag *tags, 




MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")

	MAINTAINER("Nobody")

        BOOT_MEM(0xc0000000, 0x80000000, 0xff000000)

	BOOT_PARAMS(0xc0000100)

	FIXUP(fixup_clep7312)

	MAPIO(clps711x_map_io)

	INITIRQ(clps711x_init_irq)

	/* Maintainer: Nobody */

	.phys_ram	= 0xc0000000,

	.phys_io	= 0x80000000,

	.io_pg_offst	= ((0xff000000) >> 18) & 0xfffc,

	.boot_params	= 0xc0000100,

	.fixup		= fixup_clep7312,

	.map_io		= clps711x_map_io,

	.init_irq	= clps711x_init_irq,

	.timer		= &clps711x_timer,

MACHINE_END