]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: Synced board init with mainline
authorTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 09:23:46 +0000 (02:23 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 28 Jul 2005 09:23:46 +0000 (02:23 -0700)
Synced board init with mainline

arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-netstar.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-voiceblue.c

index 4601fdfbd59731aca55bdf07a9a0b8c85b3e6722..b78733adaaec063b8bb2b55f93e10f4f865067e8 100644 (file)
@@ -101,11 +101,13 @@ static void __init omap_generic_map_io(void)
 }
 
 MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
-       MAINTAINER("Tony Lindgren <tony@atomide.com>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(omap_generic_map_io)
-       INITIRQ(omap_generic_init_irq)
-       INIT_MACHINE(omap_generic_init)
+       /* Maintainer: Tony Lindgren <tony@atomide.com> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = omap_generic_map_io,
+       .init_irq       = omap_generic_init_irq,
+       .init_machine   = omap_generic_init,
        .timer          = &omap_timer,
 MACHINE_END
index b8d0ad37e4317692eeaee54f89d4b7f2320d9333..d46a70063b0c61821088ae2c8f483c6a9356454f 100644 (file)
@@ -189,11 +189,13 @@ static void __init h2_map_io(void)
 }
 
 MACHINE_START(OMAP_H2, "TI-H2")
-       MAINTAINER("Imre Deak <imre.deak@nokia.com>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(h2_map_io)
-       INITIRQ(h2_init_irq)
-       INIT_MACHINE(h2_init)
+       /* Maintainer: Imre Deak <imre.deak@nokia.com> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = h2_map_io,
+       .init_irq       = h2_init_irq,
+       .init_machine   = h2_init,
        .timer          = &omap_timer,
 MACHINE_END
index 06b9700d4c1120817e6a122245d24c2826b0d497..2798613696fa7e0781609bb61132858d25089e27 100644 (file)
@@ -205,11 +205,13 @@ static void __init h3_map_io(void)
 }
 
 MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
-       MAINTAINER("Texas Instruments, Inc.")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(h3_map_io)
-       INITIRQ(h3_init_irq)
-       INIT_MACHINE(h3_init)
+       /* Maintainer: Texas Instruments, Inc. */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = h3_map_io,
+       .init_irq       = h3_init_irq,
+       .init_machine   = h3_init,
        .timer          = &omap_timer,
 MACHINE_END
index 319eb229ec19e8d6cc124c93a85edbc3981f9bbf..df0312b596e484a6e79cf5356c767020e8d55c54 100644 (file)
@@ -280,11 +280,13 @@ static void __init innovator_map_io(void)
 }
 
 MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
-       MAINTAINER("MontaVista Software, Inc.")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(innovator_map_io)
-       INITIRQ(innovator_init_irq)
-       INIT_MACHINE(innovator_init)
+       /* Maintainer: MontaVista Software, Inc. */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = innovator_map_io,
+       .init_irq       = innovator_init_irq,
+       .init_machine   = innovator_init,
        .timer          = &omap_timer,
 MACHINE_END
index ab9410f976fd5cb4bb8c0e55bb3c4a9ae425bec0..d904e643f5ec2c30fabf5d8438f5e40cdec82ad1 100644 (file)
@@ -139,11 +139,13 @@ static int __init netstar_late_init(void)
 postcore_initcall(netstar_late_init);
 
 MACHINE_START(NETSTAR, "NetStar OMAP5910")
-       MAINTAINER("Ladislav Michl <michl@2n.cz>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(netstar_map_io)
-       INITIRQ(netstar_init_irq)
-       INIT_MACHINE(netstar_init)
-       .timer = &omap_timer,
+       /* Maintainer: Ladislav Michl <michl@2n.cz> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = netstar_map_io,
+       .init_irq       = netstar_init_irq,
+       .init_machine   = netstar_init,
+       .timer          = &omap_timer,
 MACHINE_END
index 8cca3fc3f1801eaac1f470993e1b8acd489efa30..5151dcd03392e173e8cf3bc8eb573c74c862aa9e 100644 (file)
@@ -258,11 +258,13 @@ static void __init osk_map_io(void)
 }
 
 MACHINE_START(OMAP_OSK, "TI-OSK")
-       MAINTAINER("Dirk Behme <dirk.behme@de.bosch.com>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(osk_map_io)
-       INITIRQ(osk_init_irq)
-       INIT_MACHINE(osk_init)
+       /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = osk_map_io,
+       .init_irq       = osk_init_irq,
+       .init_machine   = osk_init,
        .timer          = &omap_timer,
 MACHINE_END
index a77bdb6fabc9c1157c35d51aca29d05de331b33b..1eff0e1c3678f87c336b09528b20eb5089ed5564 100644 (file)
@@ -178,11 +178,13 @@ static void __init omap_perseus2_map_io(void)
 }
 
 MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
-       MAINTAINER("Kevin Hilman <kjh@hilman.org>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(omap_perseus2_map_io)
-       INITIRQ(omap_perseus2_init_irq)
-       INIT_MACHINE(omap_perseus2_init)
+       /* Maintainer: Kevin Hilman <kjh@hilman.org> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = omap_perseus2_map_io,
+       .init_irq       = omap_perseus2_init_irq,
+       .init_machine   = omap_perseus2_init,
        .timer          = &omap_timer,
 MACHINE_END
index 682a378dd2405902d4432721b360fdb583e16e76..a6f83fc9fb9c595772ae311e2f8761fc218b539c 100644 (file)
@@ -289,11 +289,13 @@ EXPORT_SYMBOL(voiceblue_wdt_disable);
 EXPORT_SYMBOL(voiceblue_wdt_ping);
 
 MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
-       MAINTAINER("Ladislav Michl <michl@2n.cz>")
-       BOOT_MEM(0x10000000, 0xfff00000, 0xfef00000)
-       BOOT_PARAMS(0x10000100)
-       MAPIO(voiceblue_map_io)
-       INITIRQ(voiceblue_init_irq)
-       INIT_MACHINE(voiceblue_init)
-       .timer = &omap_timer,
+       /* Maintainer: Ladislav Michl <michl@2n.cz> */
+       .phys_ram       = 0x10000000,
+       .phys_io        = 0xfff00000,
+       .io_pg_offst    = ((0xfef00000) >> 18) & 0xfffc,
+       .boot_params    = 0x10000100,
+       .map_io         = voiceblue_map_io,
+       .init_irq       = voiceblue_init_irq,
+       .init_machine   = voiceblue_init,
+       .timer          = &omap_timer,
 MACHINE_END