Merge branch 'omap-fixes'

diff --combined arch/arm/mach-omap2/devices.c
index cb697e115776a3fd6782234c9411bf4875ebf43d,496983ade97e81c3c3922f968d0b776a6f61ec20..894cc355818afacdb0119796cffd76d793972075
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -25,7 -25,6 +25,6 @@@
  #include <mach/board.h>
  #include <mach/mux.h>
  #include <mach/gpio.h>
- #include <mach/eac.h>
  #include <mach/mmc.h>
  
  #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
@@@ -355,12 -354,10 +354,12 @@@ static void omap_init_mcspi(void
        platform_device_register(&omap2_mcspi1);
        platform_device_register(&omap2_mcspi2);
  #if defined(CONFIG_ARCH_OMAP2430) || defined(CONFIG_ARCH_OMAP3)
 -      platform_device_register(&omap2_mcspi3);
 +      if (cpu_is_omap2430() || cpu_is_omap343x())
 +              platform_device_register(&omap2_mcspi3);
  #endif
  #ifdef CONFIG_ARCH_OMAP3
 -      platform_device_register(&omap2_mcspi4);
 +      if (cpu_is_omap343x())
 +              platform_device_register(&omap2_mcspi4);
  #endif
  }
  
@@@ -368,38 -365,6 +367,6 @@@
  static inline void omap_init_mcspi(void) {}
  #endif
  
- #ifdef CONFIG_SND_OMAP24XX_EAC
- 
- #define OMAP2_EAC_BASE                        0x48090000
- 
- static struct resource omap2_eac_resources[] = {
-       {
-               .start          = OMAP2_EAC_BASE,
-               .end            = OMAP2_EAC_BASE + 0x109,
-               .flags          = IORESOURCE_MEM,
-       },
- };
- 
- static struct platform_device omap2_eac_device = {
-       .name           = "omap24xx-eac",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(omap2_eac_resources),
-       .resource       = omap2_eac_resources,
-       .dev = {
-               .platform_data = NULL,
-       },
- };
- 
- void omap_init_eac(struct eac_platform_data *pdata)
- {
-       omap2_eac_device.dev.platform_data = pdata;
-       platform_device_register(&omap2_eac_device);
- }
- 
- #else
- void omap_init_eac(struct eac_platform_data *pdata) {}
- #endif
- 
  #ifdef CONFIG_OMAP_SHA1_MD5
  static struct resource sha1_md5_resources[] = {
        {

diff --combined drivers/mmc/host/omap_hsmmc.c
index 9b82096b433cefd40131e0d65cf62cbbe4b69f02,4270676f33f6d1bee3b2c3b632c727526e637442..ac51f0b4954d2cf9270367b79b71df5e7a617ab1
--- 1/drivers/mmc/host/omap_hsmmc.c
--- 2/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@@ -464,6 -464,7 +464,7 @@@ static irqreturn_t mmc_omap_irq(int irq
        }
  
        OMAP_HSMMC_WRITE(host->base, STAT, status);
+       OMAP_HSMMC_READ(host->base, STAT); /* flush posted write */
  
        if (end_cmd || (status & CC))
                mmc_omap_cmd_done(host, host->cmd);
@@@ -1005,6 -1006,7 +1006,6 @@@ static int __init omap_mmc_probe(struc
        mmc->max_req_size = mmc->max_blk_size * mmc->max_blk_count;
        mmc->max_seg_size = mmc->max_req_size;
  
 -      mmc->ocr_avail = mmc_slot(host).ocr_mask;
        mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED;
  
        if (pdata->slots[host->slot_id].wires >= 4)
@@@ -1041,14 -1043,13 +1042,14 @@@
                goto err_irq;
        }
  
 +      /* initialize power supplies, gpios, etc */
        if (pdata->init != NULL) {
                if (pdata->init(&pdev->dev) != 0) {
 -                      dev_dbg(mmc_dev(host->mmc),
 -                              "Unable to configure MMC IRQs\n");
 +                      dev_dbg(mmc_dev(host->mmc), "late init error\n");
                        goto err_irq_cd_init;
                }
        }
 +      mmc->ocr_avail = mmc_slot(host).ocr_mask;
  
        /* Request IRQ for card detect */
        if ((mmc_slot(host).card_detect_irq) && (mmc_slot(host).card_detect)) {