Merge remote-tracking branch 'remotes/origin/at91-4.14-trunk/mmc' into linux-4.14-at91

Author: cristibirsan

drivers/mmc/host/sdhci-of-at91.c

@@ -166,6 +166,19 @@ static int sdhci_at91_set_clks_presets(struct device *dev)
 	clk_prepare_enable(priv->hclock);
 	caps0 = readl(host->ioaddr + SDHCI_CAPABILITIES);
 	caps1 = readl(host->ioaddr + SDHCI_CAPABILITIES_1);
+
+	/*
+	 * We experience some issues with SDR104. If the SD clock is higher
+	 * than 100 MHz, we can get data corruption. With a 100 MHz clock,
+	 * the tuning procedure may fail. For those reasons, it is useless to
+	 * advertise that we can use SDR104 mode, so remove it from
+	 * the capabilities.
+	 */
+	writel(SDMMC_CACR_KEY | SDMMC_CACR_CAPWREN, host->ioaddr + SDMMC_CACR);
+	caps1 &= (~SDHCI_SUPPORT_SDR104);
+	writel(caps1, host->ioaddr + SDHCI_CAPABILITIES_1);
+	writel(0, host->ioaddr + SDMMC_CACR);
+
 	clk_base = (caps0 & SDHCI_CLOCK_V3_BASE_MASK) >> SDHCI_CLOCK_BASE_SHIFT;
 	clk_mul = (caps1 & SDHCI_CLOCK_MUL_MASK) >> SDHCI_CLOCK_MUL_SHIFT;
 	gck_rate = clk_base * 1000000 * (clk_mul + 1);
@@ -402,6 +415,8 @@ static int sdhci_at91_probe(struct platform_device *pdev)
 	if (host->mmc->caps & MMC_CAP_NONREMOVABLE)
 		sdhci_at91_set_force_card_detect(host);
 
+	device_init_wakeup(&pdev->dev, true);
+
 	pm_runtime_put_autosuspend(&pdev->dev);
 
 	return 0;

drivers/mmc/host/sdhci.c

@@ -2151,8 +2151,17 @@ static void __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode)
 		sdhci_send_tuning(host, opcode);
 
 		if (!host->tuning_done) {
-			pr_info("%s: Tuning timeout, falling back to fixed sampling clock\n",
-				mmc_hostname(host->mmc));
+			/*
+			 * Tuning for DDR50 mode appeared in the SD 3.0.1
+			 * specification. If the card is only compliant with
+			 * SD 3.0 and not SD 3.0.1 (as most of the SD cards),
+			 * CMD19 will fail. In this case, the failure is not
+			 * an error. It's useless to display that we fall back
+			 * to fixed sampling clock at each tuning procedure.
+			 */
+			if (host->timing != MMC_TIMING_UHS_DDR50)
+				pr_info("%s: Tuning timeout, falling back to fixed sampling clock\n",
+					mmc_hostname(host->mmc));
 			sdhci_abort_tuning(host, opcode);
 			return;
 		}