Commit 1cfd0a3e authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.7-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.8.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 67380251 8abf77c8

drivers/mmc/host/sdhci-sprd.c

+7 −3
Original line number Diff line number Diff line
@@ -239,15 +239,19 @@ static inline void _sdhci_sprd_set_clock(struct sdhci_host *host, 
	div = ((div & 0x300) >> 2) | ((div & 0xFF) << 8);

	sdhci_enable_clk(host, div);



	val = sdhci_readl(host, SDHCI_SPRD_REG_32_BUSY_POSI);

	mask = SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN | SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN;

	/* Enable CLK_AUTO when the clock is greater than 400K. */

	if (clk > 400000) {

		val = sdhci_readl(host, SDHCI_SPRD_REG_32_BUSY_POSI);

		mask = SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN |

			SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN;

		if (mask != (val & mask)) {

			val |= mask;

			sdhci_writel(host, val, SDHCI_SPRD_REG_32_BUSY_POSI);

		}

	} else {

		if (val & mask) {

			val &= ~mask;

			sdhci_writel(host, val, SDHCI_SPRD_REG_32_BUSY_POSI);

		}

	}

}