evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2018-10-15 22:28:17 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3a799fd24d
7 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
arch/arm/boot/dts/qcom/apq8096-v3-auto-adp.dts
View file

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -36,6 +36,9 @@
}; };
&soc { &soc {
ssc_sensors: qcom,msm-ssc-sensors {
status = "disabled";
};
qcom,msm-thermal { qcom,msm-thermal {
qcom,hotplug-temp = <115>; qcom,hotplug-temp = <115>;
qcom,hotplug-temp-hysteresis = <25>; qcom,hotplug-temp-hysteresis = <25>;

3
arch/arm/boot/dts/qcom/apq8096pro-v1.1-auto-adp-lite.dts
View file

@ -30,6 +30,9 @@
}; };
&soc { &soc {
ssc_sensors: qcom,msm-ssc-sensors {
status = "disabled";
};
qcom,msm-thermal { qcom,msm-thermal {
qcom,hotplug-temp = <115>; qcom,hotplug-temp = <115>;
qcom,hotplug-temp-hysteresis = <25>; qcom,hotplug-temp-hysteresis = <25>;

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

@ -37,6 +37,9 @@
}; };
&soc { &soc {
ssc_sensors: qcom,msm-ssc-sensors {
status = "disabled";
};
qcom,msm-thermal { qcom,msm-thermal {
qcom,hotplug-temp = <115>; qcom,hotplug-temp = <115>;
qcom,hotplug-temp-hysteresis = <25>; qcom,hotplug-temp-hysteresis = <25>;

7
arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
View file

@ -1042,10 +1042,8 @@
status = "disabled"; status = "disabled";
}; };
qcom,msm-ssc-sensors { ssc_sensors: qcom,msm-ssc-sensors {
compatible = "qcom,msm-ssc-sensors"; status = "disabled";
qcom,firmware-name = "slpi";
status = "ok";
}; };
sound-adp-agave { sound-adp-agave {
@ -1143,6 +1141,7 @@
qcom,refs-tdm-rx = <&dai_tert_tdm_rx_5>; qcom,refs-tdm-rx = <&dai_tert_tdm_rx_5>;
qcom,spkr-tdm-rx = <&dai_quat_tdm_rx_0>; qcom,spkr-tdm-rx = <&dai_quat_tdm_rx_0>;
qcom,mic-tdm-tx = <&dai_quat_tdm_tx_0>; qcom,mic-tdm-tx = <&dai_quat_tdm_tx_0>;
status = "disabled";
}; };
usb_detect: usb_detect { usb_detect: usb_detect {

5
arch/arm/boot/dts/qcom/msm8996-v3-auto-adp.dts
View file

@ -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 * 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 * it under the terms of the GNU General Public License version 2 and
@ -37,6 +37,9 @@
}; };
&soc { &soc {
ssc_sensors: qcom,msm-ssc-sensors {
status = "disabled";
};
qcom,msm-thermal { qcom,msm-thermal {
qcom,hotplug-temp = <115>; qcom,hotplug-temp = <115>;
qcom,hotplug-temp-hysteresis = <25>; qcom,hotplug-temp-hysteresis = <25>;

3
arch/arm/boot/dts/qcom/msm8996pro-auto-adp-lite.dts
View file

@ -30,6 +30,9 @@
}; };
&soc { &soc {
ssc_sensors: qcom,msm-ssc-sensors {
status = "disabled";
};
qcom,msm-thermal { qcom,msm-thermal {
qcom,hotplug-temp = <115>; qcom,hotplug-temp = <115>;
qcom,hotplug-temp-hysteresis = <25>; qcom,hotplug-temp-hysteresis = <25>;

3
arch/arm/boot/dts/qcom/msm8996pro-auto-adp.dts
View file

@ -37,6 +37,9 @@
}; };
&soc { &soc {
ssc_sensors: qcom,msm-ssc-sensors {
status = "disabled";
};
qcom,msm-thermal { qcom,msm-thermal {
qcom,hotplug-temp = <115>; qcom,hotplug-temp = <115>;
qcom,hotplug-temp-hysteresis = <25>; qcom,hotplug-temp-hysteresis = <25>;