diff --git a/qcom/waipio-kiwi-mtp-pm8008-overlay.dts b/qcom/waipio-kiwi-mtp-pm8008-overlay.dts
index 9b3a679b..c86f83db 100644
--- a/qcom/waipio-kiwi-mtp-pm8008-overlay.dts
+++ b/qcom/waipio-kiwi-mtp-pm8008-overlay.dts
@@ -3,6 +3,7 @@
 
 #include "waipio-mtp.dtsi"
 #include "waipio-pm8008.dtsi"
+#include "waipio-kiwi.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Waipio with kiwi";
diff --git a/qcom/waipio-kiwi-mtp-pm8010-overlay.dts b/qcom/waipio-kiwi-mtp-pm8010-overlay.dts
index f99f0a49..66e2e1c3 100644
--- a/qcom/waipio-kiwi-mtp-pm8010-overlay.dts
+++ b/qcom/waipio-kiwi-mtp-pm8010-overlay.dts
@@ -3,6 +3,7 @@
 
 #include "waipio-mtp.dtsi"
 #include "waipio-pm8010-spmi.dtsi"
+#include "waipio-kiwi.dtsi"
 
 / {
 	model = "Qualcomm Technologies, Inc. Waipio with Kiwi";
diff --git a/qcom/waipio-kiwi.dtsi b/qcom/waipio-kiwi.dtsi
new file mode 100644
index 00000000..20c4b235
--- /dev/null
+++ b/qcom/waipio-kiwi.dtsi
@@ -0,0 +1,117 @@
+#include <dt-bindings/interconnect/qcom,waipio.h>
+
+&wlan {
+	status = "disabled";
+};
+
+&bluetooth {
+	status = "disabled";
+};
+
+&soc {
+	wlan_wcn7850: qcom,cnss-wcn7850@b0000000 {
+		compatible = "qcom,cnss-wcn7850";
+		reg = <0xb0000000 0x10000>;
+		reg-names = "smmu_iova_ipa";
+		wlan-en-gpio = <&tlmm 80 0>;
+		pinctrl-names = "wlan_en_active", "wlan_en_sleep";
+		pinctrl-0 = <&cnss_wlan_en_active>;
+		pinctrl-1 = <&cnss_wlan_en_sleep>;
+		qcom,wlan;
+		qcom,wlan-rc-num = <1>;
+		qcom,wlan-ramdump-dynamic = <0x780000>;
+		use-pm-domain;
+		cnss-enable-self-recovery;
+		qcom,same-dt-multi-dev;
+		mboxes = <&qmp_aop 0>;
+
+		vdd-wlan-io-supply = <&S10B>;
+		qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>;
+		vdd-wlan-supply = <&S3E>;
+		qcom,vdd-wlan-config = <1000000 1000000 0 0 0>;
+		vdd-wlan-aon-supply = <&S2E>;
+		qcom,vdd-wlan-aon-config = <980000 980000 0 0 0>;
+		vdd-wlan-dig-supply = <&S11B>;
+		qcom,vdd-wlan-dig-config = <950000 950000 0 0 0>;
+		vdd-wlan-rfa1-supply = <&S1C>;
+		qcom,vdd-wlan-rfa1-config = <1900000 1900000 0 0 0>;
+		vdd-wlan-rfa2-supply = <&S12B>;
+		qcom,vdd-wlan-rfa2-config = <1350000 1350000 0 0 0>;
+
+		interconnects =
+		<&pcie_noc MASTER_PCIE_1 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>,
+		<&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>;
+		interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr";
+
+		qcom,icc-path-count = <2>;
+		qcom,bus-bw-cfg-count = <7>;
+		qcom,bus-bw-cfg =
+		/** ICC Path 1 **/
+		<0 0>, /* no vote */
+		/* idle: 0-18 Mbps snoc/anoc: 100 Mhz ddr: 451.2 MHz */
+		<2250 390000>,
+		/* low: 18-60 Mbps snoc/anoc: 100 Mhz ddr: 451.2 MHz */
+		<7500 390000>,
+		/* medium: 60-240 Mbps snoc/anoc: 200 Mhz ddr: 451.2 MHz */
+		<30000 790000>,
+		/* high: 240-1080 Mbps snoc/anoc: 200 Mhz ddr: 451.2 MHz */
+		<100000 790000>,
+		/* very high: > 1080 Mbps snoc/anoc: 403 Mhz ddr: 451.2 MHz */
+		<175000 1600000>,
+		/* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz
+		 * ddr: 547.2 MHz
+		 */
+		<7500 390000>,
+
+		/** ICC Path 2 **/
+		<0 0>,
+		<2250 1804800>,
+		<7500 1804800>,
+		<30000 1804800>,
+		<100000 1804800>,
+		<175000 6220800>,
+		<7500 2188800>;
+	};
+
+	bt_hmt: bt_wcn7850 {
+		compatible = "qcom,wcn7850";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bt_en_sleep>;
+		qcom,bt-reset-gpio = <&tlmm 81 0>; /* BT_EN */
+		qcom,wl-reset-gpio = <&tlmm 80 0>; /* WL_EN */
+		qcom,bt-sw-ctrl-gpio = <&tlmm 82 0>; /* SW_CTRL */
+
+		qcom,bt-vdd-aon-supply = <&S11B>;
+		qcom,bt-vdd-dig-supply = <&S11B>;
+		qcom,bt-vdd-rfa1-supply = <&S1C>;
+		qcom,bt-vdd-rfa2-supply = <&S12B>;
+
+		qcom,bt-vdd-aon-config = <950000 950000 0 1>;
+		qcom,bt-vdd-dig-config = <950000 950000 0 1>;
+		qcom,bt-vdd-rfa1-config = <1900000 1900000 0 1>;
+		qcom,bt-vdd-rfa2-config = <1350000 1350000 0 1>;
+	};
+};
+
+&pcie1_rp {
+	#address-cells = <5>;
+	#size-cells = <0>;
+
+	cnss_pci1: cnss_pci1 {
+		reg = <0 0 0 0 0>;
+		qcom,iommu-group = <&cnss_pci_iommu_group1>;
+		memory-region = <&cnss_wlan_mem>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		cnss_pci_iommu_group1: cnss_pci_iommu_group1 {
+			qcom,iommu-msi-size = <0x1000>;
+			qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>;
+			qcom,iommu-dma = "fastmap";
+			qcom,iommu-pagetable = "coherent";
+			qcom,iommu-faults = "stall-disable", "HUPCF", "no-CFRE",
+					    "non-fatal";
+		};
+	};
+};