|
@@ -110,11 +110,6 @@ static unsigned int sdhci_s3c_get_max_clk(struct sdhci_host *host)
|
|
return max;
|
|
return max;
|
|
}
|
|
}
|
|
|
|
|
|
-static unsigned int sdhci_s3c_get_timeout_clk(struct sdhci_host *host)
|
|
|
|
-{
|
|
|
|
- return sdhci_s3c_get_max_clk(host) / 1000000;
|
|
|
|
-}
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* sdhci_s3c_consider_clock - consider one the bus clocks for current setting
|
|
* sdhci_s3c_consider_clock - consider one the bus clocks for current setting
|
|
* @ourhost: Our SDHCI instance.
|
|
* @ourhost: Our SDHCI instance.
|
|
@@ -188,7 +183,6 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
|
|
|
|
ourhost->cur_clk = best_src;
|
|
ourhost->cur_clk = best_src;
|
|
host->max_clk = clk_get_rate(clk);
|
|
host->max_clk = clk_get_rate(clk);
|
|
- host->timeout_clk = sdhci_s3c_get_timeout_clk(host);
|
|
|
|
|
|
|
|
ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
|
|
ctrl = readl(host->ioaddr + S3C_SDHCI_CONTROL2);
|
|
ctrl &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
|
|
ctrl &= ~S3C_SDHCI_CTRL2_SELBASECLK_MASK;
|
|
@@ -211,7 +205,6 @@ static void sdhci_s3c_set_clock(struct sdhci_host *host, unsigned int clock)
|
|
|
|
|
|
static struct sdhci_ops sdhci_s3c_ops = {
|
|
static struct sdhci_ops sdhci_s3c_ops = {
|
|
.get_max_clock = sdhci_s3c_get_max_clk,
|
|
.get_max_clock = sdhci_s3c_get_max_clk,
|
|
- .get_timeout_clock = sdhci_s3c_get_timeout_clk,
|
|
|
|
.set_clock = sdhci_s3c_set_clock,
|
|
.set_clock = sdhci_s3c_set_clock,
|
|
};
|
|
};
|
|
|
|
|
|
@@ -335,6 +328,9 @@ static int __devinit sdhci_s3c_probe(struct platform_device *pdev)
|
|
host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |
|
|
host->quirks |= (SDHCI_QUIRK_32BIT_DMA_ADDR |
|
|
SDHCI_QUIRK_32BIT_DMA_SIZE);
|
|
SDHCI_QUIRK_32BIT_DMA_SIZE);
|
|
|
|
|
|
|
|
+ /* HSMMC on Samsung SoCs uses SDCLK as timeout clock */
|
|
|
|
+ host->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK;
|
|
|
|
+
|
|
ret = sdhci_add_host(host);
|
|
ret = sdhci_add_host(host);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(dev, "sdhci_add_host() failed\n");
|
|
dev_err(dev, "sdhci_add_host() failed\n");
|