Skip to contentSkip to conversation

sdhci-s3c: Add support S5PV310/S5PC210 HSMMC

PATCH New Kukjin Kim 3 participants 6 messages Sep 17, 2010 – Sep 28, 2010

Subsystems (4)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

v2 cover sdhci-s3c: Add support S5PV310/S5PC210 HSMMC

This patch adds support S5PV310/S5PC210 HSMMC and additional host capabilities.

HSMMC of S5PV310 does not have internal clock divider so need to update for it. (used SDHCI_QUIRK_NONSTANDARD_CLOCK quirk and added clk_type plat data)

Changes since v1:
- Separated to each topic

[PATCH v2 1/2] sdhci-s3c: Add support additional host capabilities [PATCH v2 2/2] sdhci-s3c: Add support no internal clock divider in host controller

author
#1 lore raw

PATCH v2 1/2 sdhci-s3c: Add support additional host capabilities

From: Jeongbae Seo <[email protected]>

This patch adds to support additional host capabilities like SD/MMC high speed, SDHCI bus width and etc.

---
 drivers/mmc/host/sdhci-s3c.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-s3c.c +4 -0
index 71ad416..e6e0438 100644
@@ -425,6 +425,10 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 	/* HSMMC on Samsung SoCs uses SDCLK as timeout clock */
 	host->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK;
 
+	/* It supports additional host capabilities if needed */
+	if (pdata->host_caps)
+		host->mmc->caps |= pdata->host_caps;
+
 	ret = sdhci_add_host(host);
 	if (ret) {
 		dev_err(dev, "sdhci_add_host() failed\n");
Signature · 1 line
1.6.2.5
author
#2 lore raw

PATCH v2 2/2 sdhci-s3c: Add support no internal clock divider in host controller

In reply to Kukjin Kim

From: Hyuk Lee <[email protected]>

This patch adds to support no internal clock divider in SDHCI. The external clock divider can be used to make a proper clock because SDHCI doesn't support internal clock divider by itself.

---
 drivers/mmc/host/sdhci-s3c.c |   60 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-s3c.c +60 -0
index e6e0438..5ad5ed7 100644
@@ -96,6 +96,13 @@ static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)
 	unsigned int rate, max;
 	int clk;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock divider
+	 * in the host controller
+	 */
+	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
+		return clk_round_rate(ourhost->clk_bus[2], UINT_MAX);
+
 	/* note, a reset will reset the clock source */
 
 	sdhci_s3c_check_sclk(host);
@@ -130,6 +137,15 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
 	if (!clksrc)
 		return UINT_MAX;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock divider
+	 * in the host controller
+	 */
+	if (ourhost->host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+		rate = clk_round_rate(clksrc, wanted);
+		return wanted - rate;
+	}
+
 	rate = clk_get_rate(clksrc);
 
 	for (div = 1; div < 256; div *= 2) {
@@ -159,6 +175,7 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
 	int best_src = 0;
 	int src;
 	u32 ctrl;
+	unsigned int timeout;
 
 	/* don't bother if the clock is going off. */
 	if (clock == 0)
@@ -204,6 +221,35 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
 			(ourhost->pdata->cfg_card)(ourhost->pdev, host->ioaddr,
 						   &ios, NULL);
 	}
+
+	/*
+	 * There is only one clock source(sclk) if there is no clock divider
+	 * in the host controller
+	 */
+	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+		writew(0, host->ioaddr + SDHCI_CLOCK_CONTROL);
+		clk_set_rate(ourhost->clk_bus[ourhost->cur_clk], clock);
+
+		writew(SDHCI_CLOCK_INT_EN, host->ioaddr + SDHCI_CLOCK_CONTROL);
+
+		/* Wait max 20 ms */
+		timeout = 20;
+		while (!((sdhci_readw(host, SDHCI_CLOCK_CONTROL))
+			& SDHCI_CLOCK_INT_STABLE)) {
+			if (timeout == 0) {
+				printk(KERN_ERR "%s: clock never stabilised.\n"
+						, mmc_hostname(host->mmc));
+				return;
+			}
+			timeout--;
+			mdelay(1);
+		}
+
+		writew(SDHCI_CLOCK_INT_EN | SDHCI_CLOCK_CARD_EN,
+				host->ioaddr + SDHCI_CLOCK_CONTROL);
+
+		host->clock = clock;
+	}
 }
 
 /**
@@ -221,6 +267,13 @@ static unsigned int sdhci_s3c_get_min_clock(struct sdhci_host *host)
 	unsigned int delta, min = UINT_MAX;
 	int src;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock divider
+	 * in the host controller
+	 */
+	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
+		return clk_round_rate(ourhost->clk_bus[2], 400000);
+
 	for (src = 0; src < MAX_BUS_CLK; src++) {
 		delta = sdhci_s3c_consider_clock(ourhost, src, 0);
 		if (delta == UINT_MAX)
@@ -425,6 +478,13 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
 	/* HSMMC on Samsung SoCs uses SDCLK as timeout clock */
 	host->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK;
 
+	/*
+	 * If controller does not have internal clock divider,
+	 * we need to use another method with setup a quirk.
+	 */
+	if (pdata->clk_type)
+		host->quirks |= SDHCI_QUIRK_NONSTANDARD_CLOCK;
+
 	/* It supports additional host capabilities if needed */
 	if (pdata->host_caps)
 		host->mmc->caps |= pdata->host_caps;
Signature · 1 line
1.6.2.5
#3 lore raw

PATCH v2 2/2 sdhci-s3c: Add support no internal clock divider in host controller

Quoted 18 lines · Kukjin Kim

From: Hyuk Lee <[email protected]>

This patch adds to support no internal clock divider in SDHCI. The external clock divider can be used to make a proper clock because SDHCI doesn't support internal clock divider by itself.

---
 drivers/mmc/host/sdhci-s3c.c |   60 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 60 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-s3c.c +0 -0
index e6e0438..5ad5ed7 100644

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host) · line 104

Quoted 9 lines
drivers/mmc/host/sdhci-s3c.c +6 -0
@@ -96,6 +96,13 @@ static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)
 	unsigned int rate, max;
 	int clk;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock divider
+	 * in the host controller
+	 */
+	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
+		return clk_round_rate(ourhost->clk_bus[2], UINT_MAX);

interesting, <linux/clk.h> doesn't have a second parameter to clk_round_rate().

Quoted 5 lines
drivers/mmc/host/sdhci-s3c.c +0 -0
 	/* note, a reset will reset the clock source */
 
 	sdhci_s3c_check_sclk(host);
@@ -130,6 +137,15 @@ static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,
 	if (!clksrc)

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost, · line 147

Quoted 10 lines
drivers/mmc/host/sdhci-s3c.c +8 -0
 		return UINT_MAX;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock divider
+	 * in the host controller
+	 */
+	if (ourhost->host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+		rate = clk_round_rate(clksrc, wanted);
+		return wanted - rate;
+	}

Why does this need a quirk, instead of just having one clock available in the list of usable clocks?

Signature · 1 line
Ben
#4 lore raw

PATCH v2 2/2 sdhci-s3c: Add support no internal clock divider in host controller

Ben Dooks worte:

Quoted 27 lines · Kukjin Kim
Quoted 11 lines

From: Hyuk Lee <[email protected]>

This patch adds to support no internal clock divider in SDHCI. The external clock divider can be used to make a proper clock because SDHCI doesn't support internal clock divider by itself.

---
 drivers/mmc/host/sdhci-s3c.c |   60

++++++++++++++++++++++++++++++++++++++++++

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct

Quoted 7 lines
 1 files changed, 60 insertions(+), 0 deletions(-)
drivers/mmc/host/sdhci-s3c.c +0 -0
index e6e0438..5ad5ed7 100644
@@ -96,6 +96,13 @@ static unsigned int sdhci_s3c_get_max_clk(struct

sdhci_host *host)

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)

Quoted 5 lines
drivers/mmc/host/sdhci-s3c.c +2 -0
 	unsigned int rate, max;
 	int clk;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock

divider

Quoted 8 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host) · line 104

Quoted 4 lines
drivers/mmc/host/sdhci-s3c.c +4 -0
+	 * in the host controller
+	 */
+	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
+		return clk_round_rate(ourhost->clk_bus[2], UINT_MAX);

interesting, <linux/clk.h> doesn't have a second parameter to clk_round_rate().

Hi Ben,

Thanks for your comments.

When I see clk_round_rate in <linux/clk.h>, which function is defined as "long clk_round_rate(struct clk *clk, unsigned long rate)" that has two parameters.
Please let me know if you have another meaning for this.

Quoted 12 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_consider_clock(struct

Quoted 5 lines
drivers/mmc/host/sdhci-s3c.c +0 -0
 	/* note, a reset will reset the clock source */
 
 	sdhci_s3c_check_sclk(host);
@@ -130,6 +137,15 @@ static unsigned int sdhci_s3c_consider_clock(struct

sdhci_s3c *ourhost,

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,

Quoted 5 lines
drivers/mmc/host/sdhci-s3c.c +2 -0
 	if (!clksrc)
 		return UINT_MAX;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock

divider

Quoted 10 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost, · line 147

Quoted 6 lines
drivers/mmc/host/sdhci-s3c.c +6 -0
+	 * in the host controller
+	 */
+	if (ourhost->host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+		rate = clk_round_rate(clksrc, wanted);
+		return wanted - rate;
+	}

Why does this need a quirk, instead of just having one clock available in the list of usable clocks?

The available clock is made by dividing a clock source with a certain divider value.
Most of the host controller has this capability that can divide a clock what we want.
However, the host controller of both S5PC210 and S5PV310 don't have this so we have to
Add additional routine to make a proper clock with outland clock divider instead of
Internal clock divider in host controller.

Best Regards,
Jeongbae Seo

author
#5 lore raw

PATCH v2 2/2 sdhci-s3c: Add support no internal clock divider in host controller

Quoted 14 lines · Jeongbae Seo

Ben Dooks worte:

Quoted 12 lines · Kukjin Kim
Quoted 11 lines

From: Hyuk Lee <[email protected]>

This patch adds to support no internal clock divider in SDHCI. The external clock divider can be used to make a proper clock because SDHCI doesn't support internal clock divider by itself.

---
 drivers/mmc/host/sdhci-s3c.c |   60
Quoted 4 lines
Quoted 4 lines

++++++++++++++++++++++++++++++++++++++++++

Review

Quoted 3 lines
 1 files changed, 60 insertions(+), 0 deletions(-)
(quoted diff) +0 -0

b/drivers/mmc/host/sdhci-s3c.c

Quoted 29 lines
Quoted 11 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct

Quoted 4 lines

index e6e0438..5ad5ed7 100644

drivers/mmc/host/sdhci-s3c.c +0 -0
@@ -96,6 +96,13 @@ static unsigned int sdhci_s3c_get_max_clk(struct

sdhci_host *host)

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)

Quoted 5 lines
drivers/mmc/host/sdhci-s3c.c +2 -0
 	unsigned int rate, max;
 	int clk;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock

divider

Quoted 8 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host) · line 104

Quoted 4 lines
drivers/mmc/host/sdhci-s3c.c +4 -0
+	 * in the host controller
+	 */
+	if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK)
+		return clk_round_rate(ourhost->clk_bus[2], UINT_MAX);

interesting, <linux/clk.h> doesn't have a second parameter to clk_round_rate().

Hi Ben,

Thanks for your comments.

When I see clk_round_rate in <linux/clk.h>, which function is defined as "long clk_round_rate(struct clk *clk, unsigned long rate)" that has two parameters.
Please let me know if you have another meaning for this.

Quoted 1 line
Quoted 4 lines
Quoted 4 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int

Quoted 4 lines
drivers/mmc/host/sdhci-s3c.c +0 -0
 	/* note, a reset will reset the clock source */
 
 	sdhci_s3c_check_sclk(host);
@@ -130,6 +137,15 @@ static unsigned int

sdhci_s3c_consider_clock(struct

Quoted 18 lines
Quoted 7 lines

sdhci_s3c *ourhost,

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost,

Quoted 5 lines
drivers/mmc/host/sdhci-s3c.c +2 -0
 	if (!clksrc)
 		return UINT_MAX;
 
+	/*
+	 * There is only one clock source(sclk) if there is no clock

divider

Quoted 10 lines

drivers/mmc/host/sdhci-s3c.c static unsigned int sdhci_s3c_consider_clock(struct sdhci_s3c *ourhost, · line 147

Quoted 6 lines
drivers/mmc/host/sdhci-s3c.c +6 -0
+	 * in the host controller
+	 */
+	if (ourhost->host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK) {
+		rate = clk_round_rate(clksrc, wanted);
+		return wanted - rate;
+	}

Why does this need a quirk, instead of just having one clock available in the list of usable clocks?

Quoted 3 lines

The available clock is made by dividing a clock source with a certain divider value.
Most of the host controller has this capability that can divide a clock

what

Quoted 2 lines

we want.
However, the host controller of both S5PC210 and S5PV310 don't have this

so

Quoted 5 lines

we have to
Add additional routine to make a proper clock with outland clock divider instead of
Internal clock divider in host controller.

Hi Ben,

If any your suggestion in this case, S5PV310/S5PC210 has no clock divider in the HSMMC IP block, please kindly let me know. Will address comments from you.

As you know, there are many solution for this...But I'd like to use your preference in here.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.