Merge remote-tracking branch 'arm/for-next'

diff --combined arch/arm/mach-omap2/omap4-common.c
index b39efd46abf991827169a6c17a6aa91f3dfeb39f,08def5665e7624b8b6c5dfcf8cfda90ff1216134..b5110f19abc7b256484289336c7f28cb4bec913d
--- 1/arch/arm/mach-omap2/omap4-common.c
--- 2/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@@ -35,6 -35,7 +35,6 @@@
  #include "iomap.h"
  #include "common.h"
  #include "mmc.h"
 -#include "hsmmc.h"
  #include "prminst44xx.h"
  #include "prcm_mpu44xx.h"
  #include "omap4-sar-layout.h"
@@@ -87,7 -88,7 +87,7 @@@ void __init omap_barriers_init(void
        dram_io_desc[0].virtual = OMAP4_DRAM_BARRIER_VA;
        dram_io_desc[0].pfn = __phys_to_pfn(paddr);
        dram_io_desc[0].length = size;
-       dram_io_desc[0].type = MT_MEMORY_SO;
+       dram_io_desc[0].type = MT_MEMORY_RW_SO;
        iotable_init(dram_io_desc, ARRAY_SIZE(dram_io_desc));
        dram_sync = (void __iomem *) dram_io_desc[0].virtual;
        sram_sync = (void __iomem *) OMAP4_SRAM_VA;
@@@ -283,3 -284,59 +283,3 @@@ skip_errata_init
        omap_wakeupgen_init();
        irqchip_init();
  }
 -
 -#if defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
 -static int omap4_twl6030_hsmmc_late_init(struct device *dev)
 -{
 -      int irq = 0;
 -      struct platform_device *pdev = container_of(dev,
 -                              struct platform_device, dev);
 -      struct omap_mmc_platform_data *pdata = dev->platform_data;
 -
 -      /* Setting MMC1 Card detect Irq */
 -      if (pdev->id == 0) {
 -              irq = twl6030_mmc_card_detect_config();
 -              if (irq < 0) {
 -                      dev_err(dev, "%s: Error card detect config(%d)\n",
 -                              __func__, irq);
 -                      return irq;
 -              }
 -              pdata->slots[0].card_detect_irq = irq;
 -              pdata->slots[0].card_detect = twl6030_mmc_card_detect;
 -      }
 -      return 0;
 -}
 -
 -static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)
 -{
 -      struct omap_mmc_platform_data *pdata;
 -
 -      /* dev can be null if CONFIG_MMC_OMAP_HS is not set */
 -      if (!dev) {
 -              pr_err("Failed %s\n", __func__);
 -              return;
 -      }
 -      pdata = dev->platform_data;
 -      pdata->init =   omap4_twl6030_hsmmc_late_init;
 -}
 -
 -int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)
 -{
 -      struct omap2_hsmmc_info *c;
 -
 -      omap_hsmmc_init(controllers);
 -      for (c = controllers; c->mmc; c++) {
 -              /* pdev can be null if CONFIG_MMC_OMAP_HS is not set */
 -              if (!c->pdev)
 -                      continue;
 -              omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);
 -      }
 -
 -      return 0;
 -}
 -#else
 -int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)
 -{
 -      return 0;
 -}
 -#endif