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 05/11] thermal: sun8i: rework for sun8i_ths_get_temp() Date: Sun, 23 Jun 2019 12:42:00 -0400 [thread overview] Message-ID: <20190623164206.7467-6-tiny.windzz@gmail.com> (raw) In-Reply-To: <20190623164206.7467-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 c37e1c51a543..e473a5651436 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; } @@ -395,6 +396,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
WARNING: multiple messages have this Message-ID (diff)
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: Yangtao Li <tiny.windzz@gmail.com>, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org Subject: [PATCH v4 05/11] thermal: sun8i: rework for sun8i_ths_get_temp() Date: Sun, 23 Jun 2019 12:42:00 -0400 [thread overview] Message-ID: <20190623164206.7467-6-tiny.windzz@gmail.com> (raw) In-Reply-To: <20190623164206.7467-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 c37e1c51a543..e473a5651436 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; } @@ -395,6 +396,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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-06-23 16:42 UTC|newest] Thread overview: 48+ 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 ` Yangtao Li 2019-06-23 16:41 ` Yangtao Li 2019-06-23 16:41 ` [PATCH v4 01/11] thermal: sun8i: " Yangtao Li 2019-06-23 16:41 ` Yangtao Li 2019-06-23 16:41 ` Yangtao Li 2019-06-24 12:07 ` Ondřej Jirman 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-23 16:41 ` Yangtao Li 2019-06-24 8:47 ` Maxime Ripard 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 ` 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:41 ` Yangtao Li 2019-06-23 16:42 ` Yangtao Li [this message] 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 ` 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 2019-06-23 16:42 ` [PATCH v4 08/11] thermal: sun8i: support ahb clocks Yangtao Li 2019-06-23 16:42 ` Yangtao Li 2019-06-24 18:23 ` Maxime Ripard 2019-06-24 18:23 ` Maxime Ripard 2019-06-25 0:34 ` Ondřej Jirman 2019-06-25 0:34 ` Ondřej Jirman 2019-06-25 8:25 ` Maxime Ripard 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 ` 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-23 16:42 ` Yangtao Li 2019-06-24 8:50 ` Maxime Ripard 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-23 16:42 ` Yangtao Li 2019-06-24 12:05 ` Ondřej Jirman 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-10 23:09 ` Vasily Khoruzhick 2019-07-13 18:01 ` Vasily Khoruzhick 2019-07-13 18:01 ` Vasily Khoruzhick 2019-07-26 17:46 ` Vasily Khoruzhick 2019-07-26 17:46 ` Vasily Khoruzhick 2019-07-28 12:11 ` Frank Lee 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-6-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.