Merge "ARM: dts: msm: enable sensor node on msm8996 and apq8096"

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / arch / arm / boot / dts / qcom / apq8096pro-v1.1-auto-adp.dts

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 840d82f..39ec8d4 100644 (file)
--- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp.dts
+++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-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
@@ -37,10 +37,6 @@
 };
 
 &soc {
-       qcom,msm-ssc-sensors {
-               status = "disabled";
-       };
-
        qcom,msm-thermal {
                qcom,hotplug-temp = <115>;
                qcom,hotplug-temp-hysteresis = <25>;
@@ -86,3 +82,12 @@
        };
 };
 
+&modem_mem {
+       status = "disabled";
+};
+
+&wil6210 {
+       qcom,pcie-parent = <&pcie0>;
+       qcom,smmu-support;
+       status = "ok";
+};