Merge "ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform"

tenec203 · May 4, 2018 · 6b0ad76 · 6b0ad76
2 parents ea40a6c + d1271b2
commit 6b0ad76
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
@@ -89,3 +89,9 @@
 &modem_mem {
 	status = "disabled";
 };
+
+&wil6210 {
+	qcom,pcie-parent = <&pcie0>;
+	qcom,smmu-support;
+	status = "ok";
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -86,3 +86,8 @@
 	};
 };
 
+&wil6210 {
+	qcom,pcie-parent = <&pcie0>;
+	qcom,smmu-support;
+	status = "ok";
+};