From: Yangtao Li <tiny.windzz@gmail.com>
To: rui.zhang@intel.com, edubezval@gmail.com,
daniel.lezcano@linaro.org, robh+dt@kernel.org,
mark.rutland@arm.com, maxime.ripard@bootlin.com, wens@csie.org,
davem@davemloft.net, gregkh@linuxfoundation.org,
mchehab+samsung@kernel.org, linus.walleij@linaro.org,
nicolas.ferre@microchip.com, paulmck@linux.ibm.com
Cc: linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Yangtao Li <tiny.windzz@gmail.com>
Subject: [PATCH v4 08/11] thermal: sun8i: support ahb clocks
Date: Sun, 23 Jun 2019 12:42:03 -0400 [thread overview]
Message-ID: <20190623164206.7467-9-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190623164206.7467-1-tiny.windzz@gmail.com>
H3 has extra clock, so introduce something in ths_thermal_chip/ths_device
and adds the process of the clock.
This is pre-work for supprt it.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/thermal/sun8i_thermal.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index ed1c19bb27cf..04f53ffb6a14 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -54,6 +54,7 @@ struct tsensor {
};
struct ths_thermal_chip {
+ bool has_ahb_clk;
int sensor_num;
int offset;
int scale;
@@ -69,6 +70,7 @@ struct ths_device {
struct regmap *regmap;
struct reset_control *reset;
struct clk *bus_clk;
+ struct clk *ahb_clk;
struct tsensor sensor[MAX_SENSOR_NUM];
};
@@ -280,6 +282,12 @@ static int sun8i_ths_resource_init(struct ths_device *tmdev)
if (IS_ERR(tmdev->bus_clk))
return PTR_ERR(tmdev->bus_clk);
+ if (tmdev->chip->has_ahb_clk) {
+ tmdev->ahb_clk = devm_clk_get(&pdev->dev, "ahb");
+ if (IS_ERR(tmdev->ahb_clk))
+ return PTR_ERR(tmdev->ahb_clk);
+ }
+
ret = reset_control_deassert(tmdev->reset);
if (ret)
return ret;
@@ -288,12 +296,18 @@ static int sun8i_ths_resource_init(struct ths_device *tmdev)
if (ret)
goto assert_reset;
- ret = sun50i_ths_calibrate(tmdev);
+ ret = clk_prepare_enable(tmdev->ahb_clk);
if (ret)
goto bus_disable;
+ ret = sun50i_ths_calibrate(tmdev);
+ if (ret)
+ goto ahb_disable;
+
return 0;
+ahb_disable:
+ clk_disable_unprepare(tmdev->ahb_clk);
bus_disable:
clk_disable_unprepare(tmdev->bus_clk);
assert_reset:
@@ -401,6 +415,7 @@ static int sun8i_ths_remove(struct platform_device *pdev)
{
struct ths_device *tmdev = platform_get_drvdata(pdev);
+ clk_disable_unprepare(tmdev->ahb_clk);
clk_disable_unprepare(tmdev->bus_clk);
reset_control_assert(tmdev->reset);
--
2.17.1
next prev parent reply other threads:[~2019-06-23 16:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 16:41 [PATCH v4 00/11] add thermal driver for h6 Yangtao Li
2019-06-23 16:41 ` [PATCH v4 01/11] thermal: sun8i: " Yangtao Li
2019-06-24 12:07 ` Ondřej Jirman
2019-06-23 16:41 ` [PATCH v4 02/11] dt-bindings: thermal: add binding document for h6 thermal controller Yangtao Li
2019-06-24 8:47 ` Maxime Ripard
2019-06-23 16:41 ` [PATCH v4 03/11] thermal: fix indentation in makefile Yangtao Li
2019-06-23 16:41 ` [PATCH v4 04/11] thermal: sun8i: get ths sensor number from device compatible Yangtao Li
2019-06-23 16:42 ` [PATCH v4 05/11] thermal: sun8i: rework for sun8i_ths_get_temp() Yangtao Li
2019-06-23 16:42 ` [PATCH v4 06/11] thermal: sun8i: get ths init func from device compatible Yangtao Li
2019-06-23 16:42 ` [PATCH v4 07/11] thermal: sun8i: rework for ths irq handler func Yangtao Li
2019-06-23 16:42 ` Yangtao Li [this message]
2019-06-24 18:23 ` [PATCH v4 08/11] thermal: sun8i: support ahb clocks Maxime Ripard
2019-06-25 0:34 ` Ondřej Jirman
2019-06-25 8:25 ` Maxime Ripard
2019-06-23 16:42 ` [PATCH v4 09/11] thermal: sun8i: rework for ths calibrate func Yangtao Li
2019-06-23 16:42 ` [PATCH v4 10/11] dt-bindings: thermal: add binding document for h3 thermal controller Yangtao Li
2019-06-24 8:50 ` Maxime Ripard
2019-06-23 16:42 ` [PATCH v4 11/11] thermal: sun8i: add thermal driver for h3 Yangtao Li
2019-06-24 12:05 ` Ondřej Jirman
2019-07-10 23:09 ` [PATCH v4 00/11] add thermal driver for h6 Vasily Khoruzhick
2019-07-13 18:01 ` Vasily Khoruzhick
2019-07-26 17:46 ` Vasily Khoruzhick
2019-07-28 12:11 ` Frank Lee
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=20190623164206.7467-9-tiny.windzz@gmail.com \
--to=tiny.windzz@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab+samsung@kernel.org \
--cc=nicolas.ferre@microchip.com \
--cc=paulmck@linux.ibm.com \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=wens@csie.org \
/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).