From 5b89345ee5d4950265c39141af793e0f6e7ff5f2 Mon Sep 17 00:00:00 2001
From: Ye Li <ye.li@nxp.com>
Date: Fri, 26 Apr 2019 02:17:56 -0700
Subject: [PATCH] MLK-21849-4 DTS: imx8qm_mek: Update DTS file for supporting
 SPL

Since there are some board leve DTS nodes needing "u-boot,dm-spl", we
have to use -u-boot.dtsi for each board DTS file. So discard the
SOC level -u-boot.dtsi

Add the "u-boot,dm-spl" for SPL boot relative device nodes and its pinconfig,
regulator and power domain nodes.

Signed-off-by: Ye Li <ye.li@nxp.com>
---
 ...u-boot.dtsi => fsl-imx8qm-mek-u-boot.dtsi} | 64 ++++++++++++-------
 arch/arm/dts/fsl-imx8qm-mek.dts               |  1 -
 2 files changed, 42 insertions(+), 23 deletions(-)
 rename arch/arm/dts/{fsl-imx8qm-u-boot.dtsi => fsl-imx8qm-mek-u-boot.dtsi} (71%)

diff --git a/arch/arm/dts/fsl-imx8qm-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
similarity index 71%
rename from arch/arm/dts/fsl-imx8qm-u-boot.dtsi
rename to arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
index 35bb7df0a2..a48a73ef00 100644
--- a/arch/arm/dts/fsl-imx8qm-u-boot.dtsi
+++ b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi
@@ -20,91 +20,107 @@
 	u-boot,dm-spl;
 };
 
-&pd_lsio {
+&{/regulators} {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio0 {
+&reg_usdhc2_vmmc {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio1 {
+&{/mu@5d1c0000/iomuxc/imx8qm-mek} {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio2 {
+&pinctrl_usdhc2_gpio {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio3 {
+&pinctrl_usdhc2 {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio4 {
+&pinctrl_usdhc2_100mhz {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio5 {
+&pinctrl_usdhc2_200mhz {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio6 {
+&pinctrl_lpuart0 {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_gpio7 {
+&pinctrl_usdhc1 {
 	u-boot,dm-spl;
 };
 
-&pd_lsio_flexspi0 {
+&pinctrl_usdhc1_100mhz {
 	u-boot,dm-spl;
 };
 
-&pd_conn {
+&pinctrl_usdhc1_200mhz {
 	u-boot,dm-spl;
 };
 
-&pd_conn_sdch0 {
+&pinctrl_flexspi0 {
 	u-boot,dm-spl;
 };
 
-&pd_conn_sdch1 {
+&pd_lsio {
 	u-boot,dm-spl;
 };
 
-&pd_conn_sdch2 {
+&pd_lsio_gpio1 {
 	u-boot,dm-spl;
 };
 
-&gpio0 {
+&pd_lsio_gpio2 {
 	u-boot,dm-spl;
 };
 
-&gpio1 {
+&pd_lsio_gpio4 {
 	u-boot,dm-spl;
 };
 
-&gpio2 {
+&pd_lsio_gpio5 {
 	u-boot,dm-spl;
 };
 
-&gpio3 {
+&pd_lsio_flexspi0 {
 	u-boot,dm-spl;
 };
 
-&gpio4 {
+&pd_conn {
 	u-boot,dm-spl;
 };
 
-&gpio5 {
+&pd_conn_sdch0 {
+	u-boot,dm-spl;
+};
+
+&pd_conn_sdch1 {
 	u-boot,dm-spl;
 };
 
-&gpio6 {
+&pd_conn_sdch2 {
 	u-boot,dm-spl;
 };
 
-&gpio7 {
+&gpio1 {
+	u-boot,dm-spl;
+};
+
+&gpio2 {
+	u-boot,dm-spl;
+};
+
+&gpio4 {
+	u-boot,dm-spl;
+};
+
+&gpio5 {
 	u-boot,dm-spl;
 };
 
@@ -123,3 +139,7 @@
 &flexspi0 {
 	u-boot,dm-spl;
 };
+
+&flash0 {
+	u-boot,dm-spl;
+};
\ No newline at end of file
diff --git a/arch/arm/dts/fsl-imx8qm-mek.dts b/arch/arm/dts/fsl-imx8qm-mek.dts
index 22163b9b79..b04d711b02 100644
--- a/arch/arm/dts/fsl-imx8qm-mek.dts
+++ b/arch/arm/dts/fsl-imx8qm-mek.dts
@@ -15,7 +15,6 @@
 /dts-v1/;
 
 #include "fsl-imx8qm.dtsi"
-#include "fsl-imx8qm-u-boot.dtsi"
 
 / {
 	model = "Freescale i.MX8QM MEK";
-- 
2.17.1