mirror of
https://xff.cz/git/u-boot/
synced 2025-09-26 21:11:18 +02:00
Merge tag 'mmc-2020-9-15' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- Use mmc_of_parse for msm_sdhci - Add missing common host caps for xenon_sdhci.
This commit is contained in:
@@ -142,6 +142,10 @@ static int msm_sdc_probe(struct udevice *dev)
|
|||||||
writel(caps, host->ioaddr + SDHCI_VENDOR_SPEC_CAPABILITIES0);
|
writel(caps, host->ioaddr + SDHCI_VENDOR_SPEC_CAPABILITIES0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ret = mmc_of_parse(dev, &plat->cfg);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
host->mmc = &plat->mmc;
|
host->mmc = &plat->mmc;
|
||||||
host->mmc->dev = dev;
|
host->mmc->dev = dev;
|
||||||
ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
|
ret = sdhci_setup_cfg(&plat->cfg, host, 0, 0);
|
||||||
|
@@ -485,20 +485,10 @@ static int xenon_sdhci_probe(struct udevice *dev)
|
|||||||
armada_3700_soc_pad_voltage_set(host);
|
armada_3700_soc_pad_voltage_set(host);
|
||||||
|
|
||||||
host->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_DDR_52MHz;
|
host->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_DDR_52MHz;
|
||||||
switch (fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "bus-width",
|
|
||||||
1)) {
|
ret = mmc_of_parse(dev, &plat->cfg);
|
||||||
case 8:
|
if (ret)
|
||||||
host->host_caps |= MMC_MODE_8BIT;
|
return ret;
|
||||||
break;
|
|
||||||
case 4:
|
|
||||||
host->host_caps |= MMC_MODE_4BIT;
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
printf("Invalid \"bus-width\" value\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
host->ops = &xenon_sdhci_ops;
|
host->ops = &xenon_sdhci_ops;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user