Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a799fd2 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 053e6bf3 d2ea3353

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

+4 −1
Original line number Diff line number Diff line 
/* 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>;

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

+3 −0
Original line number Diff line number Diff line
@@ -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>;

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

+3 −0
Original line number Diff line number Diff line
@@ -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>;

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

+3 −4
Original line number Diff line number Diff line
@@ -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 {

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

+4 −1
Original line number Diff line number Diff line 
/* 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>;