apalis-imx8: implement pcb version and soc variant handling

Implement PCB version and SoC variant handling which automatically loads
the correct device tree for the Linux kernel.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Andrejs Cainikovs <andrejs.cainikovs@toradex.com>
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>

diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c
index 408198843fd51338f18d6a9457511af389188bbb..6f28367cf0345a7653a9d1fbb819c63fc1e7be1d 100644 (file)
--- a/board/toradex/apalis-imx8/apalis-imx8.c
+++ b/board/toradex/apalis-imx8/apalis-imx8.c
@@ -15,10 +15,12 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <command.h>
 #include <env.h>
 #include <errno.h>
-#include <linux/libfdt.h>
 #include <linux/bitops.h>
+#include <linux/delay.h>
+#include <linux/libfdt.h>
 
 #include "../common/tdx-cfg-block.h"
 
@@ -29,11 +31,41 @@ DECLARE_GLOBAL_DATA_PTR;
                         (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \
                         (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
 
+#define PCB_VERS_DETECT        ((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \
+                        (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \
+                        (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \
+                        (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
+
+#define GPIO_PAD_CTRL  ((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \
+                        (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \
+                        (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT) | \
+                        (SC_PAD_28FDSOI_PS_PU << PADRING_PULL_SHIFT))
+
+#define PCB_VERS_DEFAULT       ((SC_PAD_CONFIG_NORMAL << PADRING_CONFIG_SHIFT) | \
+                                (SC_PAD_ISO_OFF << PADRING_LPCONFIG_SHIFT) | \
+                                (SC_PAD_28FDSOI_PS_PD << PADRING_PULL_SHIFT) | \
+                                (SC_PAD_28FDSOI_DSE_DV_HIGH << PADRING_DSE_SHIFT))
+
 #define TDX_USER_FUSE_BLOCK1_A 276
 #define TDX_USER_FUSE_BLOCK1_B 277
 #define TDX_USER_FUSE_BLOCK2_A 278
 #define TDX_USER_FUSE_BLOCK2_B 279
 
+enum pcb_rev_t {
+       PCB_VERSION_1_0,
+       PCB_VERSION_1_1
+};
+
+static iomux_cfg_t pcb_vers_detect[] = {
+       SC_P_MIPI_DSI0_GPIO0_00 | MUX_MODE_ALT(3) | MUX_PAD_CTRL(PCB_VERS_DETECT),
+       SC_P_MIPI_DSI0_GPIO0_01 | MUX_MODE_ALT(3) | MUX_PAD_CTRL(PCB_VERS_DETECT),
+};
+
+static iomux_cfg_t pcb_vers_default[] = {
+       SC_P_MIPI_DSI0_GPIO0_00 | MUX_MODE_ALT(3) | MUX_PAD_CTRL(PCB_VERS_DEFAULT),
+       SC_P_MIPI_DSI0_GPIO0_01 | MUX_MODE_ALT(3) | MUX_PAD_CTRL(PCB_VERS_DEFAULT),
+};
+
 static iomux_cfg_t uart1_pads[] = {
        SC_P_UART1_RX | MUX_PAD_CTRL(UART_PAD_CTRL),
        SC_P_UART1_TX | MUX_PAD_CTRL(UART_PAD_CTRL),
@@ -180,6 +212,75 @@ int checkboard(void)
        return 0;
 }
 
+static enum pcb_rev_t get_pcb_revision(void)
+{
+       unsigned int pcb_vers = 0;
+
+       imx8_iomux_setup_multiple_pads(pcb_vers_detect,
+                                      ARRAY_SIZE(pcb_vers_detect));
+
+       gpio_request(IMX_GPIO_NR(1, 18),
+                    "PCB version detection on PAD SC_P_MIPI_DSI0_GPIO0_00");
+       gpio_request(IMX_GPIO_NR(1, 19),
+                    "PCB version detection on PAD SC_P_MIPI_DSI0_GPIO0_01");
+       gpio_direction_input(IMX_GPIO_NR(1, 18));
+       gpio_direction_input(IMX_GPIO_NR(1, 19));
+
+       udelay(1000);
+
+       pcb_vers = gpio_get_value(IMX_GPIO_NR(1, 18));
+       pcb_vers |= gpio_get_value(IMX_GPIO_NR(1, 19)) << 1;
+
+       /* Set muxing back to default values for saving energy */
+       imx8_iomux_setup_multiple_pads(pcb_vers_default,
+                                      ARRAY_SIZE(pcb_vers_default));
+
+       switch (pcb_vers) {
+       case 0b11:
+               return PCB_VERSION_1_0;
+       case 0b10:
+               return PCB_VERSION_1_1;
+       default:
+               printf("Unknown PCB version=0x%x, default to V1.1\n", pcb_vers);
+               return PCB_VERSION_1_1;
+       }
+}
+
+static void select_dt_from_module_version(void)
+{
+       env_set("soc", "imx8qm");
+       env_set("variant", "-v1.1");
+
+       switch (tdx_hw_tag.prodid) {
+       /* Select Apalis iMX8QM device trees */
+       case APALIS_IMX8QM_IT:
+       case APALIS_IMX8QM_WIFI_BT_IT:
+       case APALIS_IMX8QM_8GB_WIFI_BT_IT:
+               if (get_pcb_revision() == PCB_VERSION_1_0)
+                       env_set("variant", "");
+               break;
+       /* Select Apalis iMX8QP device trees */
+       case APALIS_IMX8QP_WIFI_BT:
+       case APALIS_IMX8QP:
+               env_set("soc", "imx8qp");
+               break;
+       default:
+               printf("Unknown Apalis iMX8 module\n");
+               return;
+       }
+}
+
+static int do_select_dt_from_module_version(struct cmd_tbl *cmdtp, int flag,
+                                           int argc, char * const argv[])
+{
+       select_dt_from_module_version();
+       return 0;
+}
+
+U_BOOT_CMD(select_dt_from_module_version, CONFIG_SYS_MAXARGS, 1, do_select_dt_from_module_version,
+          "\n", "    - select devicetree from module version"
+);
+
 int board_init(void)
 {
        board_gpio_init();
@@ -215,5 +316,7 @@ int board_late_init(void)
        env_set("board_rev", "v1.0");
 #endif
 
+       select_dt_from_module_version();
+
        return 0;
 }

diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig
index 395202bc29f61b03aaa428a0bb2105ebbbc98b84..de33b25cefafc2f2a5bad572d1e6b984d93eb3fd 100644 (file)
--- a/configs/apalis-imx8_defconfig
+++ b/configs/apalis-imx8_defconfig
@@ -19,6 +19,8 @@ CONFIG_REMAKE_ELF=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_OF_SYSTEM_SETUP=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="test -n ${fdtfile} || setenv fdtfile ${soc}-apalis${variant}-${fdt_board}.dtb"
 CONFIG_LOG=y
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_DISPLAY_BOARDINFO_LATE=y

diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h
index 73d8d245a96437cfb5cace1eb99315f28ac23ba0..a8b2b0774feac92b327e1761410bfa43c7a1c11f 100644 (file)
--- a/include/configs/apalis-imx8.h
+++ b/include/configs/apalis-imx8.h
@@ -38,8 +38,7 @@
        "boot_script_dhcp=boot.scr\0" \
        "console=ttyLP1 earlycon\0" \
        "fdt_addr=0x83000000\0" \
-       "fdt_file=fsl-imx8qm-apalis-eval.dtb\0" \
-       "fdtfile=fsl-imx8qm-apalis-eval.dtb\0" \
+       "fdt_board=eval\0" \
        "finduuid=part uuid mmc ${mmcdev}:2 uuid\0" \
        "initrd_addr=0x83800000\0" \
        "initrd_high=0xffffffffffffffff\0" \