4 files changed, 42 insertions, 20 deletions

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index efc822df4b75..f0fcce40cd8d 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -96,6 +96,17 @@ static struct variant_data variant_u300 = {
         .signal_direction       = true,
 };
 
+static struct variant_data variant_nomadik = {
+        .fifosize               = 16 * 4,
+        .fifohalfsize           = 8 * 4,
+        .clkreg                 = MCI_CLK_ENABLE,
+        .datalength_bits        = 24,
+        .sdio                   = true,
+        .st_clkdiv              = true,
+        .pwrreg_powerup         = MCI_PWR_ON,
+        .signal_direction       = true,
+};
+
 static struct variant_data variant_ux500 = {
         .fifosize               = 30 * 4,
         .fifohalfsize           = 8 * 4,
@@ -1454,7 +1465,7 @@ static int __devinit mmci_probe(struct amba_device *dev,
         if (ret)
                 goto unmap;
 
-        if (dev->irq[1] == NO_IRQ || !dev->irq[1])
+        if (!dev->irq[1])
                 host->singleirq = true;
         else {
                 ret = request_irq(dev->irq[1], mmci_pio_irq, IRQF_SHARED,
@@ -1626,6 +1637,11 @@ static struct amba_id mmci_ids[] = {
                 .data   = &variant_u300,
         },
         {
+                .id     = 0x10180180,
+                .mask   = 0xf0ffffff,
+                .data   = &variant_nomadik,
+        },
+        {
                 .id     = 0x00280180,
                 .mask   = 0x00ffffff,
                 .data   = &variant_u300,
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index b0f2ef988188..bb03ddda481d 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -39,6 +39,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/module.h>
 #include <linux/fsl/mxs-dma.h>
+#include <linux/pinctrl/consumer.h>
 
 #include <mach/mxs.h>
 #include <mach/common.h>
@@ -363,6 +364,7 @@ static void mxs_mmc_bc(struct mxs_mmc_host *host)
                 goto out;
 
         dmaengine_submit(desc);
+        dma_async_issue_pending(host->dmach);
         return;
 
 out:
@@ -403,6 +405,7 @@ static void mxs_mmc_ac(struct mxs_mmc_host *host)
                 goto out;
 
         dmaengine_submit(desc);
+        dma_async_issue_pending(host->dmach);
         return;
 
 out:
@@ -531,6 +534,7 @@ static void mxs_mmc_adtc(struct mxs_mmc_host *host)
                 goto out;
 
         dmaengine_submit(desc);
+        dma_async_issue_pending(host->dmach);
         return;
 out:
         dev_warn(mmc_dev(host->mmc),
@@ -679,6 +683,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
         struct mmc_host *mmc;
         struct resource *iores, *dmares, *r;
         struct mxs_mmc_platform_data *pdata;
+        struct pinctrl *pinctrl;
         int ret = 0, irq_err, irq_dma;
         dma_cap_mask_t mask;
 
@@ -716,6 +721,12 @@ static int mxs_mmc_probe(struct platform_device *pdev)
         host->irq = irq_err;
         host->sdio_irq_en = 0;
 
+        pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(pinctrl)) {
+                ret = PTR_ERR(pinctrl);
+                goto out_iounmap;
+        }
+
         host->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(host->clk)) {
                 ret = PTR_ERR(host->clk);
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 8abdaf6697a8..d190d04636a7 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -24,6 +24,7 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include <linux/of_gpio.h>
+#include <linux/pinctrl/consumer.h>
 #include <mach/esdhc.h>
 #include "sdhci-pltfm.h"
 #include "sdhci-esdhc.h"
@@ -68,6 +69,7 @@ struct pltfm_imx_data {
         int flags;
         u32 scratchpad;
         enum imx_esdhc_type devtype;
+        struct pinctrl *pinctrl;
         struct esdhc_platform_data boarddata;
 };
 
@@ -467,6 +469,12 @@ static int __devinit sdhci_esdhc_imx_probe(struct platform_device *pdev)
         clk_prepare_enable(clk);
         pltfm_host->clk = clk;
 
+        imx_data->pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
+        if (IS_ERR(imx_data->pinctrl)) {
+                err = PTR_ERR(imx_data->pinctrl);
+                goto pin_err;
+        }
+
         host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
 
         if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
@@ -558,6 +566,7 @@ no_card_detect_irq:
                 gpio_free(boarddata->wp_gpio);
 no_card_detect_pin:
 no_board_data:
+pin_err:
         clk_disable_unprepare(pltfm_host->clk);
         clk_put(pltfm_host->clk);
 err_clk_get:
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index cff0c522b4ab..b38d8a78f6a0 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -295,7 +295,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                                 "failed to allocate power gpio\n");
                         goto err_power_req;
                 }
-                tegra_gpio_enable(plat->power_gpio);
                 gpio_direction_output(plat->power_gpio, 1);
         }
 
@@ -306,7 +305,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                                 "failed to allocate cd gpio\n");
                         goto err_cd_req;
                 }
-                tegra_gpio_enable(plat->cd_gpio);
                 gpio_direction_input(plat->cd_gpio);
 
                 rc = request_irq(gpio_to_irq(plat->cd_gpio), carddetect_irq,
@@ -327,7 +325,6 @@ static int __devinit sdhci_tegra_probe(struct platform_device *pdev)
                                 "failed to allocate wp gpio\n");
                         goto err_wp_req;
                 }
-                tegra_gpio_enable(plat->wp_gpio);
                 gpio_direction_input(plat->wp_gpio);
         }
 
@@ -355,23 +352,17 @@ err_add_host:
         clk_disable(pltfm_host->clk);
         clk_put(pltfm_host->clk);
 err_clk_get:
-        if (gpio_is_valid(plat->wp_gpio)) {
-                tegra_gpio_disable(plat->wp_gpio);
+        if (gpio_is_valid(plat->wp_gpio))
                 gpio_free(plat->wp_gpio);
-        }
 err_wp_req:
         if (gpio_is_valid(plat->cd_gpio))
                 free_irq(gpio_to_irq(plat->cd_gpio), host);
 err_cd_irq_req:
-        if (gpio_is_valid(plat->cd_gpio)) {
-                tegra_gpio_disable(plat->cd_gpio);
+        if (gpio_is_valid(plat->cd_gpio))
                 gpio_free(plat->cd_gpio);
-        }
 err_cd_req:
-        if (gpio_is_valid(plat->power_gpio)) {
-                tegra_gpio_disable(plat->power_gpio);
+        if (gpio_is_valid(plat->power_gpio))
                 gpio_free(plat->power_gpio);
-        }
 err_power_req:
 err_no_plat:
         sdhci_pltfm_free(pdev);
@@ -388,21 +379,16 @@ static int __devexit sdhci_tegra_remove(struct platform_device *pdev)
 
         sdhci_remove_host(host, dead);
 
-        if (gpio_is_valid(plat->wp_gpio)) {
-                tegra_gpio_disable(plat->wp_gpio);
+        if (gpio_is_valid(plat->wp_gpio))
                 gpio_free(plat->wp_gpio);
-        }
 
         if (gpio_is_valid(plat->cd_gpio)) {
                 free_irq(gpio_to_irq(plat->cd_gpio), host);
-                tegra_gpio_disable(plat->cd_gpio);
                 gpio_free(plat->cd_gpio);
         }
 
-        if (gpio_is_valid(plat->power_gpio)) {
-                tegra_gpio_disable(plat->power_gpio);
+        if (gpio_is_valid(plat->power_gpio))
                 gpio_free(plat->power_gpio);
-        }
 
         clk_disable(pltfm_host->clk);
         clk_put(pltfm_host->clk);