Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)
  mmc: fix compile error when CONFIG_BLOCK is not enabled
  mmc: core: Cleanup eMMC4.5 conditionals
  mmc: omap_hsmmc: if multiblock reads are broken, disable them
  mmc: core: add workaround for controllers with broken multiblock reads
  mmc: core: Prevent too long response times for suspend
  mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00
  mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
  mmc: core: support HPI send command
  mmc: core: Add cache control for eMMC4.5 device
  mmc: core: Modify the timeout value for writing power class
  mmc: core: new discard feature support at eMMC v4.5
  mmc: core: mmc sanitize feature support for v4.5
  mmc: dw_mmc: modify DATA register offset
  mmc: sdhci-pci: add flag for devices that can support runtime PM
  mmc: omap_hsmmc: ensure pbias configuration is always done
  mmc: core: Add Power Off Notify Feature eMMC 4.5
  mmc: sdhci-s3c: fix potential NULL dereference
  mmc: replace printk with appropriate display macro
  mmc: core: Add default timeout value for CMD6
  mmc: sdhci-pci: add runtime pm support
  ...

7 files changed, 32 insertions, 58 deletions

diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index a53b3de9daa2..3c2b580b9d75 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -319,7 +319,7 @@ void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data)
         if (!data)
                 return;
 
-        for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
+        for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
                 if (data->slot[i].bus_width) {
                         /* input/irq */
                         if (data->slot[i].detect_pin) {
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index c4f5e26feb4d..993780f490ad 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -176,12 +176,6 @@ static struct resource resources_sdc1[] = {
                 .name   = "cmd_irq",
         },
         {
-                .start  = INT_SDC1_1,
-                .end    = INT_SDC1_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
-        {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
         },
@@ -204,12 +198,6 @@ static struct resource resources_sdc2[] = {
                 .flags  = IORESOURCE_IRQ,
                 .name   = "cmd_irq",
         },
-                {
-                .start  = INT_SDC2_1,
-                .end    = INT_SDC2_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
         {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
@@ -233,12 +221,6 @@ static struct resource resources_sdc3[] = {
                 .flags  = IORESOURCE_IRQ,
                 .name   = "cmd_irq",
         },
-                {
-                .start  = INT_SDC3_1,
-                .end    = INT_SDC3_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
         {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
@@ -262,12 +244,6 @@ static struct resource resources_sdc4[] = {
                 .flags  = IORESOURCE_IRQ,
                 .name   = "cmd_irq",
         },
-                {
-                .start  = INT_SDC4_1,
-                .end    = INT_SDC4_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
         {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index 12d8deb78d9c..131633b12a34 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -140,12 +140,6 @@ static struct resource resources_sdc1[] = {
                 .name   = "cmd_irq",
         },
         {
-                .start  = INT_SDC1_1,
-                .end    = INT_SDC1_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
-        {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
         },
@@ -168,12 +162,6 @@ static struct resource resources_sdc2[] = {
                 .flags  = IORESOURCE_IRQ,
                 .name   = "cmd_irq",
         },
-                {
-                .start  = INT_SDC2_1,
-                .end    = INT_SDC2_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
         {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
@@ -197,12 +185,6 @@ static struct resource resources_sdc3[] = {
                 .flags  = IORESOURCE_IRQ,
                 .name   = "cmd_irq",
         },
-                {
-                .start  = INT_SDC3_1,
-                .end    = INT_SDC3_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
         {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
@@ -226,12 +208,6 @@ static struct resource resources_sdc4[] = {
                 .flags  = IORESOURCE_IRQ,
                 .name   = "cmd_irq",
         },
-                {
-                .start  = INT_SDC4_1,
-                .end    = INT_SDC4_1,
-                .flags  = IORESOURCE_IRQ,
-                .name   = "pio_irq",
-        },
         {
                 .flags  = IORESOURCE_IRQ | IORESOURCE_DISABLED,
                 .name   = "status_irq"
diff --git a/arch/arm/mach-msm/include/mach/mmc.h b/arch/arm/mach-msm/include/mach/mmc.h
index 5631b51cec46..ffcd9e3a6a7e 100644
--- a/arch/arm/mach-msm/include/mach/mmc.h
+++ b/arch/arm/mach-msm/include/mach/mmc.h
@@ -8,13 +8,6 @@
 #include <linux/mmc/card.h>
 #include <linux/mmc/sdio_func.h>
 
-struct embedded_sdio_data {
-        struct sdio_cis cis;
-        struct sdio_cccr cccr;
-        struct sdio_embedded_func *funcs;
-        int num_funcs;
-};
-
 struct msm_mmc_gpio {
         unsigned no;
         const char *name;
@@ -29,9 +22,9 @@ struct msm_mmc_platform_data {
         unsigned int ocr_mask;                  /* available voltages */
         u32 (*translate_vdd)(struct device *, unsigned int);
         unsigned int (*status)(struct device *);
-        struct embedded_sdio_data *embedded_sdio;
         int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
         struct msm_mmc_gpio_data *gpio_data;
+        void (*init_card)(struct mmc_card *card);
 };
 
 #endif
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
index 5fde49da399a..475342bcc95c 100644
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@ -355,14 +355,17 @@ static struct resource sdhi0_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
+                .name   = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
                 .start  = gic_spi(83),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDCARD,
                 .start  = gic_spi(84),
                 .flags  = IORESOURCE_IRQ,
         },
         [3] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDIO,
                 .start  = gic_spi(85),
                 .flags  = IORESOURCE_IRQ,
         },
@@ -398,14 +401,17 @@ static struct resource sdhi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
+                .name   = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
                 .start  = gic_spi(87),
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDCARD,
                 .start  = gic_spi(88),
                 .flags  = IORESOURCE_IRQ,
         },
         [3] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDIO,
                 .start  = gic_spi(89),
                 .flags  = IORESOURCE_IRQ,
         },
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 7d073c121941..4de92dc570b0 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -1072,14 +1072,17 @@ static struct resource sdhi1_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
+                .name   = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
                 .start  = evt2irq(0x0e80), /* SDHI1_SDHI1I0 */
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDCARD,
                 .start  = evt2irq(0x0ea0), /* SDHI1_SDHI1I1 */
                 .flags  = IORESOURCE_IRQ,
         },
         [3] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDIO,
                 .start  = evt2irq(0x0ec0), /* SDHI1_SDHI1I2 */
                 .flags  = IORESOURCE_IRQ,
         },
@@ -1123,14 +1126,17 @@ static struct resource sdhi2_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
+                .name   = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
                 .start  = evt2irq(0x1200), /* SDHI2_SDHI2I0 */
                 .flags  = IORESOURCE_IRQ,
         },
         [2] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDCARD,
                 .start  = evt2irq(0x1220), /* SDHI2_SDHI2I1 */
                 .flags  = IORESOURCE_IRQ,
         },
         [3] = {
+                .name   = SH_MOBILE_SDHI_IRQ_SDIO,
                 .start  = evt2irq(0x1240), /* SDHI2_SDHI2I2 */
                 .flags  = IORESOURCE_IRQ,
         },
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h
index c7b874186c27..94cf70afb236 100644
--- a/arch/arm/plat-omap/include/plat/mmc.h
+++ b/arch/arm/plat-omap/include/plat/mmc.h
@@ -31,7 +31,24 @@
 
 #define OMAP_MMC_MAX_SLOTS      2
 
-#define OMAP_HSMMC_SUPPORTS_DUAL_VOLT   BIT(1)
+/*
+ * struct omap_mmc_dev_attr.flags possibilities
+ *
+ * OMAP_HSMMC_SUPPORTS_DUAL_VOLT: Some HSMMC controller instances can
+ *    operate with either 1.8Vdc or 3.0Vdc card voltages; this flag
+ *    should be set if this is the case.  See for example Section 22.5.3
+ *    "MMC/SD/SDIO1 Bus Voltage Selection" of the OMAP34xx Multimedia
+ *    Device Silicon Revision 3.1.x Revision ZR (July 2011) (SWPU223R).
+ *
+ * OMAP_HSMMC_BROKEN_MULTIBLOCK_READ: Multiple-block read transfers
+ *    don't work correctly on some MMC controller instances on some
+ *    OMAP3 SoCs; this flag should be set if this is the case.  See
+ *    for example Advisory 2.1.1.128 "MMC: Multiple Block Read
+ *    Operation Issue" in _OMAP3530/3525/3515/3503 Silicon Errata_
+ *    Revision F (October 2010) (SPRZ278F).
+ */
+#define OMAP_HSMMC_SUPPORTS_DUAL_VOLT           BIT(0)
+#define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ       BIT(1)
 
 struct omap_mmc_dev_attr {
         u8 flags;