sdhci-of: fix high-speed cards recognition
eSDHC fails to recognize some SDHS cards, throwing timeout errors: mmc0: error -110 whilst initialising SD card That's because we calculate timeout value in a wrong way: on eSDHC hosts the timeout clock is derivied from the SD clock, which is set dynamically. As David Vrabel suggested, deriving timeout clock from SD clock is a common scheme, so let's implement DATA_TIMEOUT_USES_SDCLK quirk and use it for eSDHC hosts. Also, from now on we don't need esdhc_get_timeout_clock() callback, so remove it. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Cc: Pierre Ossman <pierre@ossman.eu> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: David Vrabel <david.vrabel@csr.com> Cc: Ben Dooks <ben@fluff.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
c085926985
commit
81b3980246
|
@ -172,19 +172,13 @@ static unsigned int esdhc_get_min_clock(struct sdhci_host *host)
|
||||||
return of_host->clock / 256 / 16;
|
return of_host->clock / 256 / 16;
|
||||||
}
|
}
|
||||||
|
|
||||||
static unsigned int esdhc_get_timeout_clock(struct sdhci_host *host)
|
|
||||||
{
|
|
||||||
struct sdhci_of_host *of_host = sdhci_priv(host);
|
|
||||||
|
|
||||||
return of_host->clock / 1000;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct sdhci_of_data sdhci_esdhc = {
|
static struct sdhci_of_data sdhci_esdhc = {
|
||||||
.quirks = SDHCI_QUIRK_FORCE_BLK_SZ_2048 |
|
.quirks = SDHCI_QUIRK_FORCE_BLK_SZ_2048 |
|
||||||
SDHCI_QUIRK_BROKEN_CARD_DETECTION |
|
SDHCI_QUIRK_BROKEN_CARD_DETECTION |
|
||||||
SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
|
SDHCI_QUIRK_INVERTED_WRITE_PROTECT |
|
||||||
SDHCI_QUIRK_NO_BUSY_IRQ |
|
SDHCI_QUIRK_NO_BUSY_IRQ |
|
||||||
SDHCI_QUIRK_NONSTANDARD_CLOCK |
|
SDHCI_QUIRK_NONSTANDARD_CLOCK |
|
||||||
|
SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK |
|
||||||
SDHCI_QUIRK_PIO_NEEDS_DELAY |
|
SDHCI_QUIRK_PIO_NEEDS_DELAY |
|
||||||
SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET |
|
SDHCI_QUIRK_RESTORE_IRQS_AFTER_RESET |
|
||||||
SDHCI_QUIRK_NO_CARD_NO_RESET,
|
SDHCI_QUIRK_NO_CARD_NO_RESET,
|
||||||
|
@ -199,7 +193,6 @@ static struct sdhci_of_data sdhci_esdhc = {
|
||||||
.enable_dma = esdhc_enable_dma,
|
.enable_dma = esdhc_enable_dma,
|
||||||
.get_max_clock = esdhc_get_max_clock,
|
.get_max_clock = esdhc_get_max_clock,
|
||||||
.get_min_clock = esdhc_get_min_clock,
|
.get_min_clock = esdhc_get_min_clock,
|
||||||
.get_timeout_clock = esdhc_get_timeout_clock,
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -591,6 +591,9 @@ static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_data *data)
|
||||||
target_timeout = data->timeout_ns / 1000 +
|
target_timeout = data->timeout_ns / 1000 +
|
||||||
data->timeout_clks / host->clock;
|
data->timeout_clks / host->clock;
|
||||||
|
|
||||||
|
if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
|
||||||
|
host->timeout_clk = host->clock / 1000;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Figure out needed cycles.
|
* Figure out needed cycles.
|
||||||
* We do this in steps in order to fit inside a 32 bit int.
|
* We do this in steps in order to fit inside a 32 bit int.
|
||||||
|
@ -1757,13 +1760,15 @@ int sdhci_add_host(struct sdhci_host *host)
|
||||||
host->timeout_clk =
|
host->timeout_clk =
|
||||||
(caps & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
|
(caps & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
|
||||||
if (host->timeout_clk == 0) {
|
if (host->timeout_clk == 0) {
|
||||||
if (!host->ops->get_timeout_clock) {
|
if (host->ops->get_timeout_clock) {
|
||||||
|
host->timeout_clk = host->ops->get_timeout_clock(host);
|
||||||
|
} else if (!(host->quirks &
|
||||||
|
SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
|
||||||
printk(KERN_ERR
|
printk(KERN_ERR
|
||||||
"%s: Hardware doesn't specify timeout clock "
|
"%s: Hardware doesn't specify timeout clock "
|
||||||
"frequency.\n", mmc_hostname(mmc));
|
"frequency.\n", mmc_hostname(mmc));
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
host->timeout_clk = host->ops->get_timeout_clock(host);
|
|
||||||
}
|
}
|
||||||
if (caps & SDHCI_TIMEOUT_CLK_UNIT)
|
if (caps & SDHCI_TIMEOUT_CLK_UNIT)
|
||||||
host->timeout_clk *= 1000;
|
host->timeout_clk *= 1000;
|
||||||
|
|
|
@ -232,6 +232,8 @@ struct sdhci_host {
|
||||||
#define SDHCI_QUIRK_FORCE_1_BIT_DATA (1<<22)
|
#define SDHCI_QUIRK_FORCE_1_BIT_DATA (1<<22)
|
||||||
/* Controller needs 10ms delay between applying power and clock */
|
/* Controller needs 10ms delay between applying power and clock */
|
||||||
#define SDHCI_QUIRK_DELAY_AFTER_POWER (1<<23)
|
#define SDHCI_QUIRK_DELAY_AFTER_POWER (1<<23)
|
||||||
|
/* Controller uses SDCLK instead of TMCLK for data timeouts */
|
||||||
|
#define SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK (1<<24)
|
||||||
|
|
||||||
int irq; /* Device IRQ */
|
int irq; /* Device IRQ */
|
||||||
void __iomem * ioaddr; /* Mapped address */
|
void __iomem * ioaddr; /* Mapped address */
|
||||||
|
|
Loading…
Reference in a new issue