dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-28 14:01:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'mmc-2020-9-15' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc

Browse Source 
- Use mmc_of_parse for msm_sdhci
- Add missing common host caps for xenon_sdhci.
This commit is contained in:
Tom Rini
2020-09-15 08:59:32 -04:00
parent 0e12575645 e79c59c0e2
commit 4dcced1169
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/mmc/msm_sdhci.c
View File

@@ -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);

18
drivers/mmc/xenon_sdhci.c
View File

@@ -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;