|
@@ -337,6 +337,9 @@ void sdhci_set_ios(struct mmc *mmc)
|
|
u32 ctrl;
|
|
u32 ctrl;
|
|
struct sdhci_host *host = (struct sdhci_host *)mmc->priv;
|
|
struct sdhci_host *host = (struct sdhci_host *)mmc->priv;
|
|
|
|
|
|
|
|
+ if (host->set_control_reg)
|
|
|
|
+ host->set_control_reg(host);
|
|
|
|
+
|
|
if (mmc->clock != host->clock)
|
|
if (mmc->clock != host->clock)
|
|
sdhci_set_clock(mmc, mmc->clock);
|
|
sdhci_set_clock(mmc, mmc->clock);
|
|
|
|
|
|
@@ -360,6 +363,9 @@ void sdhci_set_ios(struct mmc *mmc)
|
|
else
|
|
else
|
|
ctrl &= ~SDHCI_CTRL_HISPD;
|
|
ctrl &= ~SDHCI_CTRL_HISPD;
|
|
|
|
|
|
|
|
+ if (host->quirks & SDHCI_QUIRK_NO_HISPD_BIT)
|
|
|
|
+ ctrl &= ~SDHCI_CTRL_HISPD;
|
|
|
|
+
|
|
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
|
|
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -443,9 +449,15 @@ int add_sdhci(struct sdhci_host *host, u32 max_clk, u32 min_clk)
|
|
mmc->voltages |= MMC_VDD_29_30 | MMC_VDD_30_31;
|
|
mmc->voltages |= MMC_VDD_29_30 | MMC_VDD_30_31;
|
|
if (caps & SDHCI_CAN_VDD_180)
|
|
if (caps & SDHCI_CAN_VDD_180)
|
|
mmc->voltages |= MMC_VDD_165_195;
|
|
mmc->voltages |= MMC_VDD_165_195;
|
|
|
|
+
|
|
|
|
+ if (host->quirks & SDHCI_QUIRK_BROKEN_VOLTAGE)
|
|
|
|
+ mmc->voltages |= host->voltages;
|
|
|
|
+
|
|
mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT;
|
|
mmc->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_4BIT;
|
|
if (caps & SDHCI_CAN_DO_8BIT)
|
|
if (caps & SDHCI_CAN_DO_8BIT)
|
|
mmc->host_caps |= MMC_MODE_8BIT;
|
|
mmc->host_caps |= MMC_MODE_8BIT;
|
|
|
|
+ if (host->host_caps)
|
|
|
|
+ mmc->host_caps |= host->host_caps;
|
|
|
|
|
|
sdhci_reset(host, SDHCI_RESET_ALL);
|
|
sdhci_reset(host, SDHCI_RESET_ALL);
|
|
mmc_register(mmc);
|
|
mmc_register(mmc);
|