Merge branch 'fixes' into next

diff --combined drivers/mmc/host/sdhci-of-esdhc.c
index 4abb781,500f70a..cd3b676
--- 1/drivers/mmc/host/sdhci-of-esdhc.c
--- 2/drivers/mmc/host/sdhci-of-esdhc.c
+++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@@ -80,6 -80,7 +80,7 @@@ struct sdhci_esdhc 
        bool quirk_tuning_erratum_type1;
        bool quirk_tuning_erratum_type2;
        bool quirk_ignore_data_inhibit;
+       bool quirk_delay_before_data_reset;
        bool in_sw_tuning;
        unsigned int peripheral_clock;
        const struct esdhc_clk_fixup *clk_fixup;
@@@ -759,6 -760,11 +760,11 @@@ static void esdhc_reset(struct sdhci_ho
        struct sdhci_esdhc *esdhc = sdhci_pltfm_priv(pltfm_host);
        u32 val;
  
+       if (esdhc->quirk_delay_before_data_reset &&
+           (mask & SDHCI_RESET_DATA) &&
+           (host->flags & SDHCI_REQ_USE_DMA))
+               mdelay(5);
+ 
        sdhci_reset(host, mask);
  
        sdhci_writel(host, host->ier, SDHCI_INT_ENABLE);
@@@ -1218,6 -1224,10 +1224,10 @@@ static void esdhc_init(struct platform_
        if (match)
                esdhc->clk_fixup = match->data;
        np = pdev->dev.of_node;
+ 
+       if (of_device_is_compatible(np, "fsl,p2020-esdhc"))
+               esdhc->quirk_delay_before_data_reset = true;
+ 
        clk = of_clk_get(np, 0);
        if (!IS_ERR(clk)) {
                /*
@@@ -1228,8 -1238,7 +1238,8 @@@
                 * 1/2 peripheral clock.
                 */
                if (of_device_is_compatible(np, "fsl,ls1046a-esdhc") ||
 -                  of_device_is_compatible(np, "fsl,ls1028a-esdhc"))
 +                  of_device_is_compatible(np, "fsl,ls1028a-esdhc") ||
 +                  of_device_is_compatible(np, "fsl,ls1088a-esdhc"))
                        esdhc->peripheral_clock = clk_get_rate(clk) / 2;
                else
                        esdhc->peripheral_clock = clk_get_rate(clk);