Merge "ARM: dts: msm: disable sensor node on msm8996 and apq8096"
This commit is contained in:
commit
3a799fd24d
7 changed files with 23 additions and 6 deletions
|
@ -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>;
|
||||
|
|
|
@ -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>;
|
||||
|
|
|
@ -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>;
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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>;
|
||||
|
|
|
@ -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>;
|
||||
|
|
|
@ -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>;
|
||||
|
|
Loading…
Add table
Reference in a new issue