Merge "ARM: dts: msm: Add support for new sensor in sdx50" (58ac266f) · Commits · e / devices / android_kernel_oneplus_sm8150

Documentation/devicetree/bindings/thermal/qti-qmi-sensor.txt

+11 −10

Original line number	Diff line number	Diff line
		@@ -33,16 +33,17 @@ Subsystem properties:
		are the only acceptable sensor names,
		1. pa
		2. pa1
		3. qfe_pa0
		4. qfe_wtr0
		5. modem_tsens
		6. qfe_mmw0
		7. qfe_mmw1
		8. qfe_mmw2
		9. qfe_mmw3
		10. xo_therm
		11. qfe_pa_mdm
		12. qfe_pa_wtr
		3. pa2
		4. qfe_pa0
		5. qfe_wtr0
		6. modem_tsens
		7. qfe_mmw0
		8. qfe_mmw1
		9. qfe_mmw2
		10. qfe_mmw3
		11. xo_therm
		12. qfe_pa_mdm
		13. qfe_pa_wtr

		Example:

arch/arm64/boot/dts/qcom/sm8150-sdx50m.dtsi

+21 −20

Original line number	Diff line number	Diff line
		@@ -338,6 +338,7 @@
		qcom,instance-id = <100>;
		qcom,qmi-sensor-names = "pa",
		"pa_1",
		"pa_2",
		"qfe_pa0",
		"qfe_wtr0",
		"modem_tsens",
		@@ -409,11 +410,11 @@
		};
		};

		modem1-qfe-pa-usr {
		modem1-qfe-wtr-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 102>;
		thermal-sensors = <&qmi_sensor 104>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -423,11 +424,11 @@
		};
		};

		modem1-qfe-wtr-usr {
		modem1-modem-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 103>;
		thermal-sensors = <&qmi_sensor 105>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -437,11 +438,11 @@
		};
		};

		modem1-modem-usr {
		modem1-mmw0-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 104>;
		thermal-sensors = <&qmi_sensor 106>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -451,11 +452,11 @@
		};
		};

		modem1-mmw0-usr {
		modem1-mmw1-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 105>;
		thermal-sensors = <&qmi_sensor 107>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -465,11 +466,11 @@
		};
		};

		modem1-mmw1-usr {
		modem1-mmw2-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 106>;
		thermal-sensors = <&qmi_sensor 108>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -479,11 +480,11 @@
		};
		};

		modem1-mmw2-usr {
		modem1-mmw3-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 107>;
		thermal-sensors = <&qmi_sensor 109>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -493,11 +494,11 @@
		};
		};

		modem1-mmw3-usr {
		modem1-skin-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 108>;
		thermal-sensors = <&qmi_sensor 110>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -507,11 +508,11 @@
		};
		};

		modem1-skin-usr {
		modem1-pa-mdm-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 109>;
		thermal-sensors = <&qmi_sensor 111>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -521,11 +522,11 @@
		};
		};

		modem1-pa-mdm-usr {
		modem1-pa-wtr-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 110>;
		thermal-sensors = <&qmi_sensor 112>;
		trips {
		active-config0 {
		temperature = <125000>;
		@@ -535,11 +536,11 @@
		};
		};

		modem1-pa-wtr-usr {
		modem1-pa2-usr {
		polling-delay-passive = <0>;
		polling-delay = <0>;
		thermal-governor = "user_space";
		thermal-sensors = <&qmi_sensor 111>;
		thermal-sensors = <&qmi_sensor 102>;
		trips {
		active-config0 {
		temperature = <125000>;

drivers/thermal/qcom/qmi_sensors.c

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2018, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2018-2019, 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
		@@ -40,6 +40,7 @@
		enum qmi_ts_sensor {
		QMI_TS_PA,
		QMI_TS_PA_1,
		QMI_TS_PA_2,
		QMI_TS_QFE_PA_0,
		QMI_TS_QFE_WTR_0,
		QMI_TS_MODEM_MODEM,
		@@ -83,6 +84,7 @@ static atomic_t in_suspend;
		static char sensor_clients[QMI_TS_MAX_NR][QMI_CLIENT_NAME_LENGTH] = {
		{"pa"},
		{"pa_1"},
		{"pa_2"},
		{"qfe_pa0"},
		{"qfe_wtr0"},
		{"modem_tsens"},