|
@@ -2799,6 +2799,10 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot)
|
|
|
if (host->pdata->caps2)
|
|
|
mmc->caps2 = host->pdata->caps2;
|
|
|
|
|
|
+ mmc->f_min = DW_MCI_FREQ_MIN;
|
|
|
+ if (!mmc->f_max)
|
|
|
+ mmc->f_max = DW_MCI_FREQ_MAX;
|
|
|
+
|
|
|
/* Process SDIO IRQs through the sdio_irq_work. */
|
|
|
if (mmc->caps & MMC_CAP_SDIO_IRQ)
|
|
|
mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
|
|
@@ -2811,7 +2815,6 @@ static int dw_mci_init_slot(struct dw_mci *host)
|
|
|
struct mmc_host *mmc;
|
|
|
struct dw_mci_slot *slot;
|
|
|
int ret;
|
|
|
- u32 freq[2];
|
|
|
|
|
|
mmc = mmc_alloc_host(sizeof(struct dw_mci_slot), host->dev);
|
|
|
if (!mmc)
|
|
@@ -2825,16 +2828,6 @@ static int dw_mci_init_slot(struct dw_mci *host)
|
|
|
host->slot = slot;
|
|
|
|
|
|
mmc->ops = &dw_mci_ops;
|
|
|
- if (device_property_read_u32_array(host->dev, "clock-freq-min-max",
|
|
|
- freq, 2)) {
|
|
|
- mmc->f_min = DW_MCI_FREQ_MIN;
|
|
|
- mmc->f_max = DW_MCI_FREQ_MAX;
|
|
|
- } else {
|
|
|
- dev_info(host->dev,
|
|
|
- "'clock-freq-min-max' property was deprecated.\n");
|
|
|
- mmc->f_min = freq[0];
|
|
|
- mmc->f_max = freq[1];
|
|
|
- }
|
|
|
|
|
|
/*if there are external regulators, get them*/
|
|
|
ret = mmc_regulator_get_supply(mmc);
|