From: Stephen Warren Date: Sat, 9 Feb 2013 03:56:27 +0000 (-0700) Subject: mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK X-Git-Tag: next-20130218~55^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e962206b4c4a46a1e972f17c4c441c637b8bbd4c;p=karo-tx-linux.git 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. Reported-by: Lars-Peter Clausen Signed-off-by: Stephen Warren Signed-off-by: Chris Ball --- diff --git a/drivers/mmc/host/sdhci-bcm2835.c b/drivers/mmc/host/sdhci-bcm2835.c index 1e97b89dac66..8ffea05152c6 100644 --- a/drivers/mmc/host/sdhci-bcm2835.c +++ b/drivers/mmc/host/sdhci-bcm2835.c @@ -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, };