From: Tao Wang <kevin.wangtao@hisilicon.com>
To: rui.zhang@intel.com, edubezval@gmail.com, robh+dt@kernel.org,
mark.rutland@arm.com, xuwei5@hisilicon.com,
catalin.marinas@arm.com, will.deacon@arm.com
Cc: devicetree@vger.kernel.org, vincent.guittot@linaro.org,
gengyanping@hisilicon.com, linux-pm@vger.kernel.org,
daniel.lezcano@linaro.org, lonela.Voinescu@arm.com,
linux-kernel@vger.kernel.org,
Kevin Wangtao <kevin.wangtao@linaro.org>,
leo.yan@linaro.org, sunzhaosheng@hisilicon.com,
Valentin.Schneider@arm.com, linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] thermal/drivers/hisi: add support for multi temp threshold
Date: Fri, 22 Sep 2017 17:42:09 +0800 [thread overview]
Message-ID: <1506073332-92438-7-git-send-email-kevin.wangtao@hisilicon.com> (raw)
In-Reply-To: <1506073332-92438-1-git-send-email-kevin.wangtao@hisilicon.com>
From: Kevin Wangtao <kevin.wangtao@linaro.org>
tsensor may have multi alarm levels, so we can support
more trip point interrupt.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index f9d9fd6..718376b 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -46,10 +46,12 @@
#define HI6220_DEFAULT_SENSOR 2
+#define MAX_THRES_NUM 2
+
struct hisi_thermal_sensor {
struct thermal_zone_device *tzd;
uint32_t id;
- uint32_t thres_temp;
+ uint32_t thres_temp[MAX_THRES_NUM];
};
struct hisi_thermal_data {
@@ -244,7 +246,7 @@ static int hi6220_thermal_enable_sensor(struct hisi_thermal_data *data)
hi6220_thermal_set_lag(data->regs, HI6220_TEMP_LAG);
/* enable for interrupt */
- hi6220_thermal_alarm_set(data->regs, sensor->thres_temp);
+ hi6220_thermal_alarm_set(data->regs, sensor->thres_temp[0]);
hi6220_thermal_reset_set(data->regs, HI6220_TEMP_RESET);
@@ -303,7 +305,7 @@ static int hisi_thermal_get_temp(void *__data, int *temp)
*temp = data->get_temp(data);
dev_dbg(&data->pdev->dev, "id=%d, temp=%d, thres=%d\n",
- sensor->id, *temp, sensor->thres_temp);
+ sensor->id, *temp, sensor->thres_temp[0]);
return 0;
}
@@ -322,16 +324,16 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
hisi_thermal_get_temp(data, &temp);
- if (temp >= sensor->thres_temp) {
+ if (temp >= sensor->thres_temp[0]) {
dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n",
- temp, sensor->thres_temp);
+ temp, sensor->thres_temp[0]);
thermal_zone_device_update(data->sensor.tzd,
THERMAL_EVENT_UNSPECIFIED);
} else {
dev_crit(&data->pdev->dev, "THERMAL ALARM stopped: %d < %d\n",
- temp, sensor->thres_temp);
+ temp, sensor->thres_temp[0]);
}
return IRQ_HANDLED;
@@ -341,7 +343,7 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
struct hisi_thermal_data *data,
struct hisi_thermal_sensor *sensor)
{
- int ret, i;
+ int ret, i, thres_idx = 0;
const struct thermal_trip *trip;
sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
@@ -359,8 +361,9 @@ 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) {
- sensor->thres_temp = trip[i].temperature;
- break;
+ sensor->thres_temp[thres_idx++] = trip[i].temperature;
+ if (thres_idx >= MAX_THRES_NUM)
+ break;
}
}
--
2.8.1
next prev parent reply other threads:[~2017-09-22 9:42 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-22 9:42 [PATCH 0/9] add support for Hi3660 tsensor Tao Wang
2017-09-22 9:42 ` [PATCH 1/9] thermal/drivers/hisi: move clk operation to related function Tao Wang
2017-09-22 9:42 ` [PATCH 2/9] thermal/drivers/hisi: use round up step value Tao Wang
2017-09-22 9:42 ` [PATCH 3/9] thermal/drivers/hisi: put platform code together Tao Wang
2017-09-22 9:42 ` [PATCH 4/9] thermal/drivers/hisi: add platform prefix to function name Tao Wang
2017-09-22 9:42 ` [PATCH 5/9] thermal/drivers/hisi: perpare to add support for other hisi platform Tao Wang
2017-09-22 9:42 ` Tao Wang [this message]
2017-09-22 9:42 ` [PATCH 7/9] dt-bindings: Document the hi3660 thermal sensor binding Tao Wang
[not found] ` <1506073332-92438-8-git-send-email-kevin.wangtao-C8/M+/jPZTeaMJb+Lgu22Q@public.gmane.org>
2017-10-03 21:59 ` Rob Herring
2017-09-22 9:42 ` [PATCH 8/9] thermal/drivers/hisi: add support for hi3660 SoC Tao Wang
2017-09-22 9:42 ` [PATCH 9/9] arm64: dts: register Hi3660's thermal sensor Tao Wang
2017-10-02 19:06 ` Daniel Lezcano
2017-10-09 2:38 ` Wangtao (Kevin, Kirin)
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=1506073332-92438-7-git-send-email-kevin.wangtao@hisilicon.com \
--to=kevin.wangtao@hisilicon.com \
--cc=Valentin.Schneider@arm.com \
--cc=catalin.marinas@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=gengyanping@hisilicon.com \
--cc=kevin.wangtao@linaro.org \
--cc=leo.yan@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lonela.Voinescu@arm.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=sunzhaosheng@hisilicon.com \
--cc=vincent.guittot@linaro.org \
--cc=will.deacon@arm.com \
--cc=xuwei5@hisilicon.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).