Hi Tom, Can we merge this fix, please? We are having troubles with X15 board in Linaro lab due to this bug... Would be great to have this patch in v2018.03. I know, relying on master branch is not good, but it is what it is, I'll talk with guys if we can change the policy.
Thanks! On 14 February 2018 at 17:02, Sam Protsenko <semen.protse...@linaro.org> wrote: > On 9 February 2018 at 13:09, Jean-Jacques Hiblot <jjhib...@ti.com> wrote: >> The correspondence between mmc versions as used in u-boot and the version >> numbers reported in register EXT_CSD_REV is wrong for versions above and >> including MMC_VERSION_4_41. All those versions were shifted by one: >> real 4.5 hardware appeared to be MMC_VERSION_5_0. >> >> Fix this by adding the missing version in the correspondence table. >> >> Reported-by: eil Eilmsteiner Heribert <e...@keba.com> >> Signed-off-by: Jean-Jacques Hiblot <jjhib...@ti.com> >> >> --- >> >> drivers/mmc/mmc.c | 1 + >> include/mmc.h | 1 + >> 2 files changed, 2 insertions(+) >> >> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c >> index 31614dd..99e2a75 100644 >> --- a/drivers/mmc/mmc.c >> +++ b/drivers/mmc/mmc.c >> @@ -1950,6 +1950,7 @@ static int mmc_startup_v4(struct mmc *mmc) >> MMC_VERSION_4_1, >> MMC_VERSION_4_2, >> MMC_VERSION_4_3, >> + MMC_VERSION_4_4, >> MMC_VERSION_4_41, >> MMC_VERSION_4_5, >> MMC_VERSION_5_0, >> diff --git a/include/mmc.h b/include/mmc.h >> index a46eaed..86f885b 100644 >> --- a/include/mmc.h >> +++ b/include/mmc.h >> @@ -54,6 +54,7 @@ >> #define MMC_VERSION_4_1 MAKE_MMC_VERSION(4, 1, 0) >> #define MMC_VERSION_4_2 MAKE_MMC_VERSION(4, 2, 0) >> #define MMC_VERSION_4_3 MAKE_MMC_VERSION(4, 3, 0) >> +#define MMC_VERSION_4_4 MAKE_MMC_VERSION(4, 4, 0) >> #define MMC_VERSION_4_41 MAKE_MMC_VERSION(4, 4, 1) >> #define MMC_VERSION_4_5 MAKE_MMC_VERSION(4, 5, 0) >> #define MMC_VERSION_5_0 MAKE_MMC_VERSION(5, 0, 0) >> -- >> 1.9.1 >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot@lists.denx.de >> https://lists.denx.de/listinfo/u-boot > > Reviewed-by: Sam Protsenko <semen.protse...@linaro.org> > > This patch fixes eMMC on AM57x EVM / X15 boards, which was broken in > 58a6fb7b0496 ("mmc: reworked version lookup in mmc_startup_v4") > commit. > > Thanks. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot