Merge tag 'v2024.01-rc5' into next

[thirdparty/u-boot.git] / board / toradex / colibri_imx7 / colibri_imx7.c

diff --git a/board/toradex/colibri_imx7/colibri_imx7.c b/board/toradex/colibri_imx7/colibri_imx7.c
index e23f9af20da0b47bcdf5e875bca47ffb8cced473..7a59a786d98d6816034aa2f662a8767f7f1643b6 100644 (file)
--- a/board/toradex/colibri_imx7/colibri_imx7.c
+++ b/board/toradex/colibri_imx7/colibri_imx7.c
@@ -66,7 +66,7 @@ int dram_init(void)
 }
 
 static iomux_v3_cfg_t const flash_detection_pads[] = {
-       MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(FLASH_DETECTION_CTRL),
+       MX7D_PAD_SD3_RESET_B__GPIO6_IO11 | MUX_PAD_CTRL(FLASH_DETECTION_CTRL) | MUX_MODE_SION,
 };
 
 static iomux_v3_cfg_t const uart1_pads[] = {
@@ -193,9 +193,9 @@ int board_init(void)
        gd->bd->bi_boot_params = PHYS_SDRAM + 0x100;
 
        /*
-        * Enable GPIO on NAND_WE_B/eMMC_RST with 100k pull-down. eMMC_RST
+        * Enable GPIO SION on NAND_WE_B/eMMC_RST with 100k pull-down. eMMC_RST
         * is pulled high with 4.7k for eMMC devices. This allows to reliably
-        * detect eMMC/NAND flash
+        * detect eMMC vs NAND flash.
         */
        imx_iomux_v3_setup_multiple_pads(flash_detection_pads, ARRAY_SIZE(flash_detection_pads));
        gpio_request(FLASH_DET_GPIO, "flash-detection-gpio");