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,
mchehab+samsung@kernel.org, davem@davemloft.net,
gregkh@linuxfoundation.org, Jonathan.Cameron@huawei.com,
nicolas.ferre@microchip.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 v5 05/18] thermal: sun8i: rework for sun8i_ths_get_temp()
Date: Sat, 10 Aug 2019 05:28:16 +0000 [thread overview]
Message-ID: <20190810052829.6032-6-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190810052829.6032-1-tiny.windzz@gmail.com>
For different socs, the way they get and calculate the
temperature is roughly the same. So get the difference
from device compatible.
Difference point:
1) temperature calculation formula parameters
2) ths data register start address
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/thermal/sun8i_thermal.c | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index e9c2acbaac74..f338fa25b98e 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -22,9 +22,6 @@
#define MAX_SENSOR_NUM 4
-#define SUN50I_H6_OFFSET -2794
-#define SUN50I_H6_SCALE -67
-
#define FT_TEMP_MASK GENMASK(11, 0)
#define TEMP_CALIB_MASK GENMASK(11, 0)
#define TEMP_TO_REG 672
@@ -58,6 +55,10 @@ struct tsensor {
struct ths_thermal_chip {
int sensor_num;
+ int offset;
+ int scale;
+ int ft_deviation;
+ int temp_data_base;
};
struct ths_device {
@@ -73,7 +74,7 @@ struct ths_device {
static int sun8i_ths_reg2temp(struct ths_device *tmdev,
int reg)
{
- return (reg + SUN50I_H6_OFFSET) * SUN50I_H6_SCALE;
+ return (reg + tmdev->chip->offset) * tmdev->chip->scale;
}
static int sun8i_ths_get_temp(void *data, int *temp)
@@ -82,7 +83,7 @@ static int sun8i_ths_get_temp(void *data, int *temp)
struct ths_device *tmdev = s->tmdev;
int val;
- regmap_read(tmdev->regmap, SUN50I_H6_THS_TEMP_DATA +
+ regmap_read(tmdev->regmap, tmdev->chip->temp_data_base +
0x4 * s->id, &val);
/* ths have no data yet */
@@ -98,7 +99,7 @@ static int sun8i_ths_get_temp(void *data, int *temp)
* temperature above is also used when the sensor is calibrated. If
* do this, the correct calibration formula is hard to know.
*/
- *temp += SUN50I_H6_FT_DEVIATION;
+ *temp += tmdev->chip->ft_deviation;
return 0;
}
@@ -389,6 +390,10 @@ static int sun8i_ths_remove(struct platform_device *pdev)
static const struct ths_thermal_chip sun50i_h6_ths = {
.sensor_num = 2,
+ .offset = -2794,
+ .scale = -67,
+ .ft_deviation = SUN50I_H6_FT_DEVIATION,
+ .temp_data_base = SUN50I_H6_THS_TEMP_DATA,
};
static const struct of_device_id of_ths_match[] = {
--
2.17.1
next prev parent reply other threads:[~2019-08-10 5:29 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-10 5:28 [PATCH v5 00/18] add thermal driver for h6 Yangtao Li
2019-08-10 5:28 ` [PATCH v5 01/18] thermal: sun8i: " Yangtao Li
2019-09-01 2:06 ` Ondřej Jirman
2019-09-01 21:04 ` Ondřej Jirman
2019-08-10 5:28 ` [PATCH v5 02/18] dt-bindings: thermal: add binding document for h6 thermal controller Yangtao Li
2019-08-12 8:56 ` Maxime Ripard
2019-08-12 23:40 ` Frank Lee
2019-08-16 9:47 ` Maxime Ripard
2019-08-10 5:28 ` [PATCH v5 03/18] thermal: fix indentation in makefile Yangtao Li
2019-08-28 12:40 ` Zhang Rui
2019-08-10 5:28 ` [PATCH v5 04/18] thermal: sun8i: get ths sensor number from device compatible Yangtao Li
2019-08-10 5:28 ` Yangtao Li [this message]
2019-08-10 5:28 ` [PATCH v5 06/18] thermal: sun8i: get ths init func " Yangtao Li
2019-08-10 5:28 ` [PATCH v5 07/18] thermal: sun8i: rework for ths irq handler func Yangtao Li
2019-08-10 5:28 ` [PATCH v5 08/18] thermal: sun8i: support mod clocks Yangtao Li
2019-08-10 6:16 ` Vasily Khoruzhick
2019-08-12 23:46 ` Frank Lee
2019-08-12 23:54 ` Vasily Khoruzhick
2019-08-13 20:06 ` Ondřej Jirman
2019-08-14 3:01 ` Vasily Khoruzhick
2019-08-25 16:14 ` Frank Lee
2019-10-21 3:41 ` Vasily Khoruzhick
2019-08-10 5:28 ` [PATCH v5 09/18] thermal: sun8i: rework for ths calibrate func Yangtao Li
2019-08-28 12:45 ` Zhang Rui
2019-08-10 5:28 ` [PATCH v5 10/18] dt-bindings: thermal: add binding document for h3 thermal controller Yangtao Li
2019-08-27 15:26 ` Rob Herring
2019-08-10 5:28 ` [PATCH v5 11/18] thermal: sun8i: add thermal driver for h3 Yangtao Li
2019-08-10 5:28 ` [PATCH v5 12/18] dt-bindings: thermal: add binding document for a64 thermal controller Yangtao Li
2019-08-27 15:26 ` Rob Herring
2019-08-10 5:28 ` [PATCH v5 13/18] thermal: sun8i: add thermal driver for A64 Yangtao Li
2019-08-10 5:28 ` [PATCH v5 14/18] dt-bindings: thermal: add binding document for h5 thermal controller Yangtao Li
2019-08-27 15:27 ` Rob Herring
2019-08-10 5:28 ` [PATCH v5 15/18] thermal: sun8i: allow to use custom temperature calculation function Yangtao Li
2019-08-12 8:49 ` Maxime Ripard
2019-08-10 5:28 ` [PATCH v5 16/18] thermal: sun8i: add support for Allwinner H5 thermal sensor Yangtao Li
2019-08-10 5:28 ` [PATCH v5 17/18] dt-bindings: thermal: add binding document for r40 thermal controller Yangtao Li
2019-08-27 15:27 ` Rob Herring
2019-08-10 5:28 ` [PATCH v5 18/18] thermal: sun8i: add support for Allwinner R40 thermal sensor Yangtao Li
2019-08-11 21:14 ` [PATCH v5 00/18] add thermal driver for h6 Clément Péron
2019-08-12 23:36 ` Frank Lee
2019-09-01 21:52 ` Ondřej Jirman
2019-09-02 7:27 ` Maxime Ripard
2019-09-02 10:58 ` Ondřej Jirman
2019-11-26 19:36 ` Vasily Khoruzhick
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=20190810052829.6032-6-tiny.windzz@gmail.com \
--to=tiny.windzz@gmail.com \
--cc=Jonathan.Cameron@huawei.com \
--cc=daniel.lezcano@linaro.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edubezval@gmail.com \
--cc=gregkh@linuxfoundation.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=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).