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: 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 v5 09/18] thermal: sun8i: rework for ths calibrate func
Date: Sat, 10 Aug 2019 05:28:20 +0000 [thread overview]
Message-ID: <20190810052829.6032-10-tiny.windzz@gmail.com> (raw)
In-Reply-To: <20190810052829.6032-1-tiny.windzz@gmail.com>
Here, we do something to prepare for the subsequent
support of multiple platforms.
1) rename sun50i_ths_calibrate to sun8i_ths_calibrate, because
this function should be suitable for all platforms now.
2) introduce calibrate callback to mask calibration method
differences.
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
drivers/thermal/sun8i_thermal.c | 86 ++++++++++++++++++---------------
1 file changed, 48 insertions(+), 38 deletions(-)
diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index 6f4294c2aba7..47c20c4c69e7 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -60,6 +60,8 @@ struct ths_thermal_chip {
int scale;
int ft_deviation;
int temp_data_base;
+ int (*calibrate)(struct ths_device *tmdev,
+ u16 *caldata, int callen);
int (*init)(struct ths_device *tmdev);
int (*irq_ack)(struct ths_device *tmdev);
};
@@ -152,45 +154,14 @@ static irqreturn_t sun8i_irq_thread(int irq, void *data)
return IRQ_HANDLED;
}
-static int sun50i_ths_calibrate(struct ths_device *tmdev)
+static int sun50i_h6_ths_calibrate(struct ths_device *tmdev,
+ u16 *caldata, int callen)
{
- struct nvmem_cell *calcell;
struct device *dev = tmdev->dev;
- u16 *caldata;
- size_t callen;
- int ft_temp;
- int i, ret = 0;
-
- calcell = devm_nvmem_cell_get(dev, "calib");
- if (IS_ERR(calcell)) {
- if (PTR_ERR(calcell) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
- /*
- * Even if the external calibration data stored in sid is
- * not accessible, the THS hardware can still work, although
- * the data won't be so accurate.
- *
- * The default value of calibration register is 0x800 for
- * every sensor, and the calibration value is usually 0x7xx
- * or 0x8xx, so they won't be away from the default value
- * for a lot.
- *
- * So here we do not return error if the calibartion data is
- * not available, except the probe needs deferring.
- */
- goto out;
- }
+ int i, ft_temp;
- caldata = nvmem_cell_read(calcell, &callen);
- if (IS_ERR(caldata)) {
- ret = PTR_ERR(caldata);
- goto out;
- }
-
- if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num) {
- ret = -EINVAL;
- goto out_free;
- }
+ if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num)
+ return -EINVAL;
/*
* efuse layout:
@@ -245,7 +216,45 @@ static int sun50i_ths_calibrate(struct ths_device *tmdev)
cdata << offset);
}
-out_free:
+ return 0;
+}
+
+static int sun8i_ths_calibrate(struct ths_device *tmdev)
+{
+ struct nvmem_cell *calcell;
+ struct device *dev = tmdev->dev;
+ u16 *caldata;
+ size_t callen;
+ int ret = 0;
+
+ calcell = devm_nvmem_cell_get(dev, "calib");
+ if (IS_ERR(calcell)) {
+ if (PTR_ERR(calcell) == -EPROBE_DEFER)
+ return -EPROBE_DEFER;
+ /*
+ * Even if the external calibration data stored in sid is
+ * not accessible, the THS hardware can still work, although
+ * the data won't be so accurate.
+ *
+ * The default value of calibration register is 0x800 for
+ * every sensor, and the calibration value is usually 0x7xx
+ * or 0x8xx, so they won't be away from the default value
+ * for a lot.
+ *
+ * So here we do not return error if the calibartion data is
+ * not available, except the probe needs deferring.
+ */
+ goto out;
+ }
+
+ caldata = nvmem_cell_read(calcell, &callen);
+ if (IS_ERR(caldata)) {
+ ret = PTR_ERR(caldata);
+ goto out;
+ }
+
+ tmdev->chip->calibrate(tmdev, caldata, callen);
+
kfree(caldata);
out:
return ret;
@@ -294,7 +303,7 @@ static int sun8i_ths_resource_init(struct ths_device *tmdev)
if (ret)
goto bus_disable;
- ret = sun50i_ths_calibrate(tmdev);
+ ret = sun8i_ths_calibrate(tmdev);
if (ret)
goto mod_disable;
@@ -422,6 +431,7 @@ static const struct ths_thermal_chip sun50i_h6_ths = {
.scale = -67,
.ft_deviation = SUN50I_H6_FT_DEVIATION,
.temp_data_base = SUN50I_H6_THS_TEMP_DATA,
+ .calibrate = sun50i_h6_ths_calibrate,
.init = sun50i_h6_thermal_init,
.irq_ack = sun50i_h6_irq_ack,
};
--
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-08-10 5:32 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 ` [PATCH v5 05/18] thermal: sun8i: rework for sun8i_ths_get_temp() Yangtao Li
2019-08-10 5:28 ` [PATCH v5 06/18] thermal: sun8i: get ths init func from device compatible 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 ` Yangtao Li [this message]
2019-08-28 12:45 ` [PATCH v5 09/18] thermal: sun8i: rework for ths calibrate func 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-10-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).