4 files changed, 36 insertions, 13 deletions

diff --git a/drivers/mmc/exynos_dw_mmc.c b/drivers/mmc/exynos_dw_mmc.c
index c8bf89d6d35..12e37cb4b78 100644
--- a/drivers/mmc/exynos_dw_mmc.c
+++ b/drivers/mmc/exynos_dw_mmc.c
@@ -373,6 +373,12 @@ static const struct udevice_id exynos_dwmmc_ids[] = {
 		.compatible	= "samsung,exynos4412-dw-mshc",
 		.data		= (ulong)&exynos4_drv_data,
 	}, {
+		.compatible	= "samsung,exynos5420-dw-mshc-smu",
+		.data		= (ulong)&exynos5_drv_data,
+	}, {
+		.compatible	= "samsung,exynos5420-dw-mshc",
+		.data		= (ulong)&exynos5_drv_data,
+	}, {
 		.compatible	= "samsung,exynos-dwmmc",
 		.data		= (ulong)&exynos5_drv_data,
 	}, {
diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 90fcf2679bb..928c05872ca 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -155,6 +155,7 @@ static ulong mmc_write_blocks(struct mmc *mmc, lbaint_t start,
 	struct mmc_cmd cmd;
 	struct mmc_data data;
 	int timeout_ms = 1000;
+	int err;
 
 	if ((start + blkcnt) > mmc_get_blk_desc(mmc)->lba) {
 		printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
@@ -181,9 +182,13 @@ static ulong mmc_write_blocks(struct mmc *mmc, lbaint_t start,
 	data.blocksize = mmc->write_bl_len;
 	data.flags = MMC_DATA_WRITE;
 
-	if (mmc_send_cmd(mmc, &cmd, &data)) {
+	err = mmc_send_cmd(mmc, &cmd, &data);
+	if (err) {
 		printf("mmc write failed\n");
-		return 0;
+		/*
+		 * Don't return 0 here since the emmc will still be in data
+		 * transfer mode continue to send the STOP_TRANSMISSION command
+		 */
 	}
 
 	/* SPI multiblock writes terminate using a special
@@ -203,6 +208,9 @@ static ulong mmc_write_blocks(struct mmc *mmc, lbaint_t start,
 	if (mmc_poll_for_busy(mmc, timeout_ms))
 		return 0;
 
+	if (err)
+		return 0;
+
 	return blkcnt;
 }
 
diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c
index 278019f02ab..c80033d8752 100644
--- a/drivers/mmc/s5p_sdhci.c
+++ b/drivers/mmc/s5p_sdhci.c
@@ -141,14 +141,6 @@ static int do_sdhci_init(struct sdhci_host *host)
 		}
 	}
 
-	if (dm_gpio_is_valid(&host->cd_gpio)) {
-		ret = dm_gpio_get_value(&host->cd_gpio);
-		if (ret) {
-			debug("no SD card detected (%d)\n", ret);
-			return -ENODEV;
-		}
-	}
-
 	return s5p_sdhci_core_init(host);
 }
 
@@ -183,8 +175,6 @@ static int sdhci_get_config(const void *blob, int node, struct sdhci_host *host)
 
 	gpio_request_by_name_nodev(offset_to_ofnode(node), "pwr-gpios", 0,
 				   &host->pwr_gpio, GPIOD_IS_OUT);
-	gpio_request_by_name_nodev(offset_to_ofnode(node), "cd-gpios", 0,
-				   &host->cd_gpio, GPIOD_IS_IN);
 
 	return 0;
 }
@@ -236,6 +226,7 @@ static int s5p_sdhci_bind(struct udevice *dev)
 
 static const struct udevice_id s5p_sdhci_ids[] = {
 	{ .compatible = "samsung,exynos4412-sdhci"},
+	{ .compatible = "samsung,exynos4210-sdhci"},
 	{ }
 };
 
diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
index 06c1e09bf26..e28c81afffe 100644
--- a/drivers/mmc/sunxi_mmc.c
+++ b/drivers/mmc/sunxi_mmc.c
@@ -99,6 +99,19 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
 		 */
 		if (IS_ENABLED(CONFIG_MACH_SUN8I_R528))
 			pll_hz /= 2;
+
+		/*
+		 * The A523/T527 uses PERIPH0_400M as the MMC0/1 input clock,
+		 * and PERIPH0_800M for MMC2. There is also the hidden divider
+		 * of 2. The clock code reports 600 MHz for PERIPH0.
+		 * Adjust the calculation accordingly: 600 * hidden2 / 3 for
+		 * MMC0/1, and 600 * hidden2 / 3 * 2 for MMC2.
+		 */
+		if (IS_ENABLED(CONFIG_MACH_SUN55I_A523)) {
+			pll_hz /= 3;
+			if (priv->mmc_no == 2)
+				pll_hz *= 2;
+		}
 	}
 
 	div = pll_hz / hz;
@@ -153,6 +166,10 @@ static int mmc_set_mod_clk(struct sunxi_mmc_priv *priv, unsigned int hz)
 			CCM_MMC_CTRL_SCLK_DLY(sclk_dly);
 	}
 
+	/* The A523 has a second divider, not a shift. */
+	if (IS_ENABLED(CONFIG_MACH_SUN55I_A523))
+		n = (1U << n) - 1;
+
 	writel(CCM_MMC_CTRL_ENABLE| pll | CCM_MMC_CTRL_N(n) |
 	       CCM_MMC_CTRL_M(div) | val, priv->mclkreg);
 
@@ -559,7 +576,8 @@ struct mmc *sunxi_mmc_init(int sdc_no)
 	cfg->host_caps = MMC_MODE_4BIT;
 
 	if ((IS_ENABLED(CONFIG_MACH_SUN50I) || IS_ENABLED(CONFIG_MACH_SUN8I) ||
-	    IS_ENABLED(CONFIG_SUN50I_GEN_H6)) && (sdc_no == 2))
+	    IS_ENABLED(CONFIG_SUN50I_GEN_H6) || IS_ENABLED(CONFIG_MACH_SUN55I_A523)) &&
+	    (sdc_no == 2))
 		cfg->host_caps = MMC_MODE_8BIT;
 
 	cfg->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS;