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
  ...

3 files changed, 1 insertions, 56 deletions

diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index c4f5e26feb4..993780f490a 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 12d8deb78d9..131633b12a3 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 5631b51cec4..ffcd9e3a6a7 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