From: Vignesh Raghavendra <vigneshr@ti.com>
Date: Thu, 6 Aug 2020 18:56:57 +0000 (+0530)
Subject: board: ti: j721e: Add support for HyperFlash detection
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=d2bc9875ebcb574429b2ea82a757f8f38bcdaa4f;p=u-boot.git

board: ti: j721e: Add support for HyperFlash detection

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>
---

diff --git a/board/ti/j721e/evm.c b/board/ti/j721e/evm.c
index e035cf9884..ebaa6faa93 100644
--- a/board/ti/j721e/evm.c
+++ b/board/ti/j721e/evm.c
@@ -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