diff --git a/Kbuild b/Kbuild
index f237e6d0..e2380ae3 100644
--- a/Kbuild
+++ b/Kbuild
@@ -10,7 +10,7 @@ dtbo-y += kalama-audio.dtbo \
                  kalama-audio-rcm.dtbo \
                  kalama-audio-rumi.dtbo \
                  kalama-audio-hdk.dtbo \
-                 kalama-audio-hhg.dtbo
+                 kalama-sg-audio-hhg.dtbo
 endif
 
 ifeq ($(CONFIG_ARCH_SA8155), y)
diff --git a/kalama-audio-hhg.dts b/kalama-audio-hhg.dts
deleted file mode 100644
index 3a8f6406..00000000
--- a/kalama-audio-hhg.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "kalama-audio-hhg.dtsi"
- / {
-	model = "Qualcomm Technologies, Inc. KalamaP HHG";
-	compatible = "qcom,kalamap-hhg", "qcom,kalamap", "qcom,hhg";
-	qcom,msm-id = <536 0x10000>, <536 0x20000>;
-	qcom,board-id = <0x1001f 0x1>;
-};
\ No newline at end of file
diff --git a/kalama-audio.dts b/kalama-audio.dts
index 3fb4c66e..e246d1c7 100644
--- a/kalama-audio.dts
+++ b/kalama-audio.dts
@@ -11,6 +11,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama";
 	compatible = "qcom,kalama";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>;
 	qcom,board-id = <0 0>;
 };
diff --git a/kalama-sg-audio-hhg.dts b/kalama-sg-audio-hhg.dts
new file mode 100644
index 00000000..e853b117
--- /dev/null
+++ b/kalama-sg-audio-hhg.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+#include "kalama-sg-audio-hhg.dtsi"
+ / {
+	model = "Qualcomm Technologies, Inc. Kalama SG HHG";
+	compatible = "qcom,kalamap", "qcom,hhg";
+	qcom,msm-id = <600 0x20000>, <601 0x20000>;
+	qcom,board-id = <0x1001f 0x1>;
+};
\ No newline at end of file
diff --git a/kalama-audio-hhg.dtsi b/kalama-sg-audio-hhg.dtsi
similarity index 92%
rename from kalama-audio-hhg.dtsi
rename to kalama-sg-audio-hhg.dtsi
index 9e5493a7..75e9ee0a 100644
--- a/kalama-audio-hhg.dtsi
+++ b/kalama-sg-audio-hhg.dtsi
@@ -23,9 +23,19 @@
 	};
 };
 
+&wsa_macro {
+	qcom,wsa-bat-cfgs = <2>, <2>;
+};
+
+&swr_haptics {
+	status = "disabled";
+};
+
+
 &kalama_snd {
 	qcom,model = "kalama-grd-snd-card";
 
+	swr-haptics-unsupported;
 	qcom,audio-routing =
 		"AMIC1", "Analog Mic1",
 		"AMIC1", "MIC BIAS1",
@@ -50,7 +60,6 @@
 		"IN1_HPHL", "HPHL_OUT",
 		"IN2_HPHR", "HPHR_OUT",
 		"IN3_AUX", "AUX_OUT",
-		"HAP_IN", "PCM_OUT",
 		"WSA SRC0_INP", "SRC0",
 		"WSA_TX DEC0_INP", "TX DEC0 MUX",
 		"WSA_TX DEC1_INP", "TX DEC1 MUX",