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 3/9] thermal/drivers/hisi: put platform code together
Date: Fri, 22 Sep 2017 17:42:06 +0800 [thread overview]
Message-ID: <1506073332-92438-4-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>
reorganize code for follow-up patch, there is no functional change here.
Signed-off-by: Kevin Wangtao <kevin.wangtao@linaro.org>
---
drivers/thermal/hisi_thermal.c | 76 +++++++++++++++++++++---------------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index c8b651d..96904b4 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -201,6 +201,44 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
clk_disable_unprepare(data->clk);
}
+
+static int hisi_thermal_setup(struct hisi_thermal_data *data)
+{
+ struct hisi_thermal_sensor *sensor = &data->sensor;
+ int ret;
+
+ /* enable clock for tsensor */
+ ret = clk_prepare_enable(data->clk);
+ if (ret)
+ return ret;
+
+ /* disable module firstly */
+ hisi_thermal_reset_enable(data->regs, 0);
+ hisi_thermal_enable(data->regs, 0);
+
+ /* select sensor id */
+ hisi_thermal_sensor_select(data->regs, sensor->id);
+
+ /* setting the hdak time */
+ hisi_thermal_hdak_set(data->regs, 0);
+
+ /* setting lag value between current temp and the threshold */
+ hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG);
+
+ /* enable for interrupt */
+ hisi_thermal_alarm_set(data->regs, sensor->thres_temp);
+
+ hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET);
+
+ /* enable module */
+ hisi_thermal_reset_enable(data->regs, 1);
+ hisi_thermal_enable(data->regs, 1);
+
+ hisi_thermal_alarm_clear(data->regs, 0);
+ hisi_thermal_alarm_enable(data->regs, 1);
+
+ return 0;
+}
static int hisi_thermal_get_temp(void *__data, int *temp)
{
struct hisi_thermal_data *data = __data;
@@ -291,44 +329,6 @@ static void hisi_thermal_toggle_sensor(struct hisi_thermal_sensor *sensor,
on ? THERMAL_DEVICE_ENABLED : THERMAL_DEVICE_DISABLED);
}
-static int hisi_thermal_setup(struct hisi_thermal_data *data)
-{
- struct hisi_thermal_sensor *sensor = &data->sensor;
- int ret;
-
- /* enable clock for tsensor */
- ret = clk_prepare_enable(data->clk);
- if (ret)
- return ret;
-
- /* disable module firstly */
- hisi_thermal_reset_enable(data->regs, 0);
- hisi_thermal_enable(data->regs, 0);
-
- /* select sensor id */
- hisi_thermal_sensor_select(data->regs, sensor->id);
-
- /* setting the hdak time */
- hisi_thermal_hdak_set(data->regs, 0);
-
- /* setting lag value between current temp and the threshold */
- hisi_thermal_set_lag(data->regs, HISI_TEMP_LAG);
-
- /* enable for interrupt */
- hisi_thermal_alarm_set(data->regs, sensor->thres_temp);
-
- hisi_thermal_reset_set(data->regs, HISI_TEMP_RESET);
-
- /* enable module */
- hisi_thermal_reset_enable(data->regs, 1);
- hisi_thermal_enable(data->regs, 1);
-
- hisi_thermal_alarm_clear(data->regs, 0);
- hisi_thermal_alarm_enable(data->regs, 1);
-
- return 0;
-}
-
static int hisi_thermal_probe(struct platform_device *pdev)
{
struct hisi_thermal_data *data;
--
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 ` Tao Wang [this message]
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 ` [PATCH 6/9] thermal/drivers/hisi: add support for multi temp threshold Tao Wang
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-4-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).