Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

12 files changed, 2541 insertions, 256 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 891ef18bd77b..7cb057f3f883 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -132,11 +132,11 @@ config MMC_OMAP
 
 config MMC_OMAP_HS
         tristate "TI OMAP High Speed Multimedia Card Interface support"
-        depends on ARCH_OMAP2430 || ARCH_OMAP3
+        depends on ARCH_OMAP2430 || ARCH_OMAP3 || ARCH_OMAP4
         help
           This selects the TI OMAP High Speed Multimedia card Interface.
-          If you have an OMAP2430 or OMAP3 board with a Multimedia Card slot,
-          say Y or M here.
+          If you have an OMAP2430 or OMAP3 board or OMAP4 board with a
+          Multimedia Card slot, say Y or M here.
 
           If unsure, say N.
 
@@ -160,6 +160,12 @@ config MMC_AU1X
 
           If unsure, say N.
 
+choice
+        prompt "Atmel SD/MMC Driver"
+        default MMC_ATMELMCI if AVR32
+        help
+          Choose which driver to use for the Atmel MCI Silicon
+
 config MMC_AT91
         tristate "AT91 SD/MMC Card Interface support"
         depends on ARCH_AT91
@@ -170,17 +176,19 @@ config MMC_AT91
 
 config MMC_ATMELMCI
         tristate "Atmel Multimedia Card Interface support"
-        depends on AVR32
+        depends on AVR32 || ARCH_AT91
         help
           This selects the Atmel Multimedia Card Interface driver. If
-          you have an AT32 (AVR32) platform with a Multimedia Card
-          slot, say Y or M here.
+          you have an AT32 (AVR32) or AT91 platform with a Multimedia
+          Card slot, say Y or M here.
 
           If unsure, say N.
 
+endchoice
+
 config MMC_ATMELMCI_DMA
         bool "Atmel MCI DMA support (EXPERIMENTAL)"
-        depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL
+        depends on MMC_ATMELMCI && AVR32 && DMA_ENGINE && EXPERIMENTAL
         help
           Say Y here to have the Atmel MCI driver use a DMA engine to
           do data transfers and thus increase the throughput and
@@ -199,6 +207,13 @@ config MMC_IMX
 
           If unsure, say N.
 
+config MMC_MSM7X00A
+        tristate "Qualcomm MSM 7X00A SDCC Controller Support"
+        depends on MMC && ARCH_MSM
+        help
+          This provides support for the SD/MMC cell found in the
+          MSM 7X00A controllers from Qualcomm.
+
 config MMC_MXC
         tristate "Freescale i.MX2/3 Multimedia Card Interface support"
         depends on ARCH_MXC
diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
index cf153f628457..abcb0400e06d 100644
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_OMAP_HS)	+= omap_hsmmc.o
 obj-$(CONFIG_MMC_AT91)          += at91_mci.o
 obj-$(CONFIG_MMC_ATMELMCI)      += atmel-mci.o
 obj-$(CONFIG_MMC_TIFM_SD)       += tifm_sd.o
+obj-$(CONFIG_MMC_MSM7X00A)      += msm_sdcc.o
 obj-$(CONFIG_MMC_MVSDIO)        += mvsdio.o
 obj-$(CONFIG_MMC_SPI)           += mmc_spi.o
 ifeq ($(CONFIG_OF),y)
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 7b603e4b41db..fc25586b7ee1 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -30,6 +30,7 @@
 #include <asm/io.h>
 #include <asm/unaligned.h>
 
+#include <mach/cpu.h>
 #include <mach/board.h>
 
 #include "atmel-mci-regs.h"
@@ -210,6 +211,18 @@ struct atmel_mci_slot {
         set_bit(event, &host->pending_events)
 
 /*
+ * Enable or disable features/registers based on
+ * whether the processor supports them
+ */
+static bool mci_has_rwproof(void)
+{
+        if (cpu_is_at91sam9261() || cpu_is_at91rm9200())
+                return false;
+        else
+                return true;
+}
+
+/*
  * The debugfs stuff below is mostly optimized away when
  * CONFIG_DEBUG_FS is not set.
  */
@@ -276,8 +289,13 @@ static void atmci_show_status_reg(struct seq_file *s,
                 [3]     = "BLKE",
                 [4]     = "DTIP",
                 [5]     = "NOTBUSY",
+                [6]     = "ENDRX",
+                [7]     = "ENDTX",
                 [8]     = "SDIOIRQA",
                 [9]     = "SDIOIRQB",
+                [12]    = "SDIOWAIT",
+                [14]    = "RXBUFF",
+                [15]    = "TXBUFE",
                 [16]    = "RINDE",
                 [17]    = "RDIRE",
                 [18]    = "RCRCE",
@@ -285,6 +303,11 @@ static void atmci_show_status_reg(struct seq_file *s,
                 [20]    = "RTOE",
                 [21]    = "DCRCE",
                 [22]    = "DTOE",
+                [23]    = "CSTOE",
+                [24]    = "BLKOVRE",
+                [25]    = "DMADONE",
+                [26]    = "FIFOEMPTY",
+                [27]    = "XFRDONE",
                 [30]    = "OVRE",
                 [31]    = "UNRE",
         };
@@ -576,6 +599,7 @@ atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
         struct scatterlist              *sg;
         unsigned int                    i;
         enum dma_data_direction         direction;
+        unsigned int                    sglen;
 
         /*
          * We don't do DMA on "complex" transfers, i.e. with
@@ -605,11 +629,14 @@ atmci_submit_data_dma(struct atmel_mci *host, struct mmc_data *data)
         else
                 direction = DMA_TO_DEVICE;
 
+        sglen = dma_map_sg(&host->pdev->dev, data->sg, data->sg_len, direction);
+        if (sglen != data->sg_len)
+                goto unmap_exit;
         desc = chan->device->device_prep_slave_sg(chan,
                         data->sg, data->sg_len, direction,
                         DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
         if (!desc)
-                return -ENOMEM;
+                goto unmap_exit;