From: Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
mark.rutland-5wv7dgnIgG8@public.gmane.org,
maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
wens-jdAy2FN1RRM@public.gmane.org,
linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org,
jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
knaack.h-Mmb7MZpHnFY@public.gmane.org,
lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org,
pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org,
davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org,
hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org,
mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
rask-SivP7zSAdNDZaaYASwVUlg@public.gmane.org,
clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
sean-hENCXIMQXOg@public.gmane.org,
krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org,
quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org,
icenowy-h8G6r0blFSE@public.gmane.org,
edu.molinas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
singhalsimran0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
Cc: linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org
Subject: [PATCH v2 07/16] iio: adc: sun4i-gpadc-iio: rework: support nvmem calibration data
Date: Mon, 29 Jan 2018 00:29:10 +0100 [thread overview]
Message-ID: <20180128232919.12639-8-embed3d@gmail.com> (raw)
In-Reply-To: <20180128232919.12639-1-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
This patch reworks the driver to support nvmem calibration cells.
The driver checks if the nvmem calibration is supported and reads out
the nvmem.
Signed-off-by: Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/iio/adc/sun4i-gpadc-iio.c | 44 +++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index ac9ad2f8232f..74eeb5cd5218 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -27,6 +27,7 @@
#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/module.h>
+#include <linux/nvmem-consumer.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
@@ -74,6 +75,7 @@ struct gpadc_data {
bool has_bus_rst;
bool has_mod_clk;
int sensor_count;
+ bool supports_nvmem;
};
static const struct gpadc_data sun4i_gpadc_data = {
@@ -87,6 +89,7 @@ static const struct gpadc_data sun4i_gpadc_data = {
.sample_start = sun4i_gpadc_sample_start,
.sample_end = sun4i_gpadc_sample_end,
.sensor_count = 1,
+ .supports_nvmem = false,
};
static const struct gpadc_data sun5i_gpadc_data = {
@@ -100,6 +103,7 @@ static const struct gpadc_data sun5i_gpadc_data = {
.sample_start = sun4i_gpadc_sample_start,
.sample_end = sun4i_gpadc_sample_end,
.sensor_count = 1,
+ .supports_nvmem = false,
};
static const struct gpadc_data sun6i_gpadc_data = {
@@ -113,6 +117,7 @@ static const struct gpadc_data sun6i_gpadc_data = {
.sample_start = sun4i_gpadc_sample_start,
.sample_end = sun4i_gpadc_sample_end,
.sensor_count = 1,
+ .supports_nvmem = false,
};
static const struct gpadc_data sun8i_a33_gpadc_data = {
@@ -123,6 +128,7 @@ static const struct gpadc_data sun8i_a33_gpadc_data = {
.sample_start = sun4i_gpadc_sample_start,
.sample_end = sun4i_gpadc_sample_end,
.sensor_count = 1,
+ .supports_nvmem = false,
};
struct sun4i_gpadc_iio {
@@ -141,6 +147,8 @@ struct sun4i_gpadc_iio {
struct clk *mod_clk;
struct reset_control *reset;
int sensor_id;
+ u32 calibration_data[2];
+ bool has_calibration_data[2];
/* prevents concurrent reads of temperature and ADC */
struct mutex mutex;
struct thermal_zone_device *tzd;
@@ -561,6 +569,9 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
struct resource *mem;
void __iomem *base;
int ret;
+ struct nvmem_cell *cell;
+ ssize_t cell_size;
+ u64 *cell_data;
info->data = of_device_get_match_data(&pdev->dev);
if (!info->data)
@@ -575,6 +586,39 @@ static int sun4i_gpadc_probe_dt(struct platform_device *pdev,
if (IS_ERR(base))
return PTR_ERR(base);
+ info->has_calibration_data[0] = false;
+ info->has_calibration_data[1] = false;
+
+ if (!info->data->supports_nvmem)
+ goto no_nvmem;
+
+ cell = nvmem_cell_get(&pdev->dev, "calibration");
+ if (IS_ERR(cell)) {
+ if (PTR_ERR(cell) == -EPROBE_DEFER)
+ return PTR_ERR(cell);
+ goto no_nvmem;
+ }
+
+ cell_data = (u64 *)nvmem_cell_read(cell, &cell_size);
+ nvmem_cell_put(cell);
+ switch (cell_size) {
+ case 8:
+ case 6:
+ info->has_calibration_data[1] = true;
+ info->calibration_data[1] = be32_to_cpu(
+ upper_32_bits(cell_data[0]));
+ case 4:
+ case 2:
+ info->has_calibration_data[0] = true;
+ info->calibration_data[0] = be32_to_cpu(
+ lower_32_bits(cell_data[0]));
+ break;
+ default:
+ break;
+ }
+
+no_nvmem:
+
info->regmap = devm_regmap_init_mmio(&pdev->dev, base,
&sun4i_gpadc_regmap_config);
if (IS_ERR(info->regmap)) {
--
2.11.0
next prev parent reply other threads:[~2018-01-28 23:29 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-28 23:29 [PATCH v2 00/16] IIO-based thermal sensor driver for Allwinner H3 and A83T SoC Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 08/16] iio: adc: sun4i-gpadc-iio: rework: add interrupt support Philipp Rossak
[not found] ` <20180128232919.12639-9-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-31 19:07 ` Quentin Schulz
2018-02-02 14:30 ` Philipp Rossak
2018-01-31 21:47 ` kbuild test robot
[not found] ` <20180128232919.12639-1-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-28 23:29 ` [PATCH v2 01/16] dt-bindings: update the Allwinner GPADC device tree binding for H3 & A83T Philipp Rossak
[not found] ` <20180128232919.12639-2-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:19 ` Maxime Ripard
[not found] ` <20180129091937.w3c3btvva5yaqlf6-ZC1Zs529Oq4@public.gmane.org>
2018-01-29 12:30 ` Philipp Rossak
2018-01-31 17:40 ` Quentin Schulz
2018-01-31 18:14 ` Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 02/16] arm: config: sunxi_defconfig: enable SUN4I_GPADC Philipp Rossak
[not found] ` <20180128232919.12639-3-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:21 ` Maxime Ripard
2018-01-28 23:29 ` [PATCH v2 03/16] iio: adc: sun4i-gpadc-iio: rename A33-specified registers to contain A33 Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 04/16] iio: adc: sun4i-gpadc-iio: rework: sampling start/end code readout reg Philipp Rossak
[not found] ` <20180128232919.12639-5-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:27 ` Maxime Ripard
2018-01-31 17:51 ` Quentin Schulz
2018-01-31 18:35 ` Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 05/16] iio: adc: sun4i-gpadc-iio: rework: support clocks and reset Philipp Rossak
2018-01-29 9:31 ` Maxime Ripard
2018-01-28 23:29 ` [PATCH v2 06/16] iio: adc: sun4i-gpadc-iio: rework: support multiple sensors Philipp Rossak
[not found] ` <20180128232919.12639-7-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:37 ` Maxime Ripard
2018-01-31 18:42 ` Quentin Schulz
2018-02-02 14:13 ` Philipp Rossak
2018-01-28 23:29 ` Philipp Rossak [this message]
[not found] ` <20180128232919.12639-8-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:40 ` [PATCH v2 07/16] iio: adc: sun4i-gpadc-iio: rework: support nvmem calibration data Maxime Ripard
[not found] ` <20180129094045.sagz2dnzvdadd4yx-ZC1Zs529Oq4@public.gmane.org>
2018-01-29 12:33 ` Philipp Rossak
[not found] ` <e319fde5-9ede-8be0-03ae-f0a22d50250c-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-30 8:36 ` Maxime Ripard
[not found] ` <20180130083642.cdpd7jnthkdrrk5r-ZC1Zs529Oq4@public.gmane.org>
2018-02-02 15:24 ` Philipp Rossak
2018-01-31 22:49 ` kbuild test robot
2018-01-28 23:29 ` [PATCH v2 09/16] iio: adc: sun4i-gpadc-iio: add support for H3 thermal sensor Philipp Rossak
[not found] ` <20180128232919.12639-10-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:46 ` Maxime Ripard
2018-01-31 19:23 ` Quentin Schulz
2018-02-02 14:42 ` Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 10/16] iio: adc: sun4i-gpadc-iio: add support for A83T " Philipp Rossak
[not found] ` <20180128232919.12639-11-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:48 ` Maxime Ripard
[not found] ` <20180129094803.uiojqkmaeuihbe4p-ZC1Zs529Oq4@public.gmane.org>
2018-01-29 11:53 ` Philipp Rossak
2018-01-30 8:32 ` Maxime Ripard
2018-01-28 23:29 ` [PATCH v2 11/16] arm: dts: sunxi-h3-h5: add support for the thermal sensor in H3 and H5 Philipp Rossak
[not found] ` <20180128232919.12639-12-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:49 ` Maxime Ripard
[not found] ` <20180129094918.4fvxpmoftgxxkqg3-ZC1Zs529Oq4@public.gmane.org>
2018-01-29 11:54 ` Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 12/16] arm: dts: sun8i: h3: add support for the thermal sensor in H3 Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 13/16] arm: dts: sun8i: h3: add thermal zone to H3 Philipp Rossak
[not found] ` <20180128232919.12639-14-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:50 ` Maxime Ripard
[not found] ` <20180129095034.5crx7ydq5k6f7omv-ZC1Zs529Oq4@public.gmane.org>
2018-01-29 11:56 ` Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 14/16] arm: dts: sun8i: h3: enable H3 sid controller Philipp Rossak
[not found] ` <20180128232919.12639-15-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:52 ` Maxime Ripard
[not found] ` <20180129095200.attg7cgvpifpchtn-ZC1Zs529Oq4@public.gmane.org>
2018-01-29 12:03 ` Philipp Rossak
2018-04-19 15:11 ` [linux-sunxi] " Kyle Evans
2018-04-19 15:13 ` Icenowy Zheng
2018-04-19 15:19 ` Kyle Evans
[not found] ` <CACNAnaFMKDmvAUXJngKHWkeGLfjsgn5hhJszNk7Sg4BU98Oafw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2018-04-20 9:35 ` Philipp Rossak
[not found] ` <0ab29bf0-b069-338e-f312-e533656fa0b6-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-07-24 17:19 ` Paul Kocialkowski
2018-07-25 9:05 ` [linux-sunxi] " Emmanuel Vadot
[not found] ` <20180725110512.b6fb81be76f66b07942e5af0-xXdDKFdH5B3kFDPD4ZthVA@public.gmane.org>
2018-07-25 9:12 ` Paul Kocialkowski
2018-01-28 23:29 ` [PATCH v2 15/16] arm: dts: sun8i: a83t: add support for the thermal sensor in A83T Philipp Rossak
2018-01-28 23:29 ` [PATCH v2 16/16] arm: dts: sun8i: a83t: add thermal zone to A83T Philipp Rossak
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=20180128232919.12639-8-embed3d@gmail.com \
--to=embed3d-re5jqeeqqe8avxtiumwx3w@public.gmane.org \
--cc=clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=edu.molinas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org \
--cc=icenowy-h8G6r0blFSE@public.gmane.org \
--cc=jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=knaack.h-Mmb7MZpHnFY@public.gmane.org \
--cc=krzk-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org \
--cc=lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=linux-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org \
--cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
--cc=linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org \
--cc=mark.rutland-5wv7dgnIgG8@public.gmane.org \
--cc=maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org \
--cc=quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \
--cc=rask-SivP7zSAdNDZaaYASwVUlg@public.gmane.org \
--cc=robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=sean-hENCXIMQXOg@public.gmane.org \
--cc=singhalsimran0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=wens-jdAy2FN1RRM@public.gmane.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).