diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-05 10:54:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-05 10:54:27 -0400 |
| commit | caebff09efe8c061b4d99b82262c67fb2db9bbcf (patch) | |
| tree | 24fcdb0737bea1d87c0a36f7eb371017af83e5c2 /drivers/mmc | |
| parent | 17e76b33cc0ec2eb2c519b66b6f6c491718e8046 (diff) | |
| parent | 01c35f269f21398fa9d1db1b90b73f7e95a3bf22 (diff) | |
| download | u-boot-caebff09efe8c061b4d99b82262c67fb2db9bbcf.zip u-boot-caebff09efe8c061b4d99b82262c67fb2db9bbcf.tar.gz u-boot-caebff09efe8c061b4d99b82262c67fb2db9bbcf.tar.bz2 | |
Merge tag 'u-boot-atmel-2021.01-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel into next
First set of u-boot-atmel features for 2021.01 cycle:
This feature set includes a new CPU driver for at91 family, new driver
for PIT64B hardware timer, support for new at91 family SoC named sama7g5
which adds: clock support, including conversion of the clock tree to
CCF; SoC support in mach-at91, pinctrl and mmc drivers update. The
feature set also includes updates for mmc driver and some other minor
fixes and features regarding building without the old Atmel PIT and the
possibility to read a secondary MAC address from a second i2c EEPROM.
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/atmel_sdhci.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/mmc/atmel_sdhci.c b/drivers/mmc/atmel_sdhci.c index 0c53caf..f56ae63 100644 --- a/drivers/mmc/atmel_sdhci.c +++ b/drivers/mmc/atmel_sdhci.c @@ -79,14 +79,20 @@ static int atmel_sdhci_probe(struct udevice *dev) if (ret) return ret; - ret = clk_set_rate(&clk, ATMEL_SDHC_GCK_RATE); - if (ret) - return ret; + clk_set_rate(&clk, ATMEL_SDHC_GCK_RATE); max_clk = clk_get_rate(&clk); if (!max_clk) return -EINVAL; + ret = clk_enable(&clk); + if (ret) + return ret; + + ret = mmc_of_parse(dev, &plat->cfg); + if (ret) + return ret; + host->max_clk = max_clk; host->mmc = &plat->mmc; host->mmc->dev = dev; @@ -113,6 +119,7 @@ static int atmel_sdhci_bind(struct udevice *dev) static const struct udevice_id atmel_sdhci_ids[] = { { .compatible = "atmel,sama5d2-sdhci" }, { .compatible = "microchip,sam9x60-sdhci" }, + { .compatible = "microchip,sama7g5-sdhci" }, { } }; |