diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-03 19:58:45 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-03 19:58:45 -0700 |
| commit | 6b0ad7611a9a7d43b72e4fe65d830f3b69928979 (patch) | |
| tree | 6cbc1ceced7142a2f7f197cc7e8c58db123e4b53 | |
| parent | ea40a6c52145405785ce3f54e4cfb7f2df75af90 (diff) | |
| parent | d1271b24c93fb5bc6640e549967dd8901e59999d (diff) | |
Merge "ARM: dts: msm: Enable 802.11ad wifi device on msm8996 platform"
| -rw-r--r-- | arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts | 7 |
2 files changed, 12 insertions, 1 deletions
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 index fa3467646b7c..eb24e7198f87 100644 --- 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 index d2aa5c854c83..ec1b7cec4147 100644 --- 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"; +}; |