Merge branch 'soc-part2' into soc

diff --combined arch/arm/mach-omap2/io.c
index 3f174d51f67fb8e4f41f01ebbbe577c892999449,58bd138e5a981b366e7168c809283330fe4fca9b..81cf60f6bc9c4946a268358e614b1e2605e5ba09
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -254,15 -254,6 +254,15 @@@ static struct map_desc omap44xx_io_desc
                .length         = L4_EMU_44XX_SIZE,
                .type           = MT_DEVICE,
        },
 +#ifdef CONFIG_OMAP4_ERRATA_I688
 +      {
 +              .virtual        = OMAP4_SRAM_VA,
 +              .pfn            = __phys_to_pfn(OMAP4_SRAM_PA),
 +              .length         = PAGE_SIZE,
 +              .type           = MT_MEMORY_SO,
 +      },
 +#endif
 +
  };
  #endif
  
@@@ -351,7 -342,6 +351,6 @@@ static int _set_hwmod_postsetup_state(s
  
  static void __init omap_common_init_early(void)
  {
-       omap2_check_revision();
        omap_init_consistent_dma_size();
  }
  
@@@ -392,6 -382,7 +391,7 @@@ static void __init omap_hwmod_init_post
  void __init omap2420_init_early(void)
  {
        omap2_set_globals_242x();
+       omap2xxx_check_revision();
        omap_common_init_early();
        omap2xxx_voltagedomains_init();
        omap242x_powerdomains_init();
@@@ -404,6 -395,7 +404,7 @@@
  void __init omap2430_init_early(void)
  {
        omap2_set_globals_243x();
+       omap2xxx_check_revision();
        omap_common_init_early();
        omap2xxx_voltagedomains_init();
        omap243x_powerdomains_init();
@@@ -422,6 -414,8 +423,8 @@@
  void __init omap3_init_early(void)
  {
        omap2_set_globals_3xxx();
+       omap3xxx_check_revision();
+       omap3xxx_check_features();
        omap_common_init_early();
        omap3xxx_voltagedomains_init();
        omap3xxx_powerdomains_init();
@@@ -454,6 -448,8 +457,8 @@@ void __init am35xx_init_early(void
  void __init ti81xx_init_early(void)
  {
        omap2_set_globals_ti81xx();
+       omap3xxx_check_revision();
+       ti81xx_check_features();
        omap_common_init_early();
        omap3xxx_voltagedomains_init();
        omap3xxx_powerdomains_init();
@@@ -468,6 -464,8 +473,8 @@@
  void __init omap4430_init_early(void)
  {
        omap2_set_globals_443x();
+       omap4xxx_check_revision();
+       omap4xxx_check_features();
        omap_common_init_early();
        omap44xx_voltagedomains_init();
        omap44xx_powerdomains_init();