Merge remote-tracking branch 'spi-mb/spi-next'

Conflicts:
	drivers/mmc/host/mxs-mmc.c

diff --cc drivers/mmc/host/mxs-mmc.c
index ad3fcea1269ebc179105563333b01cfdf139a9ed,4da996654772f0840f91bd8254694eff4f374216..80d1e6d4b0ae2272588b8860f91527d02358dbf4
--- 1/drivers/mmc/host/mxs-mmc.c
--- 2/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@@ -281,12 -193,10 +193,12 @@@ static irqreturn_t mxs_mmc_irq_handler(
  
        spin_lock(&host->lock);
  
-       stat = readl(host->base + HW_SSP_CTRL1(host));
+       stat = readl(ssp->base + HW_SSP_CTRL1(ssp));
        writel(stat & MXS_MMC_IRQ_BITS,
-              host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+              ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
  
 +      spin_unlock(&host->lock);
 +
        if ((stat & BM_SSP_CTRL1_SDIO_IRQ) && (stat & BM_SSP_CTRL1_SDIO_IRQ_EN))
                mmc_signal_sdio_irq(host->mmc);
  
@@@ -641,22 -523,22 +523,22 @@@ static void mxs_mmc_enable_sdio_irq(str
  
        if (enable) {
                writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
-                      host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
+                      ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_SET);
                writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
-                      host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_SET);
+                      ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_SET);
 -
 -              if (readl(ssp->base + HW_SSP_STATUS(ssp)) &
 -                              BM_SSP_STATUS_SDIO_IRQ)
 -                      mmc_signal_sdio_irq(host->mmc);
 -
        } else {
                writel(BM_SSP_CTRL0_SDIO_IRQ_CHECK,
-                      host->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
+                      ssp->base + HW_SSP_CTRL0 + STMP_OFFSET_REG_CLR);
                writel(BM_SSP_CTRL1_SDIO_IRQ_EN,
-                      host->base + HW_SSP_CTRL1(host) + STMP_OFFSET_REG_CLR);
+                      ssp->base + HW_SSP_CTRL1(ssp) + STMP_OFFSET_REG_CLR);
        }
  
        spin_unlock_irqrestore(&host->lock, flags);
-       if (enable && readl(host->base + HW_SSP_STATUS(host)) &
 +
++      if (enable && readl(ssp->base + HW_SSP_STATUS(ssp)) &
 +                      BM_SSP_STATUS_SDIO_IRQ)
 +              mmc_signal_sdio_irq(host->mmc);
 +
  }
  
  static const struct mmc_host_ops mxs_mmc_ops = {

diff --cc drivers/spi/Kconfig
Simple merge

diff --cc drivers/spi/Makefile
index 93d87bcdf3f5c625d865e2ca7e1c17ffbe690d78,938705644bb604809e092020d62cc8eb6eddfb7d..d8a037a19027bfee34dc37872d3843ab0c1d6181
--- 1/drivers/spi/Makefile
--- 2/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@@ -36,9 -36,9 +36,10 @@@ obj-$(CONFIG_SPI_LM70_LLP)           += spi-lm70
  obj-$(CONFIG_SPI_MPC512x_PSC)         += spi-mpc512x-psc.o
  obj-$(CONFIG_SPI_MPC52xx_PSC)         += spi-mpc52xx-psc.o
  obj-$(CONFIG_SPI_MPC52xx)             += spi-mpc52xx.o
+ obj-$(CONFIG_SPI_MXS)                 += spi-mxs.o
  obj-$(CONFIG_SPI_NUC900)              += spi-nuc900.o
  obj-$(CONFIG_SPI_OC_TINY)             += spi-oc-tiny.o
 +obj-$(CONFIG_SPI_OCTEON)              += spi-octeon.o
  obj-$(CONFIG_SPI_OMAP_UWIRE)          += spi-omap-uwire.o
  obj-$(CONFIG_SPI_OMAP_100K)           += spi-omap-100k.o
  obj-$(CONFIG_SPI_OMAP24XX)            += spi-omap2-mcspi.o

diff --cc drivers/spi/spi-s3c64xx.c
Simple merge

diff --cc drivers/spi/spi-topcliff-pch.c
Simple merge