Re: [RESEND PATCHv1 4/8] mmc: sdhci-msm: Reset vendor specific func register on probe

[Adrian Hunter]

On 10/01/17 09:00, Ritesh Harjani wrote:
> From: Venkat Gopalakrishnan <venkatg@xxxxxxxxxxxxxx>
> 
> 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: Venkat Gopalakrishnan <venkatg@xxxxxxxxxxxxxx>
> Signed-off-by: Ritesh Harjani <riteshh@xxxxxxxxxxxxxx>

Acked-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>

> ---
>  drivers/mmc/host/sdhci-msm.c | 15 ++++-----------
>  1 file changed, 4 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
> index 5a37c29..a028568 100644
> --- a/drivers/mmc/host/sdhci-msm.c
> +++ b/drivers/mmc/host/sdhci-msm.c
> @@ -69,6 +69,7 @@
>  #define CORE_DLL_CLOCK_DISABLE	BIT(21)
>  
>  #define CORE_VENDOR_SPEC	0x10c
> +#define CORE_VENDOR_SPEC_POR_VAL	0xa1c
>  #define CORE_CLK_PWRSAVE	BIT(1)
>  #define CORE_HC_MCLK_SEL_DFLT	(2 << 8)
>  #define CORE_HC_MCLK_SEL_HS400	(3 << 8)
> @@ -1197,17 +1198,9 @@ static int sdhci_msm_probe(struct platform_device *pdev)
>  		goto clk_disable;
>  	}
>  
> -	config = readl_relaxed(msm_host->core_mem + CORE_POWER);
> -	config |= CORE_SW_RST;
> -	writel_relaxed(config, msm_host->core_mem + CORE_POWER);
> -
> -	/* 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;
> -	}
> +	/* Reset the vendor spec register to power on reset state */
> +	writel_relaxed(CORE_VENDOR_SPEC_POR_VAL,
> +		       host->ioaddr + CORE_VENDOR_SPEC);
>  
>  	/* Set HC_MODE_EN bit in HC_MODE register */
>  	writel_relaxed(HC_MODE_EN, (msm_host->core_mem + CORE_HC_MODE));
>