diff --git a/Kbuild b/Kbuild
index 8ffffa8d..4fc92edb 100644
--- a/Kbuild
+++ b/Kbuild
@@ -1,7 +1,6 @@
 ifeq ($(CONFIG_ARCH_KALAMA), y)
 dtbo-y += kalama-audio.dtbo \
                  kalama-audio-cdp.dtbo \
-                 kalama-audio-cdp-nfc.dtbo \
                  kalama-audio-wsa883x-cdp.dtbo \
                  kalama-audio-mtp.dtbo \
                  kalama-audio-mtp-nfc.dtbo \
diff --git a/kalama-audio-cdp-nfc.dts b/kalama-audio-cdp-nfc.dts
deleted file mode 100644
index 308f0fb2..00000000
--- a/kalama-audio-cdp-nfc.dts
+++ /dev/null
@@ -1,10 +0,0 @@
-/dts-v1/;
-/plugin/;
-
-#include "kalama-audio-cdp.dtsi"
- / {
-	model = "Qualcomm Technologies, Inc. Kalama CDP ST54K NFC";
-	compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
-	qcom,board-id = <0x02010001 0>;
-};
diff --git a/kalama-audio-cdp.dts b/kalama-audio-cdp.dts
index 8a345804..35d97f94 100644
--- a/kalama-audio-cdp.dts
+++ b/kalama-audio-cdp.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama CDP";
 	compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x10001 0>;
 };
diff --git a/kalama-audio-mtp-nfc.dts b/kalama-audio-mtp-nfc.dts
index 7f871a67..825e4db6 100644
--- a/kalama-audio-mtp-nfc.dts
+++ b/kalama-audio-mtp-nfc.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama MTP ST54K NFC";
 	compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x1010008 0>;
 };
diff --git a/kalama-audio-mtp.dts b/kalama-audio-mtp.dts
index e8f2a9b3..5ad4a94d 100644
--- a/kalama-audio-mtp.dts
+++ b/kalama-audio-mtp.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama MTP";
 	compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x10008 0>;
 };
diff --git a/kalama-audio-qrd.dts b/kalama-audio-qrd.dts
index 52349a7a..05d05e62 100644
--- a/kalama-audio-qrd.dts
+++ b/kalama-audio-qrd.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama QRD";
 	compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x1000B 0>;
 };
diff --git a/kalama-audio-rcm.dts b/kalama-audio-rcm.dts
index f7a7d8c6..c189e28d 100644
--- a/kalama-audio-rcm.dts
+++ b/kalama-audio-rcm.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama RCM";
 	compatible = "qcom,kalama-rcm", "qcom,kalama", "qcom,rcm";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x10015 0>;
 };
diff --git a/kalama-audio-rumi.dts b/kalama-audio-rumi.dts
index ec26b758..47dc265f 100644
--- a/kalama-audio-rumi.dts
+++ b/kalama-audio-rumi.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama RUMI";
 	compatible = "qcom,kalama-rumi", "qcom,kalama", "qcom,rumi";
-	qcom,msm-id = <519 0x10000>, <519 0x20000>, <536 0x10000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>;
 	qcom,board-id = <0x1000F 0>;
 };
diff --git a/kalama-audio-wsa883x-cdp.dts b/kalama-audio-wsa883x-cdp.dts
index d8159d5b..b229c76a 100644
--- a/kalama-audio-wsa883x-cdp.dts
+++ b/kalama-audio-wsa883x-cdp.dts
@@ -5,6 +5,6 @@
  / {
 	model = "Qualcomm Technologies, Inc. Kalama CDP - WSA883X";
 	compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp";
-	qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x1010001 0>;
 };
diff --git a/kalama-audio.dts b/kalama-audio.dts
index 3fb4c66e..d553f153 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>;
 	qcom,board-id = <0 0>;
 };