| Message ID | 20220614113905.1458715-1-alexander.stein@ew.tq-group.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/1] mmc: host: Do not evaluate HS400 capabilities if bus has no MMC capability | expand |
On Tue, 14 Jun 2022 at 04:39, Alexander Stein <alexander.stein@ew.tq-group.com> wrote: > > If 'no-mmc' is set but 'no-mmc-hs400' is not, this warning is raised. > Specifying 'no-mmc' should be enough though. > > Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/core/host.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c > index 2ed2b4d5e5a5..0fd91f749b3a 100644 > --- a/drivers/mmc/core/host.c > +++ b/drivers/mmc/core/host.c > @@ -599,7 +599,7 @@ static int mmc_validate_host_caps(struct mmc_host *host) > } > > if (caps2 & (MMC_CAP2_HS400_ES | MMC_CAP2_HS400) && > - !(caps & MMC_CAP_8_BIT_DATA)) { > + !(caps & MMC_CAP_8_BIT_DATA) && !(caps2 & MMC_CAP2_NO_MMC)) { > dev_warn(dev, "drop HS400 support since no 8-bit bus\n"); > host->caps2 = caps2 & ~MMC_CAP2_HS400_ES & ~MMC_CAP2_HS400; > } > -- > 2.25.1 >
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index 2ed2b4d5e5a5..0fd91f749b3a 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c @@ -599,7 +599,7 @@ static int mmc_validate_host_caps(struct mmc_host *host) } if (caps2 & (MMC_CAP2_HS400_ES | MMC_CAP2_HS400) && - !(caps & MMC_CAP_8_BIT_DATA)) { + !(caps & MMC_CAP_8_BIT_DATA) && !(caps2 & MMC_CAP2_NO_MMC)) { dev_warn(dev, "drop HS400 support since no 8-bit bus\n"); host->caps2 = caps2 & ~MMC_CAP2_HS400_ES & ~MMC_CAP2_HS400; }
If 'no-mmc' is set but 'no-mmc-hs400' is not, this warning is raised. Specifying 'no-mmc' should be enough though. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> --- drivers/mmc/core/host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)