diff --git a/board/ti/j784s4/evm.c b/board/ti/j784s4/evm.c
index f17b88248f..48e4d70aea 100644
--- a/board/ti/j784s4/evm.c
+++ b/board/ti/j784s4/evm.c
@@ -238,6 +238,17 @@ int board_late_init(void)
 	return 0;
 }
 
+ofnode cadence_qspi_get_subnode(struct udevice *dev)
+{
+	if (IS_ENABLED(CONFIG_SPL_BUILD) &&
+	    IS_ENABLED(CONFIG_TARGET_J784S4_R5_EVM)) {
+		if (spl_boot_device() == BOOT_DEVICE_SPINAND)
+			return ofnode_by_compatible(dev_ofnode(dev), "spi-nand");
+	}
+
+	return dev_read_first_subnode(dev);
+}
+
 void spl_board_init(void)
 {
 }