| Message ID | 20240711081838.47256-3-bastien.curutchet@bootlin.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | mmc: davinci_mmc: Fix v6.9 regression | expand |
On Thu, 11 Jul 2024 at 10:18, Bastien Curutchet <bastien.curutchet@bootlin.com> wrote: > > A dev_info() at probe's end() report the supported bus width. It never > reports 8-bits width while the driver can handle it. > > Update the info message at then end of the probe to report the use of > 8-bits data when needed. > > Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/davinci_mmc.c | 11 ++++++++--- > 1 file changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c > index c302eb380e42..9cbde800685d 100644 > --- a/drivers/mmc/host/davinci_mmc.c > +++ b/drivers/mmc/host/davinci_mmc.c > @@ -1187,7 +1187,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) > struct mmc_davinci_host *host = NULL; > struct mmc_host *mmc = NULL; > struct resource *r, *mem = NULL; > - int ret, irq; > + int ret, irq, bus_width; > size_t mem_size; > const struct platform_device_id *id_entry; > > @@ -1317,9 +1317,14 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) > > rename_region(mem, mmc_hostname(mmc)); > > + if (mmc->caps & MMC_CAP_8_BIT_DATA) > + bus_width = 8; > + else if (mmc->caps & MMC_CAP_4_BIT_DATA) > + bus_width = 4; > + else > + bus_width = 1; > dev_info(mmc_dev(host->mmc), "Using %s, %d-bit mode\n", > - host->use_dma ? "DMA" : "PIO", > - (mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1); > + host->use_dma ? "DMA" : "PIO", bus_width); > > return 0; > > -- > 2.45.0 >
diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index c302eb380e42..9cbde800685d 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -1187,7 +1187,7 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) struct mmc_davinci_host *host = NULL; struct mmc_host *mmc = NULL; struct resource *r, *mem = NULL; - int ret, irq; + int ret, irq, bus_width; size_t mem_size; const struct platform_device_id *id_entry; @@ -1317,9 +1317,14 @@ static int davinci_mmcsd_probe(struct platform_device *pdev) rename_region(mem, mmc_hostname(mmc)); + if (mmc->caps & MMC_CAP_8_BIT_DATA) + bus_width = 8; + else if (mmc->caps & MMC_CAP_4_BIT_DATA) + bus_width = 4; + else + bus_width = 1; dev_info(mmc_dev(host->mmc), "Using %s, %d-bit mode\n", - host->use_dma ? "DMA" : "PIO", - (mmc->caps & MMC_CAP_4_BIT_DATA) ? 4 : 1); + host->use_dma ? "DMA" : "PIO", bus_width); return 0;
A dev_info() at probe's end() report the supported bus width. It never reports 8-bits width while the driver can handle it. Update the info message at then end of the probe to report the use of 8-bits data when needed. Signed-off-by: Bastien Curutchet <bastien.curutchet@bootlin.com> --- drivers/mmc/host/davinci_mmc.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)