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

Commit 20340ad5 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: Update Temperature sensor support for sdm660"

parents 3474dde0 5e464a97

arch/arm/boot/dts/qcom/sdm660.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -562,6 +562,8 @@ 
		reg-names = "tsens_physical", "tsens_eeprom_physical";

		interrupts = <0 184 0>, <0 430 0>;

		interrupt-names = "tsens-upper-lower", "tsens-critical";

		qcom,client-id = <0 1 2 3 4 5 6 7 8 9 10 11 12 13>;

		qcom,sensor-id = <0 10 11 4 5 6 7 8 13 1 3 12 9 2>;

		qcom,sensors = <14>;

		qcom,slope = <3200 3200 3200 3200 3200 3200 3200 3200

					3200 3200 3200 3200 3200 3200>;

drivers/thermal/msm-tsens.c

+2 −0
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ static int32_t get_tsens_sensor_for_client_id(struct tsens_tm_device *tmdev, 


	if (!strcmp(id->compatible, "qcom,msm8996-tsens") ||

		(!strcmp(id->compatible, "qcom,msm8998-tsens")) ||

		(!strcmp(id->compatible, "qcom,sdm660-tsens")) ||

		(!strcmp(id->compatible, "qcom,msmhamster-tsens"))) {

		while (i < tmdev->tsens_num_sensor && !id_found) {

			if (tmdev->sensor[i].sensor_client_id ==
@@ -492,6 +493,7 @@ int tsens_get_hw_id_mapping(int thermal_sensor_num, int *sensor_client_id) 


		if (!strcmp(id->compatible, "qcom,msm8996-tsens") ||

			(!strcmp(id->compatible, "qcom,msm8998-tsens")) ||

			(!strcmp(id->compatible, "qcom,sdm660-tsens")) ||

			(!strcmp(id->compatible, "qcom,msmhamster-tsens"))) {

			/* Assign client id's that is used to get the

			 * controller and hw_sensor details