From 0ffac25b375166f2e1a25a75272b126fa6caee87 Mon Sep 17 00:00:00 2001
From: Lijuan Gao <lijuang@qti.qualcomm.com>
Date: Fri, 26 Aug 2022 12:08:27 +0800
Subject: [PATCH] ARM: dts: msm: Add device tree support for Kalamap SG SoC
 Variants

Add device trees for Kalamap SG SoC Variants.

Change-Id: Ie1732447dee42385df0c8f35a99119ec2c2d7903
---
 qcom/Makefile                   |  2 +-
 qcom/kalama-sg-hhg.dtsi         | 50 ++++++++++++++++++++++++++++++++
 qcom/kalamap-hhg-overlay.dts    | 11 -------
 qcom/kalamap-hhg.dtsi           | 51 ---------------------------------
 qcom/kalamap-sg-hhg-overlay.dts | 11 +++++++
 qcom/kalamap-sg-hhg.dtsi        |  1 +
 6 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 qcom/kalamap-hhg-overlay.dts
 delete mode 100644 qcom/kalamap-hhg.dtsi
 create mode 100644 qcom/kalamap-sg-hhg-overlay.dts
 create mode 100644 qcom/kalamap-sg-hhg.dtsi

diff --git a/qcom/Makefile b/qcom/Makefile
index 32a0cad8..50167a8a 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -58,7 +58,7 @@ KALAMA_BOARDS += \
 		 kalama-qrd-overlay.dtbo \
 		 kalama-sg-hhg-overlay.dtbo \
 		 kalamap-hdk-overlay.dtbo \
-		 kalamap-hhg-overlay.dtbo
+		 kalamap-sg-hhg-overlay.dtbo
 
 NOAPQ_KALAMA_BOARDS += \
 		 kalama-rumi-overlay.dtbo
diff --git a/qcom/kalama-sg-hhg.dtsi b/qcom/kalama-sg-hhg.dtsi
index e68c7c5b..5b756405 100644
--- a/qcom/kalama-sg-hhg.dtsi
+++ b/qcom/kalama-sg-hhg.dtsi
@@ -1 +1,51 @@
 #include "kalama-qrd.dtsi"
+
+&pm8550b_haptics {
+	status = "disabled";
+};
+
+&pm8550_flash {
+	/delete-node/ qcom,flash_0;
+	/delete-node/ qcom,flash_1;
+	/delete-node/ qcom,flash_2;
+	/delete-node/ qcom,flash_3;
+	/delete-node/ qcom,torch_0;
+	/delete-node/ qcom,torch_1;
+	/delete-node/ qcom,torch_2;
+	/delete-node/ qcom,torch_3;
+	/delete-node/ qcom,led_switch_0;
+	/delete-node/ qcom,led_switch_1;
+	/delete-node/ qcom,led_switch_2;
+
+	qcom,indicator_0 {
+		label = "indicator";
+		qcom,id = <0>;
+		qcom,led-name = "led:white";
+		qcom,max-current-ma = <20>;
+		qcom,ires-ua = <5000>;
+	};
+
+	qcom,indicator_1 {
+		label = "indicator";
+		qcom,id = <1>;
+		qcom,led-name = "led:blue";
+		qcom,max-current-ma = <5>;
+		qcom,ires-ua = <5000>;
+	};
+
+	qcom,indicator_2 {
+		label = "indicator";
+		qcom,id = <2>;
+		qcom,led-name = "led:green";
+		qcom,max-current-ma = <5>;
+		qcom,ires-ua = <5000>;
+	};
+
+	qcom,indicator_3 {
+		label = "indicator";
+		qcom,id = <3>;
+		qcom,led-name = "led:red";
+		qcom,max-current-ma = <5>;
+		qcom,ires-ua = <5000>;
+	};
+};
diff --git a/qcom/kalamap-hhg-overlay.dts b/qcom/kalamap-hhg-overlay.dts
deleted file mode 100644
index ba83f50e..00000000
--- a/qcom/kalamap-hhg-overlay.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "kalamap-hhg.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. KalamaP HHG";
-	compatible = "qcom,kalamap-hhg", "qcom,kalamap", "qcom,hhg";
-	qcom,msm-id = <536 0x10000>, <536 0x20000>, <601 0x20000>;
-	qcom,board-id = <0x1001f 0x1>;
-};
diff --git a/qcom/kalamap-hhg.dtsi b/qcom/kalamap-hhg.dtsi
deleted file mode 100644
index 5b756405..00000000
--- a/qcom/kalamap-hhg.dtsi
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "kalama-qrd.dtsi"
-
-&pm8550b_haptics {
-	status = "disabled";
-};
-
-&pm8550_flash {
-	/delete-node/ qcom,flash_0;
-	/delete-node/ qcom,flash_1;
-	/delete-node/ qcom,flash_2;
-	/delete-node/ qcom,flash_3;
-	/delete-node/ qcom,torch_0;
-	/delete-node/ qcom,torch_1;
-	/delete-node/ qcom,torch_2;
-	/delete-node/ qcom,torch_3;
-	/delete-node/ qcom,led_switch_0;
-	/delete-node/ qcom,led_switch_1;
-	/delete-node/ qcom,led_switch_2;
-
-	qcom,indicator_0 {
-		label = "indicator";
-		qcom,id = <0>;
-		qcom,led-name = "led:white";
-		qcom,max-current-ma = <20>;
-		qcom,ires-ua = <5000>;
-	};
-
-	qcom,indicator_1 {
-		label = "indicator";
-		qcom,id = <1>;
-		qcom,led-name = "led:blue";
-		qcom,max-current-ma = <5>;
-		qcom,ires-ua = <5000>;
-	};
-
-	qcom,indicator_2 {
-		label = "indicator";
-		qcom,id = <2>;
-		qcom,led-name = "led:green";
-		qcom,max-current-ma = <5>;
-		qcom,ires-ua = <5000>;
-	};
-
-	qcom,indicator_3 {
-		label = "indicator";
-		qcom,id = <3>;
-		qcom,led-name = "led:red";
-		qcom,max-current-ma = <5>;
-		qcom,ires-ua = <5000>;
-	};
-};
diff --git a/qcom/kalamap-sg-hhg-overlay.dts b/qcom/kalamap-sg-hhg-overlay.dts
new file mode 100644
index 00000000..72e96e3d
--- /dev/null
+++ b/qcom/kalamap-sg-hhg-overlay.dts
@@ -0,0 +1,11 @@
+/dts-v1/;
+/plugin/;
+
+#include "kalamap-sg-hhg.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KalamaP SG HHG";
+	compatible = "qcom,kalamap", "qcom,hhg";
+	qcom,msm-id = <601 0x20000>;
+	qcom,board-id = <0x1001f 0x1>;
+};
diff --git a/qcom/kalamap-sg-hhg.dtsi b/qcom/kalamap-sg-hhg.dtsi
new file mode 100644
index 00000000..f1b49569
--- /dev/null
+++ b/qcom/kalamap-sg-hhg.dtsi
@@ -0,0 +1 @@
+#include "kalama-sg-hhg.dtsi"