Re: [u-boot][master][PATCH 2/3] pico-imx7d: add baseboard SD card boot detect

2022-12-20 Thread Szőke Kálmán Benjamin 
To use fsl_esdhc_initialize() is must or esdhc drivers object will be not 
initialized. It was made by Technexion.In practice, it turned out that 3 is 
good.

Re: [u-boot][master][PATCH 2/3] pico-imx7d: add baseboard SD card boot detect

2022-12-19 Thread Fabio Estevam 
On Sun, Dec 18, 2022 at 9:53 AM  wrote:

> +   for (index = 0; index < CONFIG_SYS_FSL_USDHC_NUM; ++index) {
> +   ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
> +   if (ret)
> +   return ret;

In patch 3/3, CONFIG_SPL_DM_MMC=y, so can't the driver do the MMC init
instead of doing this manually?

>  #define BOOT_TARGET_DEVICES(func) \
> +   func(MMC, mmc, 3) \

Shouldn't the index 2 instead?

[u-boot][master][PATCH 2/3] pico-imx7d: add baseboard SD card boot detect

2022-12-18 Thread egyszeregy 
From: Benjamin Szőke 

Take over codes from Techenxion to support mmc autodetect boot for pico-imx7d.

Signed-off-by: Benjamin Szőke 
---
 board/technexion/pico-imx7d/pico-imx7d.c | 82 +
 board/technexion/pico-imx7d/pico-imx7d_spl.c | 92 ++--
 include/configs/pico-imx7d.h |  4 +-
 3 files changed, 170 insertions(+), 8 deletions(-)

diff --git a/board/technexion/pico-imx7d/pico-imx7d.c 
b/board/technexion/pico-imx7d/pico-imx7d.c
index 7db34abcb1..7e47f15e71 100644
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -21,6 +21,8 @@
 #include 
 #include 
 #include "../../freescale/common/pfuze.h"
+#include 
+#include 
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -159,6 +161,53 @@ int board_phy_config(struct phy_device *phydev)
 }
 #endif
 
+#if CONFIG_IS_ENABLED(FSL_ESDHC_IMX)
+int check_mmc_autodetect(void)
+{
+   char *autodetect_str = env_get("mmcautodetect");
+
+   if ((autodetect_str != NULL) &&
+   (strcmp(autodetect_str, "yes") == 0)) {
+   return 1;
+   }
+
+   return 0;
+}
+
+void board_late_mmc_init(void)
+{
+   int dev_no = 0;
+   char cmd[32];
+   char mmcblk[32];
+   
+   if (!check_mmc_autodetect())
+   return;
+
+   switch (get_boot_device()) {
+   case SD3_BOOT:
+   case MMC3_BOOT:
+   env_set("bootdev", "MMC3");
+   dev_no = 2;
+   break;
+   case SD1_BOOT:
+   env_set("bootdev", "SD1");
+   dev_no = 0;
+   break;
+   default:
+   printf("Wrong boot device!");
+   }
+   
+   env_set_ulong("mmcdev", dev_no);
+   
+   /* Set mmcblk env */
+   sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", dev_no);
+   env_set("mmcroot", mmcblk);
+   
+   sprintf(cmd, "mmc dev %d", dev_no);
+   run_command(cmd, 0);
+}
+#endif
+
 static void setup_iomux_uart(void)
 {
imx_iomux_v3_setup_multiple_pads(uart5_pads, ARRAY_SIZE(uart5_pads));
@@ -210,6 +259,10 @@ int board_late_init(void)
 
set_wdog_reset(wdog);
 
+#if defined(CONFIG_ENV_IS_IN_MMC) || defined(CONFIG_ENV_IS_NOWHERE)
+   board_late_mmc_init();
+#endif /* CONFIG_ENV_IS_IN_MMC or CONFIG_ENV_IS_NOWHERE */
+
/*
 * Do not assert internal WDOG_RESET_B_DEB(controlled by bit 4),
 * since we use PMIC_PWRON to reset the board.
@@ -219,6 +272,29 @@ int board_late_init(void)
return 0;
 }
 
+#ifdef CONFIG_OF_BOARD_SETUP
+int ft_board_setup(void *blob, struct bd_info *bd)
+{
+   const int *cell;
+   int offs;
+   uint32_t cma_size;
+   unsigned int dram_size;
+
+   dram_size = imx_ddr_size() / 1024 / 1024;
+   offs = fdt_path_offset(blob, "/reserved-memory/linux,cma");
+   cell = fdt_getprop(blob, offs, "size", NULL);
+   cma_size = fdt32_to_cpu(cell[0]);
+   if (dram_size == 512) {
+   /* CMA is aligned by 32MB on i.mx8mq,
+  so CMA size can only be multiple of 32MB */
+   cma_size = env_get_ulong("cma_size", 10, (6 * 32) * 1024 * 
1024);
+   fdt_setprop_u32(blob, offs, "size", (uint64_t)cma_size);
+   }
+
+   return 0;
+}
+#endif
+
 int checkboard(void)
 {
puts("Board: i.MX7D PICOSOM\n");
@@ -244,3 +320,9 @@ int board_ehci_hcd_init(int port)
}
return 0;
 }
+
+/* This should be defined for each board */
+__weak int mmc_map_to_kernel_blk(int dev_no)
+{
+return dev_no;
+}
diff --git a/board/technexion/pico-imx7d/pico-imx7d_spl.c 
b/board/technexion/pico-imx7d/pico-imx7d_spl.c
index 0009c55022..499e4a49e0 100644
--- a/board/technexion/pico-imx7d/pico-imx7d_spl.c
+++ b/board/technexion/pico-imx7d/pico-imx7d_spl.c
@@ -18,6 +18,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #if defined(CONFIG_SPL_BUILD)
 
@@ -158,7 +160,20 @@ void reset_cpu(void)
 #define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \
PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM)
 
-static iomux_v3_cfg_t const usdhc3_pads[] = {
+#define USDHC1_CD_GPIO IMX_GPIO_NR(5, 0)
+/* EMMC/SD */
+static iomux_v3_cfg_t const usdhc1_pads[] = {
+   MX7D_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+   MX7D_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+   MX7D_PAD_SD1_DATA0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+   MX7D_PAD_SD1_DATA1__SD1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+   MX7D_PAD_SD1_DATA2__SD1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+   MX7D_PAD_SD1_DATA3__SD1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+   MX7D_PAD_SD1_CD_B__GPIO5_IO0  | MUX_PAD_CTRL(USDHC_PAD_CTRL),
+};
+
+#define USDHC3_CD_GPIO IMX_GPIO_NR(1, 14)
+static iomux_v3_cfg_t const usdhc3_emmc_pads[] = {
MX7D_PAD_SD3_CLK__SD3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL),
MX7D_PAD_SD3_CMD__SD3_CMD | MUX_PAD_CT