| Message ID | 20220216145809.2148467-1-heiko.thiery@gmail.com |
|---|---|
| State | Accepted |
| Commit | 3240d011ae883a4ee842c0890c321ef1129fd3d4 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | kontron-pitx-imx8m: fix board_mmc_getcd() | expand |
> The function wrongly will return the card detection status of the SD card > (USDHC2) for the eMMC (USDHC1). Thus booting from eMMC without an inserted > SD card will fail. > Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/board/kontron/pitx_imx8m/spl.c b/board/kontron/pitx_imx8m/spl.c index c043dd205b..ef3256898d 100644 --- a/board/kontron/pitx_imx8m/spl.c +++ b/board/kontron/pitx_imx8m/spl.c @@ -76,17 +76,16 @@ static struct i2c_pads_info i2c_pad_info1 = { int board_mmc_getcd(struct mmc *mmc) { struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; - int ret = 0; switch (cfg->esdhc_base) { case USDHC1_BASE_ADDR: /* the eMMC does not have a CD pin */ - ret = 1; + return 1; case USDHC2_BASE_ADDR: - ret = !gpio_get_value(USDHC2_CD_GPIO); + return !gpio_get_value(USDHC2_CD_GPIO); } - return ret; + return 0; }
The function wrongly will return the card detection status of the SD card (USDHC2) for the eMMC (USDHC1). Thus booting from eMMC without an inserted SD card will fail. Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com> --- board/kontron/pitx_imx8m/spl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)