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

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

Merge "thermal: qcom-spmi-temp-alarm: use of_thermal_handle_trip()"

parents 86baceea 01409b00

arch/arm64/boot/dts/qcom/pmi8998.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -32,10 +32,11 @@ 
		};



		pmi8998_tz: qcom,temp-alarm@2400 {

			compatible = "qcom,qpnp-temp-alarm";

			compatible = "qcom,spmi-temp-alarm";

			reg = <0x2400 0x100>;

			interrupts = <0x2 0x24 0x0 IRQ_TYPE_EDGE_RISING>;

			label = "pmi8998_tz";

			io-channels = <&pmi8998_rradc 7>;

			io-channel-names = "thermal";

			#thermal-sensor-cells = <0>;

		};

drivers/thermal/qcom-spmi-temp-alarm.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/platform_device.h>

#include <linux/regmap.h>

#include <linux/thermal.h>

#include "thermal_core.h"



#define QPNP_TM_REG_TYPE		0x04

#define QPNP_TM_REG_SUBTYPE		0x05
@@ -188,7 +189,7 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data) 
{

	struct qpnp_tm_chip *chip = data;



	thermal_zone_device_update(chip->tz_dev, THERMAL_EVENT_UNSPECIFIED);

	of_thermal_handle_trip(chip->tz_dev);



	return IRQ_HANDLED;

}