Merge "mmc: sdhci-msm: Use correct register for toggling FIFO write clk" (7c2bb125) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/mmc/host/sdhci-msm.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -3544,9 +3544,9 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
		* DLL input clock
		*/
		writel_relaxed(((readl_relaxed(host->ioaddr +
		msm_host_offset->CORE_DDR_CONFIG))
		msm_host_offset->CORE_DLL_CONFIG_3))
		\| RCLK_TOGGLE), host->ioaddr +
		msm_host_offset->CORE_DDR_CONFIG);
		msm_host_offset->CORE_DLL_CONFIG_3);
		/* ensure above write as toggling same bit quickly */
		wmb();
		udelay(2);
		@@ -3555,9 +3555,9 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock)
		* DLL input clock
		*/
		writel_relaxed(((readl_relaxed(host->ioaddr +
		msm_host_offset->CORE_DDR_CONFIG))
		msm_host_offset->CORE_DLL_CONFIG_3))
		& ~RCLK_TOGGLE), host->ioaddr +
		msm_host_offset->CORE_DDR_CONFIG);
		msm_host_offset->CORE_DLL_CONFIG_3);
		}
		if (!host->mmc->ios.old_rate && !msm_host->use_cdclp533) {
		/*