From a3e7dd1a976e22ad72093c2ea9c725f77abbc309 Mon Sep 17 00:00:00 2001
From: Nishant Pandey <nishpand@qti.qualcomm.com>
Date: Wed, 28 Sep 2022 10:29:40 -0700
Subject: [PATCH] ARM: dts: msm: Enable DT overlay support for scuba auto

Enable DT overlay support for scuba auto.

Change-Id: I8897f48101d8ced825bf399ccd12b701385a9a83
---
 qcom/Makefile                                        |  8 ++++++--
 ...scuba_auto-idp.dts => scuba_auto-idp-overlay.dts} |  2 +-
 ...scuba_auto-qrd.dts => scuba_auto-qrd-overlay.dts} |  2 +-
 qcom/scuba_auto.dts                                  | 10 ++++++++++
 qcom/scuba_auto.dtsi                                 | 12 +++++++++++-
 5 files changed, 29 insertions(+), 5 deletions(-)
 rename qcom/{scuba_auto-idp.dts => scuba_auto-idp-overlay.dts} (89%)
 rename qcom/{scuba_auto-qrd.dts => scuba_auto-qrd-overlay.dts} (88%)
 create mode 100644 qcom/scuba_auto.dts

diff --git a/qcom/Makefile b/qcom/Makefile
index 7883573d..49acfb12 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -234,9 +234,13 @@ autogvm-overlays-dtb-$(CONFIG_QTI_QUIN_GVM) += $(SA8155_LA_GVM_BOARDS) $(SA8155_
 
 dtb-y += $(autogvm-dtb-y)
 
+SCUBA_AUTO_BASE_DTB += scuba_auto.dtb
+SCUBA_AUTO_BOARDS += \
+		scuba_auto-idp-overlay.dtbo \
+		scuba_auto-qrd-overlay.dtbo
 scuba_auto-dtb-$(CONFIG_ARCH_SCUBA_AUTO) += \
-				scuba_auto-idp.dtb \
-				scuba_auto-qrd.dtb
+	$(call add-overlays, $(SCUBA_AUTO_BOARDS) ,$(SCUBA_AUTO_BASE_DTB))
+scuba_auto-overlays-dtb-$(CONFIG_ARCH_SCUBA_AUTO) += $(SCUBA_AUTO_BOARDS) $(SCUBA_AUTO_BASE_DTB)
 dtb-y += $(scuba_auto-dtb-y)
 
 endif
diff --git a/qcom/scuba_auto-idp.dts b/qcom/scuba_auto-idp-overlay.dts
similarity index 89%
rename from qcom/scuba_auto-idp.dts
rename to qcom/scuba_auto-idp-overlay.dts
index b2085f9c..14b319c6 100644
--- a/qcom/scuba_auto-idp.dts
+++ b/qcom/scuba_auto-idp-overlay.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
+/plugin/;
 
-#include "scuba_auto.dtsi"
 #include "scuba_auto-idp.dtsi"
 
 / {
diff --git a/qcom/scuba_auto-qrd.dts b/qcom/scuba_auto-qrd-overlay.dts
similarity index 88%
rename from qcom/scuba_auto-qrd.dts
rename to qcom/scuba_auto-qrd-overlay.dts
index 195a2fad..e38a0032 100644
--- a/qcom/scuba_auto-qrd.dts
+++ b/qcom/scuba_auto-qrd-overlay.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
+/plugin/;
 
 #include "scuba_auto.dtsi"
-#include "scuba_auto-qrd.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. SCUBA AUTO QRD";
diff --git a/qcom/scuba_auto.dts b/qcom/scuba_auto.dts
new file mode 100644
index 00000000..574e96eb
--- /dev/null
+++ b/qcom/scuba_auto.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+#include "scuba_auto.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. SCUBA AUTO";
+	compatible = "qcom,sa410m";
+	qcom,msm-id = <441 0x10000>, <471 0x10000>;
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/scuba_auto.dtsi b/qcom/scuba_auto.dtsi
index 794d734b..997d4f72 100644
--- a/qcom/scuba_auto.dtsi
+++ b/qcom/scuba_auto.dtsi
@@ -20,7 +20,9 @@
 
 	reserved_memory: reserved-memory { };
 
-	chosen: chosen { };
+	chosen: chosen {
+		bootargs = "rcupdate.rcu_expedited=1 rcu_nocbs=0-7";
+	};
 
 	mem-offline {
 		compatible = "qcom,mem-offline";
@@ -317,6 +319,14 @@
 		clock-frequency = <19200000>;
 	};
 
+	qcom_tzlog: tz-log@c125720 {
+		compatible = "qcom,tz-log";
+		reg = <0xc125720 0x3000>;
+		qcom,hyplog-enabled;
+		hyplog-address-offset = <0x410>;
+		hyplog-size-offset = <0x414>;
+	};
+
 	memtimer: timer@f120000 {
 		#address-cells = <1>;
 		#size-cells = <1>;