diff --git a/qcom/Makefile b/qcom/Makefile
index 12d95ff9..9e222a2e 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -38,15 +38,19 @@ dtb-$(CONFIG_ARCH_WAIPIO) += \
 
 
 KALAMA_BASE_DTB += kalama.dtb
+KALAMA_APQ_BASE_DTB += kalamap.dtb
 
 KALAMA_BOARDS += \
-		 kalama-rumi-overlay.dtbo \
 		 kalama-mtp-overlay.dtbo \
 		 kalama-cdp-overlay.dtbo \
 		 kalama-qrd-overlay.dtbo
 
+NOAPQ_KALAMA_BOARDS += \
+		 kalama-rumi-overlay.dtbo
+
 dtb-$(CONFIG_ARCH_KALAMA) += \
-	$(call add-overlays, $(KALAMA_BOARDS),$(KALAMA_BASE_DTB))
+	$(call add-overlays, $(KALAMA_BOARDS) $(NOAPQ_KALAMA_BOARDS),$(KALAMA_BASE_DTB))\
+	$(call add-overlays, $(KALAMA_BOARDS) $(APQ_KALAMA_BOARDS),$(KALAMA_APQ_BASE_DTB))
 
 always-y        := $(dtb-y)
 subdir-y        := $(dts-dirs)
diff --git a/qcom/kalama-cdp-overlay.dts b/qcom/kalama-cdp-overlay.dts
index e7d66a41..df9043fd 100644
--- a/qcom/kalama-cdp-overlay.dts
+++ b/qcom/kalama-cdp-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama CDP";
 	compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp";
-	qcom,msm-id = <519 0x10000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x10001 0>;
 };
diff --git a/qcom/kalama-mtp-overlay.dts b/qcom/kalama-mtp-overlay.dts
index 206704fc..26cac7ce 100644
--- a/qcom/kalama-mtp-overlay.dts
+++ b/qcom/kalama-mtp-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama MTP";
 	compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp";
-	qcom,msm-id = <519 0x10000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x10008 0>;
 };
diff --git a/qcom/kalama-qrd-overlay.dts b/qcom/kalama-qrd-overlay.dts
index bac338fd..9934cda7 100644
--- a/qcom/kalama-qrd-overlay.dts
+++ b/qcom/kalama-qrd-overlay.dts
@@ -6,6 +6,6 @@
 / {
 	model = "Qualcomm Technologies, Inc. Kalama RUMI";
 	compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd";
-	qcom,msm-id = <519 0x10000>;
+	qcom,msm-id = <519 0x10000>, <536 0x10000>;
 	qcom,board-id = <0x1000B 0>;
 };
diff --git a/qcom/kalamap.dts b/qcom/kalamap.dts
new file mode 100644
index 00000000..321b8119
--- /dev/null
+++ b/qcom/kalamap.dts
@@ -0,0 +1,9 @@
+/dts-v1/;
+
+#include "kalamap.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KalamaP SoC";
+	compatible = "qcom,kalamap";
+	qcom,board-id = <0 0>;
+};
diff --git a/qcom/kalamap.dtsi b/qcom/kalamap.dtsi
new file mode 100644
index 00000000..81033c00
--- /dev/null
+++ b/qcom/kalamap.dtsi
@@ -0,0 +1,7 @@
+#include "kalama.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. KalamaP";
+	compatible = "qcom,kalamap";
+	qcom,msm-id = <536 0x10000>;
+};