Merge branch 'depends/rmk/memory_h' into next/cleanup2
authorArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 03:58:59 +0000 (04:58 +0100)
committerArnd Bergmann <arnd@arndb.de>
Tue, 1 Nov 2011 03:58:59 +0000 (04:58 +0100)
There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.

Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-omap1/board-ams-delta.c
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-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
84 files changed:
1  2 
arch/arm/Kconfig
arch/arm/kernel/setup.c
arch/arm/mach-davinci/board-da850-evm.c
arch/arm/mach-davinci/sleep.S
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-imx/mach-cpuimx35.c
arch/arm/mach-imx/mach-eukrea_cpuimx25.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-fsample.c
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-htcherald.c
arch/arm/mach-omap1/board-innovator.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-perseus2.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3630sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517crane.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-cm-t3517.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-n8x0.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3logic.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap3touchbook.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rm680.c
arch/arm/mach-omap2/board-rx51.c
arch/arm/mach-omap2/board-ti8168evm.c
arch/arm/mach-omap2/board-zoom.c
arch/arm/mach-omap2/io.c
arch/arm/mach-orion5x/dns323-setup.c
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c2410/mach-qt2410.c
arch/arm/mach-s3c2440/mach-rx1950.c
arch/arm/mach-s3c64xx/cpu.c
arch/arm/mach-s3c64xx/mach-anw6410.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-hmt.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-ncp.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s3c64xx/mach-smartq5.c
arch/arm/mach-s3c64xx/mach-smartq7.c
arch/arm/mach-s3c64xx/mach-smdk6400.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p64x0/cpu.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/init.c
arch/arm/plat-omap/include/plat/io.h
arch/arm/plat-omap/io.c

Simple merge
Simple merge
Simple merge
Simple merge
index f851fe903687dc09c45c51228dcb06d3606679a0,881add0fbe5bb33adc96f8fee03c516346020086..b1ec2cf53bb0df1696e09c32f125ede230fc7021
@@@ -310,8 -310,8 +310,8 @@@ static struct sys_timer eukrea_cpuimx27
        .init = eukrea_cpuimx27_timer_init,
  };
  
 -MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
 +MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
-       .boot_params = MX27_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx27_map_io,
        .init_early = imx27_init_early,
        .init_irq = mx27_init_irq,
index 4bd083ba9af218077aae1381b5fbef716aa625e6,10b89139da4853961a745ede3f0f48f47d5ea034..470b654b0e6eef12cba24b29d34faf112e3fa5c9
@@@ -192,9 -192,9 +192,9 @@@ struct sys_timer eukrea_cpuimx35_timer 
        .init   = eukrea_cpuimx35_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
 +MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
        /* Maintainer: Eukrea Electromatique */
-       .boot_params = MX3x_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx35_map_io,
        .init_early = imx35_init_early,
        .init_irq = mx35_init_irq,
index 2442d5da883d075259d8add3e927c9ad270b9314,d8699b54268d9f5aaf520e570a0ac01837feb212..9163318e95a2bb24862c2bab29f2434dfc03a3d7
@@@ -161,9 -161,9 +161,9 @@@ static struct sys_timer eukrea_cpuimx25
        .init   = eukrea_cpuimx25_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
 +MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
        /* Maintainer: Eukrea Electromatique */
-       .boot_params = MX25_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
        .map_io = mx25_map_io,
        .init_early = imx25_init_early,
        .init_irq = mx25_init_irq,
index 44277370806e0bac1cf7a1ee3cf40a15a031771d,eb36b25450a0b6ec147db925c7d861f81542bf63..8987b3fe2eb72223f94b3acec71fdfede4f1f925
@@@ -373,13 -379,17 +373,13 @@@ static int __init ams_delta_modem_init(
  }
  arch_initcall(ams_delta_modem_init);
  
 -static void __init ams_delta_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
        /* Maintainer: Jonathan McDowell <noodles@earth.li> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = ams_delta_map_io,
 +      .map_io         = omap15xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = ams_delta_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = ams_delta_init,
        .timer          = &omap1_timer,
  MACHINE_END
index b09dfe6d6e8d8d8c191ac85436c40acdf04f2ada,999789c4811daea150041d6becdff308940846b9..c92fd164b05dc8f9a09947894b76f4ed5ae7255d
@@@ -384,11 -389,10 +384,11 @@@ static void __init omap_fsample_map_io(
  
  MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
  /* Maintainer: Brian Swetland <swetland@google.com> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = omap_fsample_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_fsample_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_fsample_init,
        .timer          = &omap1_timer,
  MACHINE_END
index cc0cca7ee1996d6d5da94cc94a77a9e59ff012d3,23cc9e4ad50d539d17f2d35a898643373783ac18..5a9a54de41fab6f0d005272d30b744a6625efa3d
@@@ -81,13 -87,17 +81,13 @@@ static void __init omap_generic_init(vo
        omap_register_i2c_bus(1, 100, NULL, 0);
  }
  
 -static void __init omap_generic_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
        /* Maintainer: Tony Lindgren <tony@atomide.com> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = omap_generic_map_io,
 +      .map_io         = omap16xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_generic_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_generic_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 248a5b8e2865dabe17716c4dc493df934f92caf0,6c70c28d055cf966ae0c19d9ec595fc8ff8f894f..c8e1d4f6eeda48b9ed5d18c1fb2cca4a37fe0f8f
@@@ -448,13 -454,17 +448,13 @@@ static void __init h2_init(void
        h2_mmc_init();
  }
  
 -static void __init h2_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_H2, "TI-H2")
        /* Maintainer: Imre Deak <imre.deak@nokia.com> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = h2_map_io,
 +      .map_io         = omap16xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = h2_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = h2_init,
        .timer          = &omap1_timer,
  MACHINE_END
index f28f05fe76766944e839e8758c530d68958244e9,8e2b64a46929bfc49f9a1a585d6c5341fcedca64..c88e1317620b1975aac4d81d94909e7022b4a75d
@@@ -436,13 -436,23 +436,13 @@@ static void __init h3_init(void
        h3_mmc_init();
  }
  
 -static void __init h3_init_irq(void)
 -{
 -      omap1_init_common_hw();
 -      omap1_init_irq();
 -}
 -
 -static void __init h3_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
        /* Maintainer: Texas Instruments, Inc. */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = h3_map_io,
 +      .map_io         = omap16xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = h3_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = h3_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 67798dfc4f8da6dbd2d9b8a077faa731a8e19f04,e81ead1c89eadc7de583720b3541a33852c5eb96..e8eedd77fa67f3476bc323a90f4349b73bb8cfa5
@@@ -604,11 -604,17 +604,11 @@@ static void __init htcherald_init(void
  MACHINE_START(HERALD, "HTC Herald")
        /* Maintainer: Cory Maccarrone <darkstar6262@gmail.com> */
        /* Maintainer: wing-linux.sourceforge.net */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = htcherald_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = htcherald_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = htcherald_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 3e349d0ce32ce281af965685d201ee8c79f131cf,8b034594fbc748e445294e1107eee9630f2cd788..88cf8baf9e78c7155288986f2f64f3f605f750bb
@@@ -454,11 -459,10 +454,11 @@@ static void __init innovator_map_io(voi
  
  MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
        /* Maintainer: MontaVista Software, Inc. */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = innovator_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = innovator_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = innovator_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 9b348b6ee3eeba85456a5030fe06147b6025fcb0,6825635ac681980b678c3b3e38d4ea45242614a6..8990b5d78656111b7456f17861f597b02a537d17
@@@ -252,12 -258,16 +252,12 @@@ static void __init omap_nokia770_init(v
        nokia770_mmc_init();
  }
  
 -static void __init omap_nokia770_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(NOKIA770, "Nokia 770")
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = omap_nokia770_map_io,
 +      .map_io         = omap16xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_nokia770_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_nokia770_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 562986e1874ff39b3ab94ef3834062d14b3fa870,44b8e9362bf4f7f2498ac83f1341c3d738a5c51d..3e12a697fa21c29284c1faf96e492913e20cd516
@@@ -570,13 -576,17 +570,13 @@@ static void __init osk_init(void
        osk_mistral_init();
  }
  
 -static void __init osk_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_OSK, "TI-OSK")
        /* Maintainer: Dirk Behme <dirk.behme@de.bosch.com> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = osk_map_io,
 +      .map_io         = omap16xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = osk_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = osk_init,
        .timer          = &omap1_timer,
  MACHINE_END
index fc9edd8595e9acd05376268efb10ced6168ff65c,3d8cd90b1dbb0fc5c1dd6593874708312eda6f87..4aa2d0efbc460e3472c4ffc1772de92765116838
@@@ -263,12 -269,16 +263,12 @@@ static void __init omap_palmte_init(voi
        omap_register_i2c_bus(1, 100, NULL, 0);
  }
  
 -static void __init omap_palmte_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = omap_palmte_map_io,
 +      .map_io         = omap15xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_palmte_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_palmte_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 5ff3def49a85ea5702f756f29ed64fd9b6b23867,d0eefe81cd1b0fe3f9e1bdbf5d111238f416b8c6..32254bdd00fd144ac8657515fb71aaebc04ced35
@@@ -309,12 -315,16 +309,12 @@@ static void __init omap_palmtt_init(voi
        omap_register_i2c_bus(1, 100, NULL, 0);
  }
  
 -static void __init omap_palmtt_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T")
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = omap_palmtt_map_io,
 +      .map_io         = omap15xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_palmtt_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_palmtt_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 8e0887375f7eb5f830b56e22cbfc2459b9de9d0e,98e79bc0921386b79e00bceb998670d775639611..d41478d7e97bb068f09240b30c4075d5b9c5cae7
@@@ -327,12 -334,17 +327,12 @@@ omap_palmz71_init(void
        palmz71_gpio_setup(0);
  }
  
 -static void __init
 -omap_palmz71_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
 -
  MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = omap_palmz71_map_io,
 +      .map_io         = omap15xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_palmz71_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_palmz71_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 6ed649b8b8d3579e255060b3941186ae36ca6e61,ad3a1567604e0496a83736604405d3a94547ec30..7506f349939a97792e2841a098a00b7a90bef10f
@@@ -346,11 -350,10 +346,11 @@@ static void __init omap_perseus2_map_io
  
  MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
        /* Maintainer: Kevin Hilman <kjh@hilman.org> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
        .map_io         = omap_perseus2_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_perseus2_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_perseus2_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 23326e04d6b90ab9eaeaf7f6ba79c8a19f79fd96,602b55c39d3d0ef566a23ec69e6bbd5b6e176bae..bdf3b85142bfffc005d51788adbf390abaf65c75
@@@ -407,13 -407,24 +407,13 @@@ static void __init omap_sx1_init(void
        gpio_direction_output(11, 0);   /*A_SWITCH = 0 */
        gpio_direction_output(15, 0);   /*A_USB_ON = 0 */
  }
 -/*----------------------------------------*/
 -static void __init omap_sx1_init_irq(void)
 -{
 -      omap1_init_common_hw();
 -      omap1_init_irq();
 -}
 -/*----------------------------------------*/
 -
 -static void __init omap_sx1_map_io(void)
 -{
 -      omap1_map_common_io();
 -}
  
  MACHINE_START(SX1, "OMAP310 based Siemens SX1")
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = omap_sx1_map_io,
 +      .map_io         = omap15xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = omap_sx1_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = omap_sx1_init,
        .timer          = &omap1_timer,
  MACHINE_END
index 1444ce846ab7a4126b97139ad6bcea7aa53aa89e,80165154617a853585ae58abcc84bd941290cf37..42e5151c40a92ee82944b2b69603a99250db3149
@@@ -290,11 -301,10 +290,11 @@@ static void __init voiceblue_init(void
  
  MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
        /* Maintainer: Ladislav Michl <michl@2n.cz> */
-       .boot_params    = 0x10000100,
+       .atag_offset    = 0x100,
 -      .map_io         = voiceblue_map_io,
 +      .map_io         = omap15xx_map_io,
 +      .init_early     = omap1_init_early,
        .reserve        = omap_reserve,
 -      .init_irq       = voiceblue_init_irq,
 +      .init_irq       = omap1_init_irq,
        .init_machine   = voiceblue_init,
        .timer          = &omap1_timer,
  MACHINE_END
index fd9eb0984121892e7f447ecc28bcf54076cd7ece,1cfa1b6bb62b58de6aaaa2f7b1efc949dfc3ef68..7969cfda4454eca89bfdd350145fdc644b39e099
@@@ -132,7 -139,8 +132,8 @@@ void omap1_init_early(void
        /* Must init clocks early to assure that timer interrupt works
         */
        omap1_clk_init();
 -
        omap1_mux_init();
++      omap_init_consistent_dma_size();
  }
  
  /*
index d934169d655373e63a71a7aa21d48d61ea4c5e63,195157da21e6d51bd414a4a848955977e50b4aa4..638cecb9ea1acf8586641352ada1363230e36f63
@@@ -244,12 -248,18 +244,12 @@@ static void __init omap_2430sdp_init(vo
                         "Secondary LCD backlight");
  }
  
 -static void __init omap_2430sdp_map_io(void)
 -{
 -      omap2_set_globals_243x();
 -      omap243x_map_common_io();
 -}
 -
  MACHINE_START(OMAP_2430SDP, "OMAP2430 sdp2430 board")
        /* Maintainer: Syed Khasim - Texas Instruments Inc */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = omap_2430sdp_map_io,
 -      .init_early     = omap_2430sdp_init_early,
 +      .map_io         = omap243x_map_io,
 +      .init_early     = omap2430_init_early,
        .init_irq       = omap2_init_irq,
        .init_machine   = omap_2430sdp_init,
        .timer          = &omap2_timer,
index 9bb48eaa4381651acf5f11381248ca43e4c83692,2430531b2239d6c9b369301833683558b4d53180..5b5999caf71d1ed84090dff3ea51f798d5062416
@@@ -724,10 -729,10 +724,10 @@@ static void __init omap_3430sdp_init(vo
  
  MACHINE_START(OMAP_3430SDP, "OMAP3430 3430SDP board")
        /* Maintainer: Syed Khasim - Texas Instruments Inc */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap_3430sdp_init_early,
 +      .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap_3430sdp_init,
        .timer          = &omap3_timer,
index 94febc85d80520cd86d3a4356d750546691c43bf,8b5b5aa751ed07c7b08a6c1c5a809c624ac073dc..f552305162fc59f87ecd93d2b26bec5da1f75846
@@@ -210,10 -215,10 +210,10 @@@ static void __init omap_sdp_init(void
  }
  
  MACHINE_START(OMAP_3630SDP, "OMAP 3630SDP board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap_sdp_init_early,
 +      .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap_sdp_init,
        .timer          = &omap3_timer,
index a97c29a73edd547dcea13ccb7ab7bf0e2d173a67,be931105d681e27a413df624b92a9d403d572cfe..6d2b61409c1bd3301551b6c9eec4bfe57edb0488
@@@ -825,12 -830,18 +825,12 @@@ static void __init omap_4430sdp_init(vo
        omap_4430sdp_display_init();
  }
  
 -static void __init omap_4430sdp_map_io(void)
 -{
 -      omap2_set_globals_443x();
 -      omap44xx_map_common_io();
 -}
 -
  MACHINE_START(OMAP_4430SDP, "OMAP4430 4430SDP board")
        /* Maintainer: Santosh Shilimkar - Texas Instruments Inc */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = omap_4430sdp_map_io,
 -      .init_early     = omap_4430sdp_init_early,
 +      .map_io         = omap4_map_io,
 +      .init_early     = omap4430_init_early,
        .init_irq       = gic_init_irq,
        .init_machine   = omap_4430sdp_init,
        .timer          = &omap4_timer,
index 9e1b2c248328d564f0952d7565db249a86751297,db110fdb8b2c4b3af81f2a1f4b9835afe5162b42..7834536ab41666ca2b2ff720a068023f3a48f765
@@@ -93,10 -98,10 +93,10 @@@ static void __init am3517_crane_init(vo
  }
  
  MACHINE_START(CRANEBOARD, "AM3517/05 CRANEBOARD")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = am3517_crane_init_early,
 +      .init_early     = am35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = am3517_crane_init,
        .timer          = &omap3_timer,
index 7d842940c252fd474661d5e7b125161e35d393e5,1325085e453d8ab62a31255f9bf2aaf1c32a0b7f..65a5912278ac49c04cc6d46b5fc00bbc19754a23
@@@ -486,10 -490,10 +486,10 @@@ static void __init am3517_evm_init(void
  }
  
  MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = am3517_evm_init_early,
 +      .init_early     = am35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = am3517_evm_init,
        .timer          = &omap3_timer,
index 852843638fa966d1746c0efe0b0c60ed2ebff326,67800e647d7a888799316bb2a68f3340cbe155da..29c409b68b5255eaaed1a07730fff50f135dd6c7
@@@ -339,10 -350,10 +339,10 @@@ static void __init omap_apollon_init(vo
  
  MACHINE_START(OMAP_APOLLON, "OMAP24xx Apollon")
        /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = omap_apollon_map_io,
 -      .init_early     = omap_apollon_init_early,
 +      .map_io         = omap242x_map_io,
 +      .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
        .init_machine   = omap_apollon_init,
        .timer          = &omap2_timer,
index e15d39bffe79e478ad7a4d6e670de29171ab12b3,38179c17550359133b21f72c62af985c2d1b7113..5665e688bd26bb65d8fcaf9422f43c347a1cbb7a
@@@ -629,20 -634,20 +629,20 @@@ static void __init cm_t3730_init(void
  }
  
  MACHINE_START(CM_T35, "Compulab CM-T35")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = cm_t35_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = cm_t35_init,
        .timer          = &omap3_timer,
  MACHINE_END
  
  MACHINE_START(CM_T3730, "Compulab CM-T3730")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = cm_t35_init_early,
 +      .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = cm_t3730_init,
        .timer          = &omap3_timer,
index 867bf671719c6d82bc016b3079e5438381f201a3,aed9c29f9faea7c31b60bc01e588ffa1edb7cfb9..3f4dc6626845db9069a7193823de24025a93864c
@@@ -294,10 -299,10 +294,10 @@@ static void __init cm_t3517_init(void
  }
  
  MACHINE_START(CM_T3517, "Compulab CM-T3517")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = cm_t3517_init_early,
 +      .init_early     = am35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = cm_t3517_init,
        .timer          = &omap3_timer,
index 059b74dd9289f4ae7a187763a08a912d70b820ef,99a42432ac93526a2b054f4fa31381037a149a7b..556df32d88eafdc5168c7fdbdf4a04a5112b1dc8
@@@ -656,11 -667,11 +656,11 @@@ static void __init devkit8000_init(void
  }
  
  MACHINE_START(DEVKIT8000, "OMAP3 Devkit8000")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = devkit8000_init_early,
 -      .init_irq       = devkit8000_init_irq,
 +      .init_early     = omap35xx_init_early,
 +      .init_irq       = omap3_init_irq,
        .init_machine   = devkit8000_init,
        .timer          = &omap3_secure_timer,
  MACHINE_END
index d9ccb9d98e15c2a70579b7b9548209f88877c78c,25642697281b6d21ddf68fee8ef681524980eaaa..0c427976d62f98f4bee49e837c62264ec3279ac8
   * published by the Free Software Foundation.
   */
  
 -#include <linux/kernel.h>
 -#include <linux/init.h>
 -#include <linux/device.h>
 +#include <linux/io.h>
 +#include <linux/of_platform.h>
 +#include <linux/irqdomain.h>
 +#include <linux/i2c/twl.h>
  
  #include <mach/hardware.h>
 -#include <asm/mach-types.h>
  #include <asm/mach/arch.h>
 -#include <asm/mach/map.h>
  
 -#include <mach/gpio.h>
 -#include <plat/usb.h>
  #include <plat/board.h>
  #include <plat/common.h>
 +#include <mach/omap4-common.h>
 +#include "common-board-devices.h"
 +
 +/*
 + * XXX: Still needed to boot until the i2c & twl driver is adapted to
 + * device-tree
 + */
 +static struct twl4030_platform_data sdp4430_twldata = {
 +      .irq_base       = TWL6030_IRQ_BASE,
 +      .irq_end        = TWL6030_IRQ_END,
 +};
  
 -static struct omap_board_config_kernel generic_config[] = {
 +static void __init omap4_i2c_init(void)
 +{
 +      omap4_pmic_init("twl6030", &sdp4430_twldata);
 +}
 +
 +static struct twl4030_platform_data beagle_twldata = {
 +      .irq_base       = TWL4030_IRQ_BASE,
 +      .irq_end        = TWL4030_IRQ_END,
  };
  
 -static void __init omap_generic_init_early(void)
 +static void __init omap3_i2c_init(void)
  {
 -      omap2_init_common_infrastructure();
 -      omap2_init_common_devices(NULL, NULL);
 +      omap3_pmic_init("twl4030", &beagle_twldata);
  }
  
 +static struct of_device_id omap_dt_match_table[] __initdata = {
 +      { .compatible = "simple-bus", },
 +      { .compatible = "ti,omap-infra", },
 +      { }
 +};
 +
 +static struct of_device_id intc_match[] __initdata = {
 +      { .compatible = "ti,omap3-intc", },
 +      { .compatible = "arm,cortex-a9-gic", },
 +      { }
 +};
 +
  static void __init omap_generic_init(void)
  {
 +      struct device_node *node = of_find_matching_node(NULL, intc_match);
 +      if (node)
 +              irq_domain_add_simple(node, 0);
 +
        omap_serial_init();
 -      omap_board_config = generic_config;
 -      omap_board_config_size = ARRAY_SIZE(generic_config);
 +      omap_sdrc_init(NULL, NULL);
 +
 +      of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
 +}
 +
 +static void __init omap4_init(void)
 +{
 +      omap4_i2c_init();
 +      omap_generic_init();
  }
  
 -static void __init omap_generic_map_io(void)
 +static void __init omap3_init(void)
  {
 -      if (cpu_is_omap242x()) {
 -              omap2_set_globals_242x();
 -              omap242x_map_common_io();
 -      } else if (cpu_is_omap243x()) {
 -              omap2_set_globals_243x();
 -              omap243x_map_common_io();
 -      } else if (cpu_is_omap34xx()) {
 -              omap2_set_globals_3xxx();
 -              omap34xx_map_common_io();
 -      } else if (cpu_is_omap44xx()) {
 -              omap2_set_globals_443x();
 -              omap44xx_map_common_io();
 -      }
 +      omap3_i2c_init();
 +      omap_generic_init();
  }
  
 -/* XXX This machine entry name should be updated */
 -MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
 -      /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
 +#if defined(CONFIG_SOC_OMAP2420)
 +static const char *omap242x_boards_compat[] __initdata = {
 +      "ti,omap2420",
 +      NULL,
 +};
 +
 +DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
++      .atag_offset    = 0x100,
 +      .reserve        = omap_reserve,
 +      .map_io         = omap242x_map_io,
 +      .init_early     = omap2420_init_early,
 +      .init_irq       = omap2_init_irq,
 +      .init_machine   = omap_generic_init,
 +      .timer          = &omap2_timer,
 +      .dt_compat      = omap242x_boards_compat,
 +MACHINE_END
 +#endif
 +
 +#if defined(CONFIG_SOC_OMAP2430)
 +static const char *omap243x_boards_compat[] __initdata = {
 +      "ti,omap2430",
 +      NULL,
 +};
 +
 +DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = omap_generic_map_io,
 -      .init_early     = omap_generic_init_early,
 +      .map_io         = omap243x_map_io,
 +      .init_early     = omap2430_init_early,
        .init_irq       = omap2_init_irq,
        .init_machine   = omap_generic_init,
        .timer          = &omap2_timer,
 +      .dt_compat      = omap243x_boards_compat,
 +MACHINE_END
 +#endif
 +
 +#if defined(CONFIG_ARCH_OMAP3)
 +static const char *omap3_boards_compat[] __initdata = {
 +      "ti,omap3",
 +      NULL,
 +};
 +
 +DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
++      .atag_offset    = 0x100,
 +      .reserve        = omap_reserve,
 +      .map_io         = omap3_map_io,
 +      .init_early     = omap3430_init_early,
 +      .init_irq       = omap3_init_irq,
 +      .init_machine   = omap3_init,
 +      .timer          = &omap3_timer,
 +      .dt_compat      = omap3_boards_compat,
 +MACHINE_END
 +#endif
 +
 +#if defined(CONFIG_ARCH_OMAP4)
 +static const char *omap4_boards_compat[] __initdata = {
 +      "ti,omap4",
 +      NULL,
 +};
 +
 +DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
++      .atag_offset    = 0x100,
 +      .reserve        = omap_reserve,
 +      .map_io         = omap4_map_io,
 +      .init_early     = omap4430_init_early,
 +      .init_irq       = gic_init_irq,
 +      .init_machine   = omap4_init,
 +      .timer          = &omap4_timer,
 +      .dt_compat      = omap4_boards_compat,
  MACHINE_END
 +#endif
index 8486142dcae73183fad0f3227c5e95233377ef16,a58c6ba06f7f87ed189f6b16d1c35f7cb5d26ddb..fe75c195f69fdb8d636c95b2748bdb2aaed81fae
@@@ -364,13 -374,19 +364,13 @@@ static void __init omap_h4_init(void
        h4_init_flash();
  }
  
 -static void __init omap_h4_map_io(void)
 -{
 -      omap2_set_globals_242x();
 -      omap242x_map_common_io();
 -}
 -
  MACHINE_START(OMAP_H4, "OMAP2420 H4 board")
        /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = omap_h4_map_io,
 -      .init_early     = omap_h4_init_early,
 -      .init_irq       = omap_h4_init_irq,
 +      .map_io         = omap242x_map_io,
 +      .init_early     = omap2420_init_early,
 +      .init_irq       = omap2_init_irq,
        .init_machine   = omap_h4_init,
        .timer          = &omap2_timer,
  MACHINE_END
index 7b66338e451bcfc94a60e240a8852ed08ebe2820,7040352b16b4dc3b5b7655cf1cbf279b8dba4136..e20cad6a0835a72179823b09c095e3e1fc84ef55
@@@ -667,20 -672,20 +667,20 @@@ static void __init igep_init(void
  }
  
  MACHINE_START(IGEP0020, "IGEP v2 board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = igep_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = igep_init,
        .timer          = &omap3_timer,
  MACHINE_END
  
  MACHINE_START(IGEP0030, "IGEP OMAP3 module")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = igep_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = igep_init,
        .timer          = &omap3_timer,
index 401b9449f722175b9a220d4f07a9b50830f2f3ce,edf752bb24b1f153598a9a6cef813a041d85a85a..0fa28be2cfdaedb8b7a46b0d0b9215d67fed1aa0
@@@ -328,10 -333,10 +328,10 @@@ static void __init omap_ldp_init(void
  }
  
  MACHINE_START(OMAP_LDP, "OMAP LDP board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap_ldp_init_early,
 +      .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap_ldp_init,
        .timer          = &omap3_timer,
index d1f4a0292c42db1337f03c3a1a2b9d108581736d,6ce748154f244e1500e8823beb482bc0095cd1a1..e9d5f4a3d0642dd0b553da23987136e9864e3d70
@@@ -684,30 -695,30 +684,30 @@@ static void __init n8x0_init_machine(vo
  }
  
  MACHINE_START(NOKIA_N800, "Nokia N800")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = n8x0_map_io,
 -      .init_early     = n8x0_init_early,
 +      .map_io         = omap242x_map_io,
 +      .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
        .init_machine   = n8x0_init_machine,
        .timer          = &omap2_timer,
  MACHINE_END
  
  MACHINE_START(NOKIA_N810, "Nokia N810")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = n8x0_map_io,
 -      .init_early     = n8x0_init_early,
 +      .map_io         = omap242x_map_io,
 +      .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
        .init_machine   = n8x0_init_machine,
        .timer          = &omap2_timer,
  MACHINE_END
  
  MACHINE_START(NOKIA_N810_WIMAX, "Nokia N810 WiMAX")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = n8x0_map_io,
 -      .init_early     = n8x0_init_early,
 +      .map_io         = omap242x_map_io,
 +      .init_early     = omap2420_init_early,
        .init_irq       = omap2_init_irq,
        .init_machine   = n8x0_init_machine,
        .timer          = &omap2_timer,
index 4c25742ebf6dc126f0f721bd043f73450f143b36,1fde8a0474bbb077877697164026f330252a7dbf..22e84eabdbea3dd5783e5a36de5e5ce8406d56c1
@@@ -547,11 -557,11 +547,11 @@@ static void __init omap3_beagle_init(vo
  
  MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
        /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap3_beagle_init_early,
 -      .init_irq       = omap3_beagle_init_irq,
 +      .init_early     = omap3_init_early,
 +      .init_irq       = omap3_init_irq,
        .init_machine   = omap3_beagle_init,
        .timer          = &omap3_secure_timer,
  MACHINE_END
index a1184b347aebe7d4aa64d19bf2bfc74ca907ab45,15c69a0c1ce5050e20883ed124b262d3652ed4fd..aa6a9351ce48a036a5e68c70bf0a95e282dcacd7
@@@ -676,10 -681,10 +676,10 @@@ static void __init omap3_evm_init(void
  
  MACHINE_START(OMAP3EVM, "OMAP3 EVM")
        /* Maintainer: Syed Mohammed Khasim - Texas Instruments */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap3_evm_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap3_evm_init,
        .timer          = &omap3_timer,
index 3a1dd84faca0b6b50f216ed28dfedecb63dd23d2,01354a214cafcd3da4283bd7c8943dda4539a475..7c0f193f246dd58e5bc008cfb939c610b73ed65c
@@@ -204,18 -209,18 +204,18 @@@ static void __init omap3logic_init(void
  }
  
  MACHINE_START(OMAP3_TORPEDO, "Logic OMAP3 Torpedo board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .map_io         = omap3_map_io,
 -      .init_early     = omap3logic_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap3logic_init,
        .timer          = &omap3_timer,
  MACHINE_END
  
  MACHINE_START(OMAP3530_LV_SOM, "OMAP Logic 3530 LV SOM board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .map_io         = omap3_map_io,
 -      .init_early     = omap3logic_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap3logic_init,
        .timer          = &omap3_timer,
index e46bf524955964adfddedcabc22fdec5dfd2da0d,ace56938dd3b2816f6782264ddb3e2eb541e09cd..fed2f7dfdf8b71131d7be3a987916135d7685c0f
@@@ -601,10 -606,10 +601,10 @@@ static void __init omap3pandora_init(vo
  }
  
  MACHINE_START(OMAP3_PANDORA, "Pandora Handheld Console")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap3pandora_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap3pandora_init,
        .timer          = &omap3_timer,
index fa58a0f1584a7e3fe2c061d0df90603a71ae625b,ba13e1d5d0abecb251066987bd30a79094b11bf2..170e1ebd6e6247095c414bc2607593d1bfa8b176
@@@ -484,10 -494,10 +484,10 @@@ static void __init omap3_stalker_init(v
  
  MACHINE_START(SBC3530, "OMAP3 STALKER")
        /* Maintainer: Jason Lam -lzg@ema-tech.com */
-       .boot_params            = 0x80000100,
+       .atag_offset            = 0x100,
        .map_io                 = omap3_map_io,
 -      .init_early             = omap3_stalker_init_early,
 -      .init_irq               = omap3_stalker_init_irq,
 +      .init_early             = omap35xx_init_early,
 +      .init_irq               = omap3_init_irq,
        .init_machine           = omap3_stalker_init,
        .timer                  = &omap3_secure_timer,
  MACHINE_END
index 05488fbc20d5d3abe0c3864980d2306d0695bc1c,49e4bd207cb6924285c051f80b1b8c7d4b9fea78..c2d5348f54225a35c5ea7b15fa5ff19974bdf852
@@@ -394,11 -404,11 +394,11 @@@ static void __init omap3_touchbook_init
  
  MACHINE_START(TOUCHBOOK, "OMAP3 touchbook Board")
        /* Maintainer: Gregoire Gentil - http://www.alwaysinnovating.com */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap3_touchbook_init_early,
 -      .init_irq       = omap3_touchbook_init_irq,
 +      .init_early     = omap3430_init_early,
 +      .init_irq       = omap3_init_irq,
        .init_machine   = omap3_touchbook_init,
        .timer          = &omap3_secure_timer,
  MACHINE_END
index e26929049a4d827181816689fa91fc7aa75d25d8,683bede73d540a060761850e60867f166db325e2..2141894eb9f379096bd277c573d1cd1f581f8611
@@@ -570,12 -575,18 +570,12 @@@ static void __init omap4_panda_init(voi
        omap4_panda_display_init();
  }
  
 -static void __init omap4_panda_map_io(void)
 -{
 -      omap2_set_globals_443x();
 -      omap44xx_map_common_io();
 -}
 -
  MACHINE_START(OMAP4_PANDA, "OMAP4 Panda board")
        /* Maintainer: David Anders - Texas Instruments Inc */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = omap4_panda_map_io,
 -      .init_early     = omap4_panda_init_early,
 +      .map_io         = omap4_map_io,
 +      .init_early     = omap4430_init_early,
        .init_irq       = gic_init_irq,
        .init_machine   = omap4_panda_init,
        .timer          = &omap4_timer,
index 7228ae50802d5a0495fde63ad6746fee0f61b4e4,e592fb134c4e8708798b33f61f9a88f747e4944d..9f13dc22df778842e9488964fdc004c104c20427
@@@ -556,10 -561,10 +556,10 @@@ static void __init overo_init(void
  }
  
  MACHINE_START(OVERO, "Gumstix Overo")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = overo_init_early,
 +      .init_early     = omap35xx_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = overo_init,
        .timer          = &omap3_timer,
index a98db616e0d4d717c8c515f3d62e8b4d2fabce6c,9a8ce239ba9ecafa72f2b13366a436a54ad07549..616fb39763b0f4b82d9885a7057a0c0a6bdc6cde
@@@ -143,11 -146,17 +143,11 @@@ static void __init rm680_init(void
        rm680_peripherals_init();
  }
  
 -static void __init rm680_map_io(void)
 -{
 -      omap2_set_globals_3xxx();
 -      omap34xx_map_common_io();
 -}
 -
  MACHINE_START(NOKIA_RM680, "Nokia RM-680 board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
 -      .map_io         = rm680_map_io,
 -      .init_early     = rm680_init_early,
 +      .map_io         = omap3_map_io,
 +      .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = rm680_init,
        .timer          = &omap3_timer,
index 8677a06aa4a7e0303e233501771a33a1b12e3fe0,a6c473bbb3d6392d7b6cc2c03d42d2d1176c17a9..74c8aadc0a19927f0de86247c544658a84a192a5
@@@ -147,10 -156,10 +147,10 @@@ static void __init rx51_reserve(void
  
  MACHINE_START(NOKIA_RX51, "Nokia RX-51 board")
        /* Maintainer: Lauri Leukkunen <lauri.leukkunen@nokia.com> */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = rx51_reserve,
 -      .map_io         = rx51_map_io,
 -      .init_early     = rx51_init_early,
 +      .map_io         = omap3_map_io,
 +      .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = rx51_init,
        .timer          = &omap3_timer,
index b0a16d2f238837ca3932c7873e846c73edc1c787,e41958acb6b63ba240493632c4674408cc867093..e6ee8842285c00f9915e85f6b9b4d02ed00fb601
@@@ -42,9 -48,9 +42,9 @@@ static void __init ti8168_evm_map_io(vo
  
  MACHINE_START(TI8168EVM, "ti8168evm")
        /* Maintainer: Texas Instruments */
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .map_io         = ti8168_evm_map_io,
 -      .init_early     = ti8168_init_early,
 +      .init_early     = ti816x_init_early,
        .init_irq       = ti816x_init_irq,
        .timer          = &omap3_timer,
        .init_machine   = ti8168_evm_init,
index d56c79661038fed7c56340aab3a870743001a1ed,72f1db4863e598cfa775440da83419f85935a308..be6684dc4f55d6a0c33ada72fc5f15f25b807f60
@@@ -130,20 -133,20 +130,20 @@@ static void __init omap_zoom_init(void
  }
  
  MACHINE_START(OMAP_ZOOM2, "OMAP Zoom2 board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap_zoom_init_early,
 +      .init_early     = omap3430_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap_zoom_init,
        .timer          = &omap3_timer,
  MACHINE_END
  
  MACHINE_START(OMAP_ZOOM3, "OMAP Zoom3 board")
-       .boot_params    = 0x80000100,
+       .atag_offset    = 0x100,
        .reserve        = omap_reserve,
        .map_io         = omap3_map_io,
 -      .init_early     = omap_zoom_init_early,
 +      .init_early     = omap3630_init_early,
        .init_irq       = omap3_init_irq,
        .init_machine   = omap_zoom_init,
        .timer          = &omap3_timer,
index aa96538f3fee17845a90e6b858f28c91b3266426,d6d01cb7f28a63b2a7bc3ac060cb059a030bf584..a5d8dce2a70b507507221b262d6bc3469bbd06dd
@@@ -320,15 -336,29 +319,16 @@@ static int _set_hwmod_postsetup_state(s
  /* See irq.c, omap4-common.c and entry-macro.S */
  void __iomem *omap_irq_base;
  
 -void __init omap2_init_common_infrastructure(void)
 +static void __init omap_common_init_early(void)
  {
 -      u8 postsetup_state;
 +      omap2_check_revision();
 +      omap_ioremap_init();
++      omap_init_consistent_dma_size();
 +}
  
 -      if (cpu_is_omap242x()) {
 -              omap2xxx_powerdomains_init();
 -              omap2xxx_clockdomains_init();
 -              omap2420_hwmod_init();
 -      } else if (cpu_is_omap243x()) {
 -              omap2xxx_powerdomains_init();
 -              omap2xxx_clockdomains_init();
 -              omap2430_hwmod_init();
 -      } else if (cpu_is_omap34xx()) {
 -              omap3xxx_powerdomains_init();
 -              omap3xxx_clockdomains_init();
 -              omap3xxx_hwmod_init();
 -      } else if (cpu_is_omap44xx()) {
 -              omap44xx_powerdomains_init();
 -              omap44xx_clockdomains_init();
 -              omap44xx_hwmod_init();
 -      } else {
 -              pr_err("Could not init hwmod data - unknown SoC\n");
 -        }
 +static void __init omap_hwmod_init_postsetup(void)
 +{
 +      u8 postsetup_state;
  
        /* Set the default postsetup state for all hwmods */
  #ifdef CONFIG_PM_RUNTIME
Simple merge
Simple merge
Simple merge
Simple merge
index cefd7f6dd4f3052567b8620eefdb149dc0341064,8dc05763a7ebe97d5d085d8624fa8f09bd1c8991..de085b798aa47572ba6827dff79dd82b5d395809
@@@ -143,11 -144,20 +144,12 @@@ void __init s3c64xx_init_io(struct map_
        /* initialise the io descriptors we need for initialisation */
        iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc));
        iotable_init(mach_desc, size);
+       init_consistent_dma_size(SZ_8M);
  
 -      idcode = __raw_readl(S3C_VA_SYS + 0x118);
 -      if (!idcode) {
 -              /* S3C6400 has the ID register in a different place,
 -               * and needs a write before it can be read. */
 -
 -              __raw_writel(0x0, S3C_VA_SYS + 0xA1C);
 -              idcode = __raw_readl(S3C_VA_SYS + 0xA1C);
 -      }
 +      /* detect cpu id */
 +      s3c64xx_init_cpu();
  
 -      s3c_init_cpu(idcode, cpu_ids, ARRAY_SIZE(cpu_ids));
 +      s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
  }
  
  static __init int s3c64xx_sysdev_init(void)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 1bbcbde76400e30a88abe09d80f35cd96fa6e5e8,e9b0e23edd0a556430a364d2e0aec740420c5d05..333871f599952e9e54eb2fff1e7307242ab9a132
@@@ -145,7 -141,9 +146,14 @@@ void omap_iounmap(volatile void __iome
  }
  EXPORT_SYMBOL(omap_iounmap);
  
+ void __init omap_init_consistent_dma_size(void)
+ {
+ #ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE
+       init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);
+ #endif
+ }
++
 +void __init omap_ioremap_init(void)
 +{
 +      initialized++;
 +}