linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: edubezval@gmail.com, rui.zhang@intel.com
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org,
	kevin.wangtao@linaro.org
Subject: [PATCH 24/25] thermal/drivers/hisi: Add support for hi3660 SoC
Date: Tue, 10 Oct 2017 20:02:49 +0200	[thread overview]
Message-ID: <1507658570-32675-24-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1507658570-32675-1-git-send-email-daniel.lezcano@linaro.org>

From: Kevin Wangtao <kevin.wangtao@linaro.org>

This patch adds the support for thermal sensor on the Hi3660 SoC.
Hi3660 tsensor support alarm interrupt and have three configurable
alarm thresholds, it also has a configurable hysteresis interval,
interrupt will be triggered when temperature rise above the alarm
threshold or fall below the hysteresis threshold.

Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/hisi_thermal.c | 146 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 145 insertions(+), 1 deletion(-)

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index e87ca6c..10276f0 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -39,12 +39,24 @@
 #define HI6220_TEMP0_RST_MSK			(0x1C)
 #define HI6220_TEMP0_VALUE			(0x28)
 
+#define HI3660_OFFSET(chan)		((chan) * 0x40)
+#define HI3660_TEMP(chan)		(HI3660_OFFSET(chan) + 0x1C)
+#define HI3660_TH(chan)			(HI3660_OFFSET(chan) + 0x20)
+#define HI3660_LAG(chan)		(HI3660_OFFSET(chan) + 0x28)
+#define HI3660_INT_EN(chan)		(HI3660_OFFSET(chan) + 0x2C)
+#define HI3660_INT_CLR(chan)		(HI3660_OFFSET(chan) + 0x30)
+
 #define HI6220_TEMP_BASE			(-60000)
 #define HI6220_TEMP_RESET			(100000)
 #define HI6220_TEMP_STEP			(785)
 #define HI6220_TEMP_LAG				(3500)
 
+#define HI3660_TEMP_BASE		(-63780)
+#define HI3660_TEMP_STEP		(205)
+#define HI3660_TEMP_LAG			(4000)
+
 #define HI6220_DEFAULT_SENSOR		2
+#define HI3660_DEFAULT_SENSOR		1
 
 #define MAX_THRES_NUM			2
 
@@ -96,6 +108,24 @@ static inline int hi6220_thermal_temp_to_step(int temp)
 }
 
 /*
+ * for Hi3660,
+ *	Step: 189/922 (0.205)
+ *	Temperature base: -63.780°C
+ *
+ * The register is programmed in temperature steps, every step is 205
+ * millidegree and begins at -63 780 m°C
+ */
+static inline int hi3660_thermal_step_to_temp(int step)
+{
+	return HI3660_TEMP_BASE + step * HI3660_TEMP_STEP;
+}
+
+static inline int hi3660_thermal_temp_to_step(int temp)
+{
+	return DIV_ROUND_UP(temp - HI3660_TEMP_BASE, HI3660_TEMP_STEP);
+}
+
+/*
  * The lag register contains 5 bits encoding the temperature in steps.
  *
  * Each time the temperature crosses the threshold boundary, an
@@ -169,6 +199,45 @@ static inline int hi6220_thermal_get_temperature(void __iomem *addr)
 }
 
 /*
+ * [0:6] lag register
+ *
+ * The temperature is coded in steps, cf. HI3660_TEMP_STEP.
+ *
+ * Min : 0x00 :  0.0 °C
+ * Max : 0x7F : 26.0 °C
+ *
+ */
+static inline void hi3660_thermal_set_lag(void __iomem *addr,
+					  int id, int value)
+{
+	writel(DIV_ROUND_UP(value, HI3660_TEMP_STEP) & 0x7F,
+			addr + HI3660_LAG(id));
+}
+
+static inline void hi3660_thermal_alarm_clear(void __iomem *addr,
+					      int id, int value)
+{
+	writel(value, addr + HI3660_INT_CLR(id));
+}
+
+static inline void hi3660_thermal_alarm_enable(void __iomem *addr,
+					       int id, int value)
+{
+	writel(value, addr + HI3660_INT_EN(id));
+}
+
+static inline void hi3660_thermal_alarm_set(void __iomem *addr,
+					    int id, int value)
+{
+	writel(value, addr + HI3660_TH(id));
+}
+
+static inline int hi3660_thermal_get_temperature(void __iomem *addr, int id)
+{
+	return hi3660_thermal_step_to_temp(readl(addr + HI3660_TEMP(id)));
+}
+
+/*
  * Temperature configuration register - Sensor selection
  *
  * Bits [19:12]
@@ -206,11 +275,22 @@ static int hi6220_thermal_irq_handler(struct hisi_thermal_data *data)
 	return 0;
 }
 
+static int hi3660_thermal_irq_handler(struct hisi_thermal_data *data)
+{
+	hi3660_thermal_alarm_clear(data->regs, data->sensor.id, 1);
+	return 0;
+}
+
 static int hi6220_thermal_get_temp(struct hisi_thermal_data *data)
 {
 	return hi6220_thermal_get_temperature(data->regs);
 }
 
+static int hi3660_thermal_get_temp(struct hisi_thermal_data *data)
+{
+	return hi3660_thermal_get_temperature(data->regs, data->sensor.id);
+}
+
 static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
 {
 	/* disable sensor module */
@@ -222,6 +302,13 @@ static int hi6220_thermal_disable_sensor(struct hisi_thermal_data *data)
 	return 0;
 }
 
+static int hi3660_thermal_disable_sensor(struct hisi_thermal_data *data)
+{
+	/* disable sensor module */
+	hi3660_thermal_alarm_enable(data->regs, data->sensor.id, 0);
+	return 0;
+}
+
 static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
 {
 	struct hisi_thermal_sensor *sensor = &data->sensor;
@@ -260,6 +347,29 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
 	return 0;
 }
 
+static int hi3660_thermal_enable_sensor(struct hisi_thermal_data *data)
+{
+	unsigned int value;
+	struct hisi_thermal_sensor *sensor = &data->sensor;
+
+	/* disable interrupt */
+	hi3660_thermal_alarm_enable(data->regs, sensor->id, 0);
+
+	/* setting lag value between current temp and the threshold */
+	hi3660_thermal_set_lag(data->regs, sensor->id, HI3660_TEMP_LAG);
+
+	/* set interrupt threshold */
+	value = hi3660_thermal_temp_to_step(sensor->thres_temp[0]);
+	value |= hi3660_thermal_temp_to_step(sensor->thres_temp[1]) << 10;
+	hi3660_thermal_alarm_set(data->regs, sensor->id, value);
+
+	/* enable interrupt */
+	hi3660_thermal_alarm_clear(data->regs, sensor->id, 1);
+	hi3660_thermal_alarm_enable(data->regs, sensor->id, 1);
+
+	return 0;
+}
+
 static int hi6220_thermal_probe(struct hisi_thermal_data *data)
 {
 	struct platform_device *pdev = data->pdev;
@@ -296,6 +406,33 @@ static int hi6220_thermal_probe(struct hisi_thermal_data *data)
 	return 0;
 }
 
+static int hi3660_thermal_probe(struct hisi_thermal_data *data)
+{
+	struct platform_device *pdev = data->pdev;
+	struct device *dev = &pdev->dev;
+	struct resource *res;
+
+	data->get_temp = hi3660_thermal_get_temp;
+	data->enable_sensor = hi3660_thermal_enable_sensor;
+	data->disable_sensor = hi3660_thermal_disable_sensor;
+	data->irq_handler = hi3660_thermal_irq_handler;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	data->regs = devm_ioremap_resource(dev, res);
+	if (IS_ERR(data->regs)) {
+		dev_err(dev, "failed to get io address\n");
+		return PTR_ERR(data->regs);
+	}
+
+	data->irq = platform_get_irq(pdev, 0);
+	if (data->irq < 0)
+		return data->irq;
+
+	data->sensor.id = HI3660_DEFAULT_SENSOR;
+
+	return 0;
+}
+
 
 static int hisi_thermal_get_temp(void *__data, int *temp)
 {
@@ -371,7 +508,14 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
 }
 
 static const struct of_device_id of_hisi_thermal_match[] = {
-	{ .compatible = "hisilicon,tsensor", .data = hi6220_thermal_probe },
+	{
+		.compatible = "hisilicon,tsensor",
+		.data = hi6220_thermal_probe
+	},
+	{
+		.compatible = "hisilicon,hi3660-tsensor",
+		.data = hi3660_thermal_probe
+	},
 	{ /* end */ }
 };
 MODULE_DEVICE_TABLE(of, of_hisi_thermal_match);
-- 
2.7.4

  parent reply	other threads:[~2017-10-10 18:02 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-10 18:02 [GIT PULL] thermal: new material for hikey for 4.15 Daniel Lezcano
2017-10-10 18:02 ` [PATCH 01/25] thermal/drivers/hisi: Fix missing interrupt enablement Daniel Lezcano
2017-10-10 18:02   ` [PATCH 02/25] thermal/drivers/hisi: Remove the multiple sensors support Daniel Lezcano
2017-10-17  3:54     ` Eduardo Valentin
2017-10-17 12:28       ` Daniel Lezcano
2017-10-17 18:25         ` Eduardo Valentin
2017-10-17 19:03           ` Daniel Lezcano
2017-10-17 21:07             ` Eduardo Valentin
2017-10-17 21:10               ` Daniel Lezcano
2017-10-18  1:48               ` Leo Yan
2017-10-18 15:51                 ` Eduardo Valentin
2017-10-18 16:23                   ` Daniel Lezcano
2017-10-18  1:49               ` Wangtao (Kevin, Kirin)
2017-10-10 18:02   ` [PATCH 03/25] thermal/drivers/hisi: Fix kernel panic on alarm interrupt Daniel Lezcano
2017-10-10 18:02   ` [PATCH 04/25] thermal/drivers/hisi: Simplify the temperature/step computation Daniel Lezcano
2017-10-10 18:02   ` [PATCH 05/25] thermal/drivers/hisi: Fix multiple alarm interrupts firing Daniel Lezcano
2017-10-10 18:02   ` [PATCH 06/25] thermal/drivers/hisi: Remove pointless lock Daniel Lezcano
2017-10-10 18:02   ` [PATCH 07/25] thermal/drivers/hisi: Encapsulate register writes into helpers Daniel Lezcano
2017-10-10 18:02   ` [PATCH 08/25] thermal/drivers/hisi: Fix configuration register setting Daniel Lezcano
2017-10-17  4:22     ` Eduardo Valentin
2017-10-10 18:02   ` [PATCH 09/25] thermal/drivers/hisi: Remove costly sensor inspection Daniel Lezcano
2017-10-10 18:02   ` [PATCH 10/25] thermal/drivers/hisi: Rename and remove unused field Daniel Lezcano
2017-10-10 18:02   ` [PATCH 11/25] thermal/drivers/hisi: Convert long to int Daniel Lezcano
2017-10-10 18:02   ` [PATCH 12/25] thermal/drivers/hisi: Remove thermal data back pointer Daniel Lezcano
2017-10-10 18:02   ` [PATCH 13/25] thermal/drivers/hisi: Remove mutex_lock in the code Daniel Lezcano
2017-10-10 18:02   ` [PATCH 14/25] thermal/drivers/generic-iio-adc: Switch tz request to devm version Daniel Lezcano
2017-10-10 18:02   ` [PATCH 15/25] thermal/drivers/step_wise: Fix temperature regulation misbehavior Daniel Lezcano
2017-10-10 18:02   ` [PATCH 16/25] thermal/drivers/qcom-spmi: Use devm_iio_channel_get Daniel Lezcano
2017-10-10 18:02   ` [PATCH 17/25] thermal/drivers/hisi: Move the clk setup in the corresponding functions Daniel Lezcano
2017-10-10 18:02   ` [PATCH 18/25] thermal/drivers/hisi: Use round up step value Daniel Lezcano
2017-10-10 18:02   ` [PATCH 19/25] thermal/drivers/hisi: Put platform code together Daniel Lezcano
2017-10-17  4:37     ` Eduardo Valentin
2017-10-10 18:02   ` [PATCH 20/25] thermal/drivers/hisi: Add platform prefix to function name Daniel Lezcano
2017-10-17  4:36     ` Eduardo Valentin
2017-10-10 18:02   ` [PATCH 21/25] thermal/drivers/hisi: Prepare to add support for other hisi platforms Daniel Lezcano
2017-10-17  4:36     ` Eduardo Valentin
2017-10-10 18:02   ` [PATCH 22/25] thermal/drivers/hisi: Add support for multi temp threshold Daniel Lezcano
2017-10-17  4:38     ` Eduardo Valentin
     [not found]   ` <1507658570-32675-1-git-send-email-daniel.lezcano-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-10-10 18:02     ` [PATCH 23/25] dt-bindings: Document the hi3660 thermal sensor binding Daniel Lezcano
2017-10-10 18:02     ` [PATCH 25/25] arm64: dts: Register Hi3660's thermal sensor Daniel Lezcano
2017-10-13  8:49       ` Wei Xu
2017-10-10 18:02   ` Daniel Lezcano [this message]
2017-10-17  4:39     ` [PATCH 24/25] thermal/drivers/hisi: Add support for hi3660 SoC Eduardo Valentin
2017-10-18  9:15       ` [PATCH] thermal/drivers/hisi: disable multi alarm " Tao Wang
2017-10-18 15:54         ` Daniel Lezcano
2017-10-19  1:31           ` Wangtao (Kevin, Kirin)
2017-12-05  2:02             ` Eduardo Valentin
2017-12-05  6:57               ` Daniel Lezcano
2017-10-16 21:50   ` [PATCH 01/25] thermal/drivers/hisi: Fix missing interrupt enablement Eduardo Valentin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1507658570-32675-24-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=edubezval@gmail.com \
    --cc=kevin.wangtao@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rui.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).