]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
board: ti: j721e: Add support for HyperFlash detection
authorVignesh Raghavendra <vigneshr@ti.com>
Thu, 6 Aug 2020 18:56:57 +0000 (00:26 +0530)
committerLokesh Vutla <lokeshvutla@ti.com>
Tue, 11 Aug 2020 15:04:46 +0000 (20:34 +0530)
On J7200 SoC OSPI0 and HypeFlash are muxed at HW level and only one of
them can be used at any time. J7200 EVM has both HyperFlash and OSPI
flash on board. There is a user switch (SW3.1) that can be toggled to
select OSPI flash vs HyperFlash.
Read the state of this switch via wkup_gpio0_6 line and fixup the DT
nodes to select OSPI0 vs HyperFlash

Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
board/ti/j721e/evm.c

index e035cf98844e18439b5fc50c6d4e82fc04e8284f..ebaa6faa931e880a6cbcedd30a973d9389c91a7b 100644 (file)
@@ -89,6 +89,34 @@ int board_fit_config_name_match(const char *name)
 }
 #endif
 
+#if CONFIG_IS_ENABLED(DM_GPIO) && CONFIG_IS_ENABLED(OF_LIBFDT)
+/* Returns 1, if onboard mux is set to hyperflash */
+static void __maybe_unused detect_enable_hyperflash(void *blob)
+{
+       struct gpio_desc desc = {0};
+
+       if (dm_gpio_lookup_name("6", &desc))
+               return;
+
+       if (dm_gpio_request(&desc, "6"))
+               return;
+
+       if (dm_gpio_set_dir_flags(&desc, GPIOD_IS_IN))
+               return;
+
+       if (dm_gpio_get_value(&desc)) {
+               int offset;
+
+               do_fixup_by_compat(blob, "ti,am654-hbmc", "status",
+                                  "okay", sizeof("okay"), 0);
+               offset = fdt_node_offset_by_compatible(blob, -1,
+                                                      "ti,j721e-ospi");
+               fdt_setprop(blob, offset, "status", "disabled",
+                           sizeof("disabled"));
+       }
+}
+#endif
+
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 int ft_board_setup(void *blob, struct bd_info *bd)
 {
@@ -101,6 +129,8 @@ int ft_board_setup(void *blob, struct bd_info *bd)
        if (ret)
                printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
 
+       detect_enable_hyperflash(blob);
+
        return ret;
 }
 #endif