diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 09:38:22 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 09:38:22 -0400 |
| commit | 70eb7cf538de7c94107fe8f9b14ef926b50e0599 (patch) | |
| tree | c4b51e8f19c7110778fc86ea09926ddecd3f463b | |
| parent | 4abaccd5cf3dd3c7f03474dfe994e366b9efcf65 (diff) | |
| download | longterm-queue-4.12-70eb7cf538de7c94107fe8f9b14ef926b50e0599.tar.gz | |
thermal: another ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch b/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch index be9de08..c1d67b2 100644 --- a/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch +++ b/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch @@ -1,4 +1,4 @@ -From db2b0332608c8e648ea1e44727d36ad37cdb56cb Mon Sep 17 00:00:00 2001 +From 6f4ef8c3dc0a983a638497bf7b749fc31e53de1a Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Thu, 19 Oct 2017 19:05:47 +0200 Subject: [PATCH] thermal/drivers/hisi: Fix multiple alarm interrupts firing @@ -32,9 +32,10 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Leo Yan <leo.yan@linaro.org> Tested-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c -index 583bc1934127..f5231974504c 100644 +index 5872f3c04436..0ddfbfbfd111 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -90,6 +90,12 @@ static inline long hisi_thermal_temp_to_step(long temp) @@ -50,16 +51,16 @@ index 583bc1934127..f5231974504c 100644 static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data, struct hisi_thermal_sensor *sensor) { -@@ -221,7 +227,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) - sensor = &data->sensors; +@@ -245,7 +251,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) + sensor = &data->sensors[data->irq_bind_sensor]; dev_crit(&data->pdev->dev, "THERMAL ALARM: T > %d\n", - sensor->thres_temp / 1000); + sensor->thres_temp); mutex_unlock(&data->thermal_lock); - thermal_zone_device_update(data->sensors.tzd, -@@ -255,7 +261,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, + for (i = 0; i < HISI_MAX_SENSORS; i++) { +@@ -284,7 +290,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev, for (i = 0; i < of_thermal_get_ntrips(sensor->tzd); i++) { if (trip[i].type == THERMAL_TRIP_PASSIVE) { |