From 59bb61bd1a9c89d971c8fff50e2f238cb7d334c0 Mon Sep 17 00:00:00 2001
From: Nishant Pandey <nishpand@qti.qualcomm.com>
Date: Mon, 17 Oct 2022 21:43:46 -0700
Subject: [PATCH] ARM: dts: msm: Add DT overlay support for sa410m

Add DT overlay support for sa410m.

Change-Id: I45fbed5739e4b1e68e9c022541081671101181fc
---
 qcom/Makefile                                     | 15 ++++++++++-----
 ...mc-ccard.dts => sa410m-emmc-ccard-overlay.dts} |  1 +
 ...m-emmc-idp.dts => sa410m-emmc-idp-overlay.dts} |  1 +
 qcom/sa410m-idp.dtsi                              |  2 +-
 ...nd-ccard.dts => sa410m-nand-ccard-overlay.dts} |  1 +
 ...m-nand-idp.dts => sa410m-nand-idp-overlay.dts} |  1 +
 qcom/{sa410m-rumi.dts => sa410m-rumi-overlay.dts} |  3 ++-
 qcom/sa410m-rumi.dtsi                             |  2 --
 qcom/sa410m.dts                                   |  9 +++++++++
 qcom/sa410m.dtsi                                  |  7 +++++--
 10 files changed, 31 insertions(+), 11 deletions(-)
 rename qcom/{sa410m-emmc-ccard.dts => sa410m-emmc-ccard-overlay.dts} (96%)
 rename qcom/{sa410m-emmc-idp.dts => sa410m-emmc-idp-overlay.dts} (96%)
 rename qcom/{sa410m-nand-ccard.dts => sa410m-nand-ccard-overlay.dts} (96%)
 rename qcom/{sa410m-nand-idp.dts => sa410m-nand-idp-overlay.dts} (96%)
 rename qcom/{sa410m-rumi.dts => sa410m-rumi-overlay.dts} (84%)
 create mode 100644 qcom/sa410m.dts

diff --git a/qcom/Makefile b/qcom/Makefile
index d231a7d4..5b88a970 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -222,12 +222,17 @@ sdxpinn-dtb-$(CONFIG_ARCH_SDXPINN) += sdxpinn-rumi.dtb sa525m-rumi.dtb \
 		sdxpinn-idp-mbb.dtb
 dtb-y += $(sdxpinn-dtb-y)
 
+SA410M_AUTO_BASE_DTB += sa410m.dtb
+SA410M_AUTO_BOARDS += \
+		sa410m-rumi-overlay.dtbo \
+		sa410m-nand-idp-overlay.dtbo \
+		sa410m-emmc-idp-overlay.dtbo \
+		sa410m-nand-ccard-overlay.dtbo \
+		sa410m-emmc-ccard-overlay.dtbo
+
 sa410m_auto-dtb-$(CONFIG_ARCH_SA410M) += \
-				sa410m-rumi.dtb \
-				sa410m-nand-idp.dtb \
-				sa410m-emmc-idp.dtb \
-				sa410m-nand-ccard.dtb \
-				sa410m-emmc-ccard.dtb
+	$(call add-overlays, $(SA410M_AUTO_BOARDS) ,$(SA410M_AUTO_BASE_DTB))
+sa410m_auto-overlays-dtb-$(CONFIG_ARCH_SA410M) += $(SA410M_AUTO_BOARDS) $(SA410M_AUTO_BASE_DTB)
 dtb-y += $(sa410m_auto-dtb-y)
 
 SA8155_LA_GVM_BASE_DTB += sa8155-vm-la.dtb
diff --git a/qcom/sa410m-emmc-ccard.dts b/qcom/sa410m-emmc-ccard-overlay.dts
similarity index 96%
rename from qcom/sa410m-emmc-ccard.dts
rename to qcom/sa410m-emmc-ccard-overlay.dts
index 3d248334..bb43da20 100644
--- a/qcom/sa410m-emmc-ccard.dts
+++ b/qcom/sa410m-emmc-ccard-overlay.dts
@@ -1,4 +1,5 @@
 /dts-v1/;
+/plugin/;
 
 #include "sa410m-idp.dtsi"
 
diff --git a/qcom/sa410m-emmc-idp.dts b/qcom/sa410m-emmc-idp-overlay.dts
similarity index 96%
rename from qcom/sa410m-emmc-idp.dts
rename to qcom/sa410m-emmc-idp-overlay.dts
index 9fc63fa4..dc4e9ea8 100644
--- a/qcom/sa410m-emmc-idp.dts
+++ b/qcom/sa410m-emmc-idp-overlay.dts
@@ -1,4 +1,5 @@
 /dts-v1/;
+/plugin/;
 
 #include "sa410m-idp.dtsi"
 
diff --git a/qcom/sa410m-idp.dtsi b/qcom/sa410m-idp.dtsi
index d9b9fec9..8287d08e 100644
--- a/qcom/sa410m-idp.dtsi
+++ b/qcom/sa410m-idp.dtsi
@@ -1,4 +1,4 @@
-#include "sa410m.dtsi"
+&soc { } ;
 
 &qnand_1 {
 	status = "ok";
diff --git a/qcom/sa410m-nand-ccard.dts b/qcom/sa410m-nand-ccard-overlay.dts
similarity index 96%
rename from qcom/sa410m-nand-ccard.dts
rename to qcom/sa410m-nand-ccard-overlay.dts
index 6429a222..c0d0675b 100644
--- a/qcom/sa410m-nand-ccard.dts
+++ b/qcom/sa410m-nand-ccard-overlay.dts
@@ -1,4 +1,5 @@
 /dts-v1/;
+/plugin/;
 
 #include "sa410m-idp.dtsi"
 
diff --git a/qcom/sa410m-nand-idp.dts b/qcom/sa410m-nand-idp-overlay.dts
similarity index 96%
rename from qcom/sa410m-nand-idp.dts
rename to qcom/sa410m-nand-idp-overlay.dts
index 920712c2..238124e7 100644
--- a/qcom/sa410m-nand-idp.dts
+++ b/qcom/sa410m-nand-idp-overlay.dts
@@ -1,4 +1,5 @@
 /dts-v1/;
+/plugin/;
 
 #include "sa410m-idp.dtsi"
 
diff --git a/qcom/sa410m-rumi.dts b/qcom/sa410m-rumi-overlay.dts
similarity index 84%
rename from qcom/sa410m-rumi.dts
rename to qcom/sa410m-rumi-overlay.dts
index 164ff166..d217f4fe 100644
--- a/qcom/sa410m-rumi.dts
+++ b/qcom/sa410m-rumi-overlay.dts
@@ -1,4 +1,5 @@
 /dts-v1/;
+/plugin/;
 
 #include "sa410m-rumi.dtsi"
 
@@ -6,5 +7,5 @@
 	model = "Qualcomm Technologies, Inc. SA410M RUMI";
 	compatible = "qcom,sa410m", "qcom,rumi", "qcom,sa410m-rumi";
 	qcom,msm-id=<560 0x10000>;
-	qcom,board-id = <15 0x400>;
+	qcom,board-id = <15 0>;
 };
diff --git a/qcom/sa410m-rumi.dtsi b/qcom/sa410m-rumi.dtsi
index cdcc4486..e9d21f68 100644
--- a/qcom/sa410m-rumi.dtsi
+++ b/qcom/sa410m-rumi.dtsi
@@ -1,5 +1,3 @@
-#include "sa410m.dtsi"
-
 &arch_timer {
 	clock-frequency = <500000>;
 };
diff --git a/qcom/sa410m.dts b/qcom/sa410m.dts
new file mode 100644
index 00000000..f018cfc6
--- /dev/null
+++ b/qcom/sa410m.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "sa410m.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SA410M";
+	compatible = "qcom,sa410m";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/sa410m.dtsi b/qcom/sa410m.dtsi
index 9338e882..a69b02a4 100644
--- a/qcom/sa410m.dtsi
+++ b/qcom/sa410m.dtsi
@@ -6,10 +6,13 @@
 #include <dt-bindings/clock/qcom,rpmcc.h>
 
 / {
-	#address-cells = <2>;
-	#size-cells = <2>;
+	model = "Qualcomm Technologies, Inc. SA410M";
+	compatible = "qcom,sa410m";
+	qcom,msm-id = <560 0x10000>;
 	interrupt-parent = <&intc>;
 
+	#address-cells = <2>;
+	#size-cells = <2>;
 	memory { device_type = "memory"; reg = <0 0 0 0>; };
 
 	reserved_memory: reserved-memory { };