Skip to contentSkip to conversation

mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK

PATCH New Stephen Warren 2 participants 4 messages Feb 9, 2013 – Feb 11, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK

SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK does basically the same as implementing struct sdhci_ops .get_timeout_clock, so simply set that quirk and remove the custom code to simplify the driver.

---
 drivers/mmc/host/sdhci-bcm2835.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/mmc/host/sdhci-bcm2835.c +2 -10
index 453825f..21fc735 100644
@@ -133,14 +133,6 @@ unsigned int bcm2835_sdhci_get_min_clock(struct sdhci_host *host)
 	return MIN_FREQ;
 }
 
-unsigned int bcm2835_sdhci_get_timeout_clock(struct sdhci_host *host)
-{
-	struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
-	struct bcm2835_sdhci *bcm2835_host = pltfm_host->priv;
-
-	return clk_get_rate(bcm2835_host->clk);
-}
-
 static struct sdhci_ops bcm2835_sdhci_ops = {
 	.write_l = bcm2835_sdhci_writel,
 	.write_w = bcm2835_sdhci_writew,
@@ -150,11 +142,11 @@ static struct sdhci_ops bcm2835_sdhci_ops = {
 	.read_b = bcm2835_sdhci_readb,
 	.get_max_clock = bcm2835_sdhci_get_max_clock,
 	.get_min_clock = bcm2835_sdhci_get_min_clock,
-	.get_timeout_clock = bcm2835_sdhci_get_timeout_clock,
 };
 
 static struct sdhci_pltfm_data bcm2835_sdhci_pdata = {
-	.quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION,
+	.quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
+			SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
 	.ops = &bcm2835_sdhci_ops,
 };
 
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/1 mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK

Hi Stephen,

Quoted 6 lines · Stephen Warren

SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK does basically the same as implementing struct sdhci_ops .get_timeout_clock, so simply set that quirk and remove the custom code to simplify the driver.

This conflicts with Lars-Peter's larger patch, which I just merged -- I could merge the changes from both, which reduces your patch to this:

drivers/mmc/host/sdhci-bcm2835.c +2 -2
index 1e97b89..8ffea05 100644
@@ -133,11 +133,11 @@ static struct sdhci_ops bcm2835_sdhci_ops = {
 	.read_b = bcm2835_sdhci_readb,
 	.get_max_clock = sdhci_pltfm_clk_get_max_clock,
 	.get_min_clock = bcm2835_sdhci_get_min_clock,
-	.get_timeout_clock = sdhci_pltfm_clk_get_max_clock,
 };
 
 static struct sdhci_pltfm_data bcm2835_sdhci_pdata = {
-	.quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION,
+	.quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION |
+		  SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK,
 	.ops = &bcm2835_sdhci_ops,
 };
 

Thanks,

- Chris.

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

PATCH 1/1 mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK

Quoted 7 lines · Chris Ball

Hi Stephen,

Quoted 4 lines · Stephen Warren

SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK does basically the same as implementing struct sdhci_ops .get_timeout_clock, so simply set that quirk and remove the custom code to simplify the driver.

Quoted 5 lines
Quoted 2 lines

This conflicts with Lars-Peter's larger patch, which I just merged -- I could merge the changes from both, which reduces your patch to this:

Yes, that updated patch looks fine to me.

I thought Lars-Peter was going to update his series on top of this cleanup, but either way is fine.

Thanks.

#3 lore raw

PATCH 1/1 mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK

Hi,

Quoted 11 lines · Stephen Warren
Quoted 10 lines · Chris Ball

Hi Stephen,

Quoted 6 lines · Stephen Warren

SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK does basically the same as implementing struct sdhci_ops .get_timeout_clock, so simply set that quirk and remove the custom code to simplify the driver.

Quoted 7 lines
Quoted 2 lines

This conflicts with Lars-Peter's larger patch, which I just merged -- I could merge the changes from both, which reduces your patch to this:

Yes, that updated patch looks fine to me.

I thought Lars-Peter was going to update his series on top of this cleanup, but either way is fine.

Thanks, pushed the updated patch to mmc-next for 3.9.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child