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

Commit d6a7f6be authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: update the LMH thresholds for sm8150"

parents c57638e4 0105b954

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

+4 −4
Original line number Diff line number Diff line
@@ -897,8 +897,8 @@ 


		trips {

			active-config {

				temperature = <95000>;

				hysteresis = <30000>;

				temperature = <85000>;

				hysteresis = <25000>;

				type = "passive";

			};

		};
@@ -912,8 +912,8 @@ 


		trips {

			active-config {

				temperature = <95000>;

				hysteresis = <30000>;

				temperature = <85000>;

				hysteresis = <25000>;

				type = "passive";

			};

		};

drivers/thermal/tsens2xxx.c

+10 −2
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ static int tsens2xxx_set_trip_temp(struct tsens_sensor *tm_sensor, 
	if (!tmdev)

		return -EINVAL;



	pr_debug("%s:low_temp(mdegC):%d, high_temp(mdegC):%d\n", __func__,

							low_temp, high_temp);

	pr_debug("%s: sensor:%d low_temp(mdegC):%d, high_temp(mdegC):%d\n",

			__func__, tm_sensor->hw_id, low_temp, high_temp);



	spin_lock_irqsave(&tmdev->tsens_upp_low_lock, flags);
@@ -437,6 +437,10 @@ static irqreturn_t tsens_tm_irq_thread(int irq, void *data) 
			int_mask = readl_relaxed(sensor_int_mask_addr);

			int_mask_val = TSENS_TM_UPPER_INT_SET(

					tm->sensor[i].hw_id);

			/* Mask the corresponding interrupt for the sensors */

			writel_relaxed(int_mask | int_mask_val,

					TSENS_TM_UPPER_LOWER_INT_MASK(

						tm->tsens_tm_addr));

			/* Clear the corresponding sensors interrupt */

			writel_relaxed(int_mask_val,

				TSENS_TM_UPPER_LOWER_INT_CLEAR(
@@ -465,6 +469,10 @@ static irqreturn_t tsens_tm_irq_thread(int irq, void *data) 
				(1 << tm->sensor[i].hw_id))) {

			int_mask = readl_relaxed(sensor_int_mask_addr);

			int_mask_val = (1 << tm->sensor[i].hw_id);

			/* Mask the corresponding interrupt for the sensors */

			writel_relaxed(int_mask | int_mask_val,

					TSENS_TM_UPPER_LOWER_INT_MASK(

						tm->tsens_tm_addr));

			/* Clear the corresponding sensors interrupt */

			writel_relaxed(int_mask_val,

				TSENS_TM_UPPER_LOWER_INT_CLEAR(