Commit 5574ddcc authored by Venkat Gopalakrishnan's avatar Venkat Gopalakrishnan Committed by Ulf Hansson

mmc: sdhci-msm: Reset vendor specific func register on probe

The vendor specific func register doesn't get reset when using the
software reset register. The various bootloader's could leave this
in an unknown state, hence reset this register to it's power on reset
value during probe.
Signed-off-by: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
Signed-off-by: default avatarRitesh Harjani <riteshh@codeaurora.org>
Tested-by: default avatarJeremy McNicoll <jeremymc@redhat.com>
Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent db9bd163
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
#define CORE_DLL_CLOCK_DISABLE BIT(21) #define CORE_DLL_CLOCK_DISABLE BIT(21)
#define CORE_VENDOR_SPEC 0x10c #define CORE_VENDOR_SPEC 0x10c
#define CORE_VENDOR_SPEC_POR_VAL 0xa1c
#define CORE_CLK_PWRSAVE BIT(1) #define CORE_CLK_PWRSAVE BIT(1)
#define CORE_HC_MCLK_SEL_DFLT (2 << 8) #define CORE_HC_MCLK_SEL_DFLT (2 << 8)
#define CORE_HC_MCLK_SEL_HS400 (3 << 8) #define CORE_HC_MCLK_SEL_HS400 (3 << 8)
...@@ -1197,17 +1198,9 @@ static int sdhci_msm_probe(struct platform_device *pdev) ...@@ -1197,17 +1198,9 @@ static int sdhci_msm_probe(struct platform_device *pdev)
goto clk_disable; goto clk_disable;
} }
config = readl_relaxed(msm_host->core_mem + CORE_POWER); /* Reset the vendor spec register to power on reset state */
config |= CORE_SW_RST; writel_relaxed(CORE_VENDOR_SPEC_POR_VAL,
writel_relaxed(config, msm_host->core_mem + CORE_POWER); host->ioaddr + CORE_VENDOR_SPEC);
/* SW reset can take upto 10HCLK + 15MCLK cycles. (min 40us) */
usleep_range(1000, 5000);
if (readl(msm_host->core_mem + CORE_POWER) & CORE_SW_RST) {
dev_err(&pdev->dev, "Stuck in reset\n");
ret = -ETIMEDOUT;
goto clk_disable;
}
/* Set HC_MODE_EN bit in HC_MODE register */ /* Set HC_MODE_EN bit in HC_MODE register */
writel_relaxed(HC_MODE_EN, (msm_host->core_mem + CORE_HC_MODE)); writel_relaxed(HC_MODE_EN, (msm_host->core_mem + CORE_HC_MODE));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment