Commit 2439e5bd authored by Ulf Hansson's avatar Ulf Hansson

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 02c80137 ff3206d2
...@@ -1015,10 +1015,12 @@ static int mmc_select_bus_width(struct mmc_card *card) ...@@ -1015,10 +1015,12 @@ static int mmc_select_bus_width(struct mmc_card *card)
static unsigned ext_csd_bits[] = { static unsigned ext_csd_bits[] = {
EXT_CSD_BUS_WIDTH_8, EXT_CSD_BUS_WIDTH_8,
EXT_CSD_BUS_WIDTH_4, EXT_CSD_BUS_WIDTH_4,
EXT_CSD_BUS_WIDTH_1,
}; };
static unsigned bus_widths[] = { static unsigned bus_widths[] = {
MMC_BUS_WIDTH_8, MMC_BUS_WIDTH_8,
MMC_BUS_WIDTH_4, MMC_BUS_WIDTH_4,
MMC_BUS_WIDTH_1,
}; };
struct mmc_host *host = card->host; struct mmc_host *host = card->host;
unsigned idx, bus_width = 0; unsigned idx, bus_width = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment