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

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

Merge "thermal: qpnp-adc-tm: Update default timer selection"

parents 099f8d74 f9f048de

Documentation/devicetree/bindings/thermal/qpnp-adc-tm.txt

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ Optional properties: 
		by the thermal framework.

- qcom,meas-interval-timer-idx: If present select from the following timer index to choose

		a preset configurable measurement interval timer value. The driver defaults

		to timer 1 with a measurement interval of 1 second if the property is not present.

		0 : Select Timer 1 for a measurement polling interval of 1 second.

		1 : Select Timer 2 for a measurement polling interval of 500ms.

		to timer 2 with a measurement interval of 1 second if the property is not present.

		0 : Select Timer 1 for a measurement polling interval of 3.9 milliseconds.

		1 : Select Timer 2 for a measurement polling interval of 1 second.

		2 : Select Timer 3 for a measurement polling interval of 4 seconds.



Client required property:

drivers/thermal/qpnp-adc-tm.c

+5 −5
Original line number Diff line number Diff line
@@ -1972,20 +1972,20 @@ static int qpnp_adc_tm_probe(struct spmi_device *spmi) 
		rc = of_property_read_u32(child,

				"qcom,meas-interval-timer-idx", &timer_select);

		if (rc) {

			pr_debug("Default to timer1 with interval of 1 sec\n");

			pr_debug("Default to timer2 with interval of 1 sec\n");

			chip->sensor[sen_idx].timer_select =

							ADC_MEAS_TIMER_SELECT1;

							ADC_MEAS_TIMER_SELECT2;

			chip->sensor[sen_idx].meas_interval =

							ADC_MEAS1_INTERVAL_1S;

							ADC_MEAS2_INTERVAL_1S;

		} else {

			if (timer_select >= ADC_MEAS_TIMER_NUM) {

				pr_err("Invalid timer selection number\n");

				goto fail;

			}

			chip->sensor[sen_idx].timer_select = timer_select;

			if (timer_select == ADC_MEAS_TIMER_SELECT2)

			if (timer_select == ADC_MEAS_TIMER_SELECT1)

				chip->sensor[sen_idx].meas_interval =

						ADC_MEAS2_INTERVAL_500MS;

						ADC_MEAS1_INTERVAL_3P9MS;

			if (timer_select == ADC_MEAS_TIMER_SELECT3)

				chip->sensor[sen_idx].meas_interval =

						ADC_MEAS3_INTERVAL_4S;