dw_mmc uses the device index internally and currently derives this from a "mshcN" DT alias. But the standard DT alias used by the MMC core to assign the device index is "mmcN". The first patch here creates a function to replace the two sites that do this mapping so that the second patch can switch to using "mmcN" if available (falling back to "mshcN" for compatibility if required). John Keeping (2): mmc: dw_mmc: extract ctrl_id lookup to a function mmc: dw_mmc: use standard "mmc" alias stem drivers/mmc/host/dw_mmc-k3.c | 4 +--- drivers/mmc/host/dw_mmc.c | 28 ++++++++++++++++++++++------ drivers/mmc/host/dw_mmc.h | 2 ++ 3 files changed, 25 insertions(+), 9 deletions(-) -- 2.34.0