diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:44 +0100 |
| commit | d69b7f3d693887c755671bffab677362f4e4a0b6 (patch) | |
| tree | 0490c1aa6ca83e2695158e43a1138a56e11e7065 /drivers | |
| parent | d6787a36a64aeaff019bfb61b40f247f04c5ade8 (diff) | |
| parent | d587d9d79aa4ce30f083c56f631df63fb8586ebe (diff) | |
| download | barebox-d69b7f3d693887c755671bffab677362f4e4a0b6.tar.gz barebox-d69b7f3d693887c755671bffab677362f4e4a0b6.tar.xz | |
Merge branch 'for-next/mmc'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mci/mci-core.c | 29 | ||||
| -rw-r--r-- | drivers/mci/stm32_sdmmc2.c | 5 |
2 files changed, 30 insertions, 4 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index dd163c3d16..e5b5e8a275 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -668,10 +668,11 @@ retry_scr: static void mci_set_ios(struct mci *mci) { struct mci_host *host = mci->host; - struct mci_ios ios; - - ios.bus_width = host->bus_width; - ios.clock = host->clock; + struct mci_ios ios = { + .bus_width = host->bus_width, + .clock = host->clock, + .timing = host->timing, + }; host->set_ios(host, &ios); } @@ -996,6 +997,9 @@ static int mci_startup_sd(struct mci *mci) mci_set_bus_width(mci, MMC_BUS_WIDTH_4); } + if (mci->tran_speed > 25000000) + mci->host->timing = MMC_TIMING_SD_HS; + mci_set_clock(mci, mci->tran_speed); return 0; @@ -1021,6 +1025,8 @@ static int mci_startup_mmc(struct mci *mci) mci->tran_speed = 52000000; else mci->tran_speed = 26000000; + + host->timing = MMC_TIMING_MMC_HS; } mci_set_clock(mci, mci->tran_speed); @@ -1473,6 +1479,20 @@ static unsigned extract_mtd_year(struct mci *mci) return year; } +static const char *mci_timing_tostr(unsigned timing) +{ + switch (timing) { + case MMC_TIMING_LEGACY: + return "legacy"; + case MMC_TIMING_MMC_HS: + return "MMC HS"; + case MMC_TIMING_SD_HS: + return "SD HS"; + default: + return "unknown"; /* shouldn't happen */ + } +} + static void mci_print_caps(unsigned caps) { printf(" capabilities: %s%s%s%s%s\n", @@ -1509,6 +1529,7 @@ static void mci_info(struct device_d *dev) bw = 1; printf(" current buswidth: %d\n", bw); + printf(" current timing: %s\n", mci_timing_tostr(host->timing)); mci_print_caps(host->host_caps); printf("Card information:\n"); diff --git a/drivers/mci/stm32_sdmmc2.c b/drivers/mci/stm32_sdmmc2.c index 695e61d1cc..0c26869b03 100644 --- a/drivers/mci/stm32_sdmmc2.c +++ b/drivers/mci/stm32_sdmmc2.c @@ -631,6 +631,11 @@ static int stm32_sdmmc2_probe(struct amba_device *adev, mci_of_parse(&priv->mci); + if (mci->f_max >= 26000000) + mci->host_caps |= MMC_CAP_MMC_HIGHSPEED; + if (mci->f_max >= 52000000) + mci->host_caps |= MMC_CAP_MMC_HIGHSPEED_52MHZ; + return mci_register(&priv->mci); priv_free: |