|
@@ -707,19 +707,28 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host)
|
|
|
sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);
|
|
|
}
|
|
|
|
|
|
-static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
|
|
|
+static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
|
|
|
{
|
|
|
u8 count;
|
|
|
+
|
|
|
+ if (host->ops->set_timeout) {
|
|
|
+ host->ops->set_timeout(host, cmd);
|
|
|
+ } else {
|
|
|
+ count = sdhci_calc_timeout(host, cmd);
|
|
|
+ sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
|
|
|
+{
|
|
|
u8 ctrl;
|
|
|
struct mmc_data *data = cmd->data;
|
|
|
int ret;
|
|
|
|
|
|
WARN_ON(host->data);
|
|
|
|
|
|
- if (data || (cmd->flags & MMC_RSP_BUSY)) {
|
|
|
- count = sdhci_calc_timeout(host, cmd);
|
|
|
- sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
|
|
|
- }
|
|
|
+ if (data || (cmd->flags & MMC_RSP_BUSY))
|
|
|
+ sdhci_set_timeout(host, cmd);
|
|
|
|
|
|
if (!data)
|
|
|
return;
|