Skip to contentSkip to conversation

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

PATCH In review Jaehoon Chung 2 participants 4 messages May 27, 2013 – Jun 28, 2013

Subsystems (3)
lore
Share & tools
lore

Jaehoon Chung

author maintainer
#0 lore raw

PATCH v2 1/1 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.

---
Changelog v2:
- Rebased at the latest mmc tree

 drivers/mmc/host/sdhci-s3c.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-s3c.c +4 -1
index 926aaf6..ce71f32 100644
@@ -297,8 +297,11 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 	u16 clk = 0;
 
 	/* don't bother if the clock is going off */
-	if (clock == 0)
+	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
author maintainer
#1 lore raw

Dear Chris,

If you didn't have any comment, Could you merge this patch, plz?

Best Regards,
Jaehoon Chung

Quoted 30 lines · Jaehoon Chung

When use the QUIRK_NONSTANDARD_CLOCK, then never set to 0 at clock control register. This patch is fixed this problem.

---
Changelog v2:
- Rebased at the latest mmc tree

 drivers/mmc/host/sdhci-s3c.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-s3c.c +4 -1
index 926aaf6..ce71f32 100644
@@ -297,8 +297,11 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 	u16 clk = 0;
 
 	/* don't bother if the clock is going off */
-	if (clock == 0)
+	if (clock == 0) {
+		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
+		host->clock = clock;
 		return;
+	}
 
 	sdhci_s3c_set_clock(host, clock);
 
#2 lore raw
In reply to Jaehoon Chung

Hi Jaehoon,

Quoted 18 lines · Jaehoon Chung

When use the QUIRK_NONSTANDARD_CLOCK, then never set to 0 at clock control register. This patch is fixed this problem.

---
Changelog v2:
- Rebased at the latest mmc tree

 drivers/mmc/host/sdhci-s3c.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-s3c.c +0 -0
index 926aaf6..ce71f32 100644
@@ -297,8 +297,11 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 	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 +4 -1
 
 	/* don't bother if the clock is going off */
-	if (clock == 0)
+	if (clock == 0) {
+		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
+		host->clock = clock;
 		return;
+	}
 
 	sdhci_s3c_set_clock(host, clock);

You should change the comment too, since your patch invalidates it.

Thanks,

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
author maintainer
#3 lore raw

Dear Chris,

I will change the comment, and re-send the patch.
Thanks Chris.

Best Regards,
Jaehoon Chung

Quoted 38 lines · Chris Ball

Hi Jaehoon,

Quoted 18 lines · Jaehoon Chung

When use the QUIRK_NONSTANDARD_CLOCK, then never set to 0 at clock control register. This patch is fixed this problem.

---
Changelog v2:
- Rebased at the latest mmc tree

 drivers/mmc/host/sdhci-s3c.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/mmc/host/sdhci-s3c.c +0 -0
index 926aaf6..ce71f32 100644
@@ -297,8 +297,11 @@ static void sdhci_cmu_set_clock(struct sdhci_host *host, unsigned int clock)
 	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 +4 -1
 
 	/* don't bother if the clock is going off */
-	if (clock == 0)
+	if (clock == 0) {
+		sdhci_writew(host, 0, SDHCI_CLOCK_CONTROL);
+		host->clock = clock;
 		return;
+	}
 
 	sdhci_s3c_set_clock(host, clock);

You should change the comment too, since your patch invalidates it.

Thanks,

- Chris.