diff --git a/qcom/Makefile b/qcom/Makefile
index ff421e17..a7ef402b 100644
--- a/qcom/Makefile
+++ b/qcom/Makefile
@@ -92,7 +92,9 @@ dtbo-$(CONFIG_ARCH_WAIPIO) += waipio-rumi-overlay.dtbo \
 	waipio-lemur-cdp-pm8008-overlay.dtbo \
 	waipio-lemur-cdp-pm8010-overlay.dtbo \
 	waipio-kiwi-mtp-pm8008-overlay.dtbo \
-	waipio-kiwi-mtp-pm8010-overlay.dtbo
+	waipio-kiwi-mtp-pm8010-overlay.dtbo \
+	waipio-kiwi-cdp-pm8008-overlay.dtbo \
+	waipio-kiwi-cdp-pm8010-overlay.dtbo \
 
 waipio-rumi-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
 waipio-mtp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
@@ -111,6 +113,8 @@ waipio-lemur-cdp-pm8008-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dt
 waipio-lemur-cdp-pm8010-overlay.dtbo-base := waipio.dtb waipiop.dtb waipio-v2.dtb waipiop-v2.dtb
 waipio-kiwi-mtp-pm8008-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
 waipio-kiwi-mtp-pm8010-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
+waipio-kiwi-cdp-pm8008-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
+waipio-kiwi-cdp-pm8010-overlay.dtbo-base := waipio.dtb waipio-v2.dtb
 else
 dtb-$(CONFIG_ARCH_WAIPIO) += waipio-rumi.dtb \
 	waipio-mtp-pm8008.dtb \
diff --git a/qcom/waipio-kiwi-cdp-pm8008-overlay.dts b/qcom/waipio-kiwi-cdp-pm8008-overlay.dts
new file mode 100644
index 00000000..6a36024b
--- /dev/null
+++ b/qcom/waipio-kiwi-cdp-pm8008-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include "waipio-cdp.dtsi"
+#include "waipio-pm8008.dtsi"
+#include "waipio-kiwi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio with kiwi";
+	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
+	qcom,board-id = <0x02010001 0x2>;
+};
diff --git a/qcom/waipio-kiwi-cdp-pm8010-overlay.dts b/qcom/waipio-kiwi-cdp-pm8010-overlay.dts
new file mode 100644
index 00000000..1d7b3f4a
--- /dev/null
+++ b/qcom/waipio-kiwi-cdp-pm8010-overlay.dts
@@ -0,0 +1,13 @@
+/dts-v1/;
+/plugin/;
+
+#include "waipio-cdp.dtsi"
+#include "waipio-pm8010-spmi.dtsi"
+#include "waipio-kiwi.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Waipio with Kiwi";
+	compatible = "qcom,waipio-cdp", "qcom,waipio", "qcom,cdp";
+	qcom,msm-id = <457 0x10000>, <482 0x10000>, <457 0x20000>, <482 0x20000>;
+	qcom,board-id = <0x02010001 0x2>;
+};