Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / board / engicam / common / board.c

diff --git a/board/engicam/common/board.c b/board/engicam/common/board.c
index fb37403aa1289c1b448722f92d75c7fc5745c26a..5a2003d50988162cefde4d9336cd6e74f6a38793 100644 (file)
--- a/board/engicam/common/board.c
+++ b/board/engicam/common/board.c
@@ -6,8 +6,16 @@
  */
 
 #include <common.h>
+#include <command.h>
+#include <env.h>
+#include <hang.h>
+#include <init.h>
+#include <log.h>
 #include <mmc.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/imx-regs.h>
 #include <asm/arch/sys_proto.h>
+#include <watchdog.h>
 
 #include "board.h"
 
@@ -31,37 +39,102 @@ static void mmc_late_init(void)
 }
 #endif
 
-static void setenv_fdt_file(void)
+enum engicam_boards {
+       IMX6Q_ICORE,
+       IMX6DL_ICORE,
+       IMX6Q_ICORE_MIPI,
+       IMX6DL_ICORE_MIPI,
+       IMX6Q_ICORE_RQS,
+       IMX6DL_ICORE_RQS,
+       IMX6UL_GEAM,
+       IMX6UL_ISIOT_EMMC,
+       IMX6UL_ISIOT_NAND,
+       ENGICAM_BOARDS,
+};
+
+static const char * const board_fdt_file[ENGICAM_BOARDS] = {
+       [IMX6Q_ICORE] = "imx6q-icore.dtb",
+       [IMX6DL_ICORE] = "imx6dl-icore.dtb",
+       [IMX6Q_ICORE_MIPI] = "imx6q-icore-mipi.dtb",
+       [IMX6DL_ICORE_MIPI] = "imx6dl-icore-mipi.dtb",
+       [IMX6Q_ICORE_RQS] = "imx6q-icore-rqs.dtb",
+       [IMX6DL_ICORE_RQS] = "imx6dl-icore-rqs.dtb",
+       [IMX6UL_GEAM] = "imx6ul-geam.dtb",
+       [IMX6UL_ISIOT_EMMC] = "imx6ul-isiot-emmc.dtb",
+       [IMX6UL_ISIOT_NAND] = "imx6ul-isiot-nand.dtb",
+};
+
+static int setenv_fdt_file(int board_detected)
+{
+       if (board_detected < 0 || board_detected >= ENGICAM_BOARDS)
+               return -EINVAL;
+
+       if (!board_fdt_file[board_detected])
+               return -ENODEV;
+
+       env_set("fdt_file", board_fdt_file[board_detected]);
+       return 0;
+}
+
+static enum engicam_boards engicam_board_detect(void)
 {
        const char *cmp_dtb = CONFIG_DEFAULT_DEVICE_TREE;
 
        if (!strcmp(cmp_dtb, "imx6q-icore")) {
                if (is_mx6dq())
-                       env_set("fdt_file", "imx6q-icore.dtb");
+                       return IMX6Q_ICORE;
                else if (is_mx6dl() || is_mx6solo())
-                       env_set("fdt_file", "imx6dl-icore.dtb");
+                       return IMX6DL_ICORE;
        } else if (!strcmp(cmp_dtb, "imx6q-icore-mipi")) {
                if (is_mx6dq())
-                       env_set("fdt_file", "imx6q-icore-mipi.dtb");
+                       return IMX6Q_ICORE_MIPI;
                else if (is_mx6dl() || is_mx6solo())
-                       env_set("fdt_file", "imx6dl-icore-mipi.dtb");
+                       return IMX6DL_ICORE_MIPI;
        } else if (!strcmp(cmp_dtb, "imx6q-icore-rqs")) {
                if (is_mx6dq())
-                       env_set("fdt_file", "imx6q-icore-rqs.dtb");
+                       return IMX6Q_ICORE_RQS;
                else if (is_mx6dl() || is_mx6solo())
-                       env_set("fdt_file", "imx6dl-icore-rqs.dtb");
-       } else if (!strcmp(cmp_dtb, "imx6ul-geam-kit"))
-               env_set("fdt_file", "imx6ul-geam-kit.dtb");
-       else if (!strcmp(cmp_dtb, "imx6ul-isiot-mmc"))
-               env_set("fdt_file", "imx6ul-isiot-emmc.dtb");
+                       return IMX6DL_ICORE_RQS;
+       } else if (!strcmp(cmp_dtb, "imx6ul-geam"))
+                       return IMX6UL_GEAM;
        else if (!strcmp(cmp_dtb, "imx6ul-isiot-emmc"))
-               env_set("fdt_file", "imx6ul-isiot-emmc.dtb");
+                       return IMX6UL_ISIOT_EMMC;
        else if (!strcmp(cmp_dtb, "imx6ul-isiot-nand"))
-               env_set("fdt_file", "imx6ul-isiot-nand.dtb");
+                       return IMX6UL_ISIOT_NAND;
+
+       return -EINVAL;
+}
+
+static int fixup_enet_clock(enum engicam_boards board_detected)
+{
+       struct iomuxc *iomuxc_regs = (struct iomuxc *)IOMUXC_BASE_ADDR;
+       int clk_internal = 0;
+
+       switch (board_detected) {
+       case IMX6Q_ICORE_MIPI:
+       case IMX6DL_ICORE_MIPI:
+               clk_internal = 1;
+               break;
+       default:
+               break;
+       }
+
+       /* set gpr1[21] to select anatop clock */
+       debug("fixup_enet_clock %d\n", clk_internal);
+       clrsetbits_le32(&iomuxc_regs->gpr[1], 0x1 << 21, clk_internal << 21);
+
+       if (!clk_internal) {
+               /* clock is external */
+               return 0;
+       }
+
+       return enable_fec_anatop_clock(0, ENET_50MHZ);
 }
 
 int board_late_init(void)
 {
+       enum engicam_boards board_detected = IMX6Q_ICORE;
+
        switch ((imx6_src_get_boot_mode() & IMX6_BMODE_MASK) >>
                        IMX6_BMODE_SHIFT) {
        case IMX6_BMODE_SD:
@@ -86,7 +159,16 @@ int board_late_init(void)
        else
                env_set("console", "ttymxc3");
 
-       setenv_fdt_file();
+       board_detected = engicam_board_detect();
+       if (board_detected < 0)
+               hang();
+
+       fixup_enet_clock(board_detected);
+       setenv_fdt_file(board_detected);
+
+#ifdef CONFIG_HW_WATCHDOG
+       hw_watchdog_init();
+#endif
 
        return 0;
 }