summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2018-08-02 09:24:58 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2018-08-02 09:24:58 -0400
commit4abaccd5cf3dd3c7f03474dfe994e366b9efcf65 (patch)
treeaf5e7cd973e7b769959ddb0d5b60fd2f09d98661
parent14f4b0e1f49c8a85a45caeb257d1fc747d829163 (diff)
downloadlongterm-queue-4.12-4abaccd5cf3dd3c7f03474dfe994e366b9efcf65.tar.gz
thermal: trivial ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch7
1 files changed, 4 insertions, 3 deletions
diff --git a/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch b/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch
index bf43688..a733867 100644
--- a/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch
+++ b/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch
@@ -1,4 +1,4 @@
-From 48880b979cdc9ef5a70af020f42b8ba1e51dbd34 Mon Sep 17 00:00:00 2001
+From ee17e3d0d421fce87ed48e7001cb2c96cf5cfe60 Mon Sep 17 00:00:00 2001
From: Daniel Lezcano <daniel.lezcano@linaro.org>
Date: Thu, 19 Oct 2017 19:05:46 +0200
Subject: [PATCH] thermal/drivers/hisi: Simplify the temperature/step
@@ -18,9 +18,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 f69aea0b2fe3..583bc1934127 100644
+index 315987b6a280..5872f3c04436 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -35,8 +35,9 @@
@@ -33,7 +34,7 @@ index f69aea0b2fe3..583bc1934127 100644
+#define HISI_TEMP_STEP (784)
#define HISI_MAX_SENSORS 4
- #define HISI_DEFAULT_SENSOR 2
+
@@ -61,19 +62,32 @@ struct hisi_thermal_data {
void __iomem *regs;
};