From 8265e5eb2f4b3efa67aeb19168161dbcc6fecd9b Mon Sep 17 00:00:00 2001 From: Veerabhadrarao Badiganti Date: Tue, 31 Jan 2017 17:09:16 +0530 Subject: [PATCH] mmc: sdhci-msm: Update ICE reset register offset for ICE HCI SDHC v5.0 onwards the ICE reset register offset got updated. Update the register offset based on the SDHC version. Change-Id: I9c1250460cddf72837446b54fe03e3c52f11b234 Signed-off-by: Veerabhadrarao Badiganti --- drivers/mmc/host/sdhci-msm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index cd4fb9431811..b816875057d2 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -3362,8 +3362,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); }