diff options
author | Ulf Hansson <ulf.hansson@linaro.org> | 2024-02-14 01:51:34 +0300 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2024-02-14 01:51:34 +0300 |
commit | 2439e5bddb4e8b693402566aed25d58abc30e652 (patch) | |
tree | 1a06fcaba5103a5fd0d88dc814c50490d3d64f4f /drivers/mmc/core | |
parent | 02c801376bdd3dc9bcfae46ea9db382611f7612a (diff) | |
parent | ff3206d2186d84e4f77e1378ba1d225633f17b9b (diff) | |
download | linux-2439e5bddb4e8b693402566aed25d58abc30e652.tar.xz |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.8-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.9.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/core')
-rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index f410bee50132..58ed7193a3ca 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1015,10 +1015,12 @@ static int mmc_select_bus_width(struct mmc_card *card) static unsigned ext_csd_bits[] = { EXT_CSD_BUS_WIDTH_8, EXT_CSD_BUS_WIDTH_4, + EXT_CSD_BUS_WIDTH_1, }; static unsigned bus_widths[] = { MMC_BUS_WIDTH_8, MMC_BUS_WIDTH_4, + MMC_BUS_WIDTH_1, }; struct mmc_host *host = card->host; unsigned idx, bus_width = 0; |