Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b0ad761 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents ea40a6c5 d1271b24

arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts

+6 −0
Original line number Diff line number Diff line
@@ -89,3 +89,9 @@ 
&modem_mem {

	status = "disabled";

};



&wil6210 {

	qcom,pcie-parent = <&pcie0>;

	qcom,smmu-support;

	status = "ok";

};

arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts

+6 −1
Original line number Diff line number Diff line 
/* 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";

};