[PATCH v2 1/4] mmc: sdhci-s3c: fix the wrong register value, when clock is disabled

[PATCH v2 1/4] mmc: sdhci-s3c: fix the wrong register value, when clock is disabled

[Jaehoon Chung]

When use the QUIRK_NONSTANDARD_CLOCK, then never set to 0 at clock control register.
This patch is fixed this problem.
([PATCHv2] mmc: sdhci-s3c: fix teh wrong register value, when clock is disabled)

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
Changelog v2:
	- modified the comment

 drivers/mmc/host/sdhci-s3c.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 926aaf6..1572b6a 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -296,9 +296,12 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 	unsigned long timeout;
 	u16 clk = 0;
 
-	/* don't bother if the clock is going off */
-	if (clock == 0)
+	/* If the clock is going off, set to 0 at clock control register */
+	if (clock == 0) {
+		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
+		host->clock = clock;
 		return;
+	}
 
 	sdhci_s3c_set_clock(host, clock);
 
-- 
1.7.9.5

Re: [PATCH v2 1/4] mmc: sdhci-s3c: fix the wrong register value, when clock is disabled

[Chris Ball]

Hi Jaehoon,

On Fri, Aug 02 2013, Jaehoon Chung wrote:
> When use the QUIRK_NONSTANDARD_CLOCK, then never set to 0 at clock control register.
> This patch is fixed this problem.
> ([PATCHv2] mmc: sdhci-s3c: fix teh wrong register value, when clock is disabled)
>
> Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> Changelog v2:
> 	- modified the comment
>
>  drivers/mmc/host/sdhci-s3c.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
> index 926aaf6..1572b6a 100644
> --- a/drivers/mmc/host/sdhci-s3c.c
> +++ b/drivers/mmc/host/sdhci-s3c.c
> @@ -296,9 +296,12 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
>  	unsigned long timeout;
>  	u16 clk = 0;
>  
> -	/* don't bother if the clock is going off */
> -	if (clock == 0)
> +	/* If the clock is going off, set to 0 at clock control register */
> +	if (clock == 0) {
> +		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
> +		host->clock = clock;
>  		return;
> +	}
>  
>  	sdhci_s3c_set_clock(host, clock);

Thanks, pushed to mmc-next for 3.12.

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>