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

Commit f06bb65a 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: Add thermal node for chg_temp"

parents 0245d6b0 6c2ce234

arch/arm/boot/dts/qcom/msm-pmi8950.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
				qcom,scale-function = <3>;

				qcom,hw-settle-time = <0>;

				qcom,fast-avg-setup = <0>;

				qcom,vadc-thermal-node;

			};



			chan@43 {

drivers/hwmon/qpnp-adc-voltage.c

+1 −1
Original line number Diff line number Diff line
@@ -2227,6 +2227,7 @@ static int32_t qpnp_vadc_init_thermal(struct qpnp_vadc_chip *vadc, 
			vadc->vadc_therm_chan[i].thermal_node = true;

			snprintf(name, sizeof(name), "%s",

				vadc->adc->adc_channels[i].name);

			vadc->vadc_therm_chan[i].vadc_dev = vadc;

			vadc->vadc_therm_chan[i].tz_dev =

				thermal_zone_device_register(name,

				0, 0, &vadc->vadc_therm_chan[i],
@@ -2235,7 +2236,6 @@ static int32_t qpnp_vadc_init_thermal(struct qpnp_vadc_chip *vadc, 
				pr_err("thermal device register failed.\n");

				goto thermal_err_sens;

			}

			vadc->vadc_therm_chan[i].vadc_dev = vadc;

		}

		i++;

		thermal_node = false;