Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8478b98 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: sdhci-msm: Update ICE reset register offset for ICE HCI"

parents d8dbdec2 8265e5eb

drivers/mmc/host/sdhci-msm.c

+8 −2
Original line number Diff line number Diff line
@@ -3379,8 +3379,14 @@ void sdhci_msm_reset(struct sdhci_host *host, u8 mask) 
	struct sdhci_msm_host *msm_host = pltfm_host->priv;



	/* Set ICE core to be reset in sync with SDHC core */

	if (msm_host->ice.pdev)

		writel_relaxed(1, host->ioaddr + CORE_VENDOR_SPEC_ICE_CTRL);

	if (msm_host->ice.pdev) {

		if (msm_host->ice_hci_support)

			writel_relaxed(1, host->ioaddr +

						HC_VENDOR_SPECIFIC_ICE_CTRL);

		else

			writel_relaxed(1,

				host->ioaddr + CORE_VENDOR_SPEC_ICE_CTRL);

	}



	sdhci_reset(host, mask);

}