Skip to contentSkip to conversation

mmc: sdhci-s3c: fix the wrong register value, when clock is disabled

PATCH In review Jaehoon Chung 2 participants 2 messages Aug 2, 2013 – Aug 30, 2013

Subsystems (3)
lore
Share & tools
lore

Jaehoon Chung

author maintainer
#0 lore raw

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

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)

---
Changelog v2:
- modified the comment

 drivers/mmc/host/sdhci-s3c.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-s3c.c +5 -2
index 926aaf6..1572b6a 100644
@@ -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);
 
Signature · 1 line
1.7.9.5
#1 lore raw

Hi Jaehoon,

Quoted 21 lines · 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)

---
Changelog v2:
- modified the comment

 drivers/mmc/host/sdhci-s3c.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/mmc/host/sdhci-s3c.c +0 -0
index 926aaf6..1572b6a 100644
@@ -296,9 +296,12 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 	unsigned long timeout;
 	u16 clk = 0;
 

drivers/mmc/host/sdhci-s3c.c static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock) · line 306

Quoted 10 lines
drivers/mmc/host/sdhci-s3c.c +5 -2
-	/* 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.

Signature · 1 line
Chris Ball   <[email protected]>   <http://printf.net/>