diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-10-15 22:28:17 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-10-15 22:28:16 -0700 |
| commit | 3a799fd24db3939fd49ad0190dfd6c9fdfeb84b0 (patch) | |
| tree | ea819dbc7713ed929613589439490c5fb7b7285e | |
| parent | 053e6bf3f6bf919033b9f18284fa4da62a4ac8db (diff) | |
| parent | d2ea335380df301182fd6d44c3f16a535455decb (diff) | |
Merge "ARM: dts: msm: disable sensor node on msm8996 and apq8096"
7 files changed, 23 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts b/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts index 46894ea1e530..1a870b4272a5 100644 --- a/arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts +++ b/arch/arm/boot/dts/qcom/apq8096-v3-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 @@ -36,6 +36,9 @@ }; &soc { + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; + }; qcom,msm-thermal { qcom,hotplug-temp = <115>; qcom,hotplug-temp-hysteresis = <25>; diff --git a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts index 4648d2000d01..0bb04361eabe 100644 --- a/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts +++ b/arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts @@ -30,6 +30,9 @@ }; &soc { + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; + }; qcom,msm-thermal { qcom,hotplug-temp = <115>; qcom,hotplug-temp-hysteresis = <25>; 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 d0758aeacb6f..908dc4a20372 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 @@ -37,6 +37,9 @@ }; &soc { + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; + }; qcom,msm-thermal { qcom,hotplug-temp = <115>; qcom,hotplug-temp-hysteresis = <25>; diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi index 12af84e66330..e6598fa2d0c5 100644 --- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi @@ -1042,10 +1042,8 @@ status = "disabled"; }; - qcom,msm-ssc-sensors { - compatible = "qcom,msm-ssc-sensors"; - qcom,firmware-name = "slpi"; - status = "ok"; + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; }; sound-adp-agave { @@ -1143,6 +1141,7 @@ qcom,refs-tdm-rx = <&dai_tert_tdm_rx_5>; qcom,spkr-tdm-rx = <&dai_quat_tdm_rx_0>; qcom,mic-tdm-tx = <&dai_quat_tdm_tx_0>; + status = "disabled"; }; usb_detect: usb_detect { diff --git a/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts index 89a585bd426e..c3abc6b4d20d 100644 --- a/arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts +++ b/arch/arm/boot/dts/qcom/msm8996-v3-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,6 +37,9 @@ }; &soc { + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; + }; qcom,msm-thermal { qcom,hotplug-temp = <115>; qcom,hotplug-temp-hysteresis = <25>; diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts index 02f5dbcc0d4d..46140abca7cf 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts +++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts @@ -30,6 +30,9 @@ }; &soc { + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; + }; qcom,msm-thermal { qcom,hotplug-temp = <115>; qcom,hotplug-temp-hysteresis = <25>; diff --git a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts index 05a3144fb312..75631bbb56b8 100644 --- a/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts +++ b/arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts @@ -37,6 +37,9 @@ }; &soc { + ssc_sensors: qcom,msm-ssc-sensors { + status = "disabled"; + }; qcom,msm-thermal { qcom,hotplug-temp = <115>; qcom,hotplug-temp-hysteresis = <25>; |