From: Philipp Rossak <embed3d@gmail.com>
To: lee.jones@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com,
maxime.ripard@bootlin.com, wens@csie.org, linux@armlinux.org.uk,
jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de,
pmeerw@pmeerw.net, eugen.hristev@microchip.com,
rdunlap@infradead.org, vilhelm.gray@gmail.com,
clabbe.montjoie@gmail.com, quentin.schulz@bootlin.com,
geert+renesas@glider.be, lukas@wunner.de, icenowy@aosc.io,
arnd@arndb.de, broonie@kernel.org, arnaud.pouliquen@st.com
Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: [PATCH v3 16/30] iio: adc: sun4i-gpadc-iio: rework: readout temp_data
Date: Thu, 30 Aug 2018 17:45:04 +0200 [thread overview]
Message-ID: <20180830154518.29507-17-embed3d@gmail.com> (raw)
In-Reply-To: <20180830154518.29507-1-embed3d@gmail.com>
For adding newer sensor some basic rework of the code is necessary.
This commit reworks the code and uses regmap field to read out
temp_data.
Signed-off-by: Philipp Rossak <embed3d@gmail.com>
---
drivers/iio/adc/sun4i-gpadc-iio.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
index d48f338af563..c278e165e161 100644
--- a/drivers/iio/adc/sun4i-gpadc-iio.c
+++ b/drivers/iio/adc/sun4i-gpadc-iio.c
@@ -63,6 +63,7 @@ struct gpadc_data {
int (*ths_suspend)(struct sun4i_gpadc_iio *info);
int (*ths_resume)(struct sun4i_gpadc_iio *info);
bool support_irq;
+ u32 temp_data_base;
};
static irqreturn_t sun4i_gpadc_data_irq_handler(int irq, void *dev_id);
@@ -77,6 +78,7 @@ static const struct gpadc_data sun4i_gpadc_data = {
.adc_channel = true,
.ths_irq_thread = sun4i_gpadc_data_irq_handler,
.support_irq = true,
+ .temp_data_base = SUN4I_GPADC_TEMP_DATA,
};
static const struct gpadc_data sun5i_gpadc_data = {
@@ -89,6 +91,7 @@ static const struct gpadc_data sun5i_gpadc_data = {
.adc_channel = true,
.ths_irq_thread = sun4i_gpadc_data_irq_handler,
.support_irq = true,
+ .temp_data_base = SUN4I_GPADC_TEMP_DATA,
};
static const struct gpadc_data sun6i_gpadc_data = {
@@ -101,12 +104,14 @@ static const struct gpadc_data sun6i_gpadc_data = {
.adc_channel = true,
.ths_irq_thread = sun4i_gpadc_data_irq_handler,
.support_irq = true,
+ .temp_data_base = SUN4I_GPADC_TEMP_DATA,
};
static const struct gpadc_data sun8i_a33_gpadc_data = {
.temp_offset = -1662,
.temp_scale = 162,
.tp_mode_en = SUN8I_A33_GPADC_CTRL1_CHOP_TEMP_EN,
+ .temp_data_base = SUN4I_GPADC_TEMP_DATA,
};
struct sun4i_gpadc_iio {
@@ -271,18 +276,18 @@ static int sun4i_gpadc_temp_read(struct iio_dev *indio_dev, int *val)
{
struct sun4i_gpadc_iio *info = iio_priv(indio_dev);
- if (!info->data->support_irq) {
- pm_runtime_get_sync(indio_dev->dev.parent);
+ if (info->data->adc_channel)
+ return sun4i_gpadc_read(indio_dev, 0, val,
+ SUN4I_GPADC_IRQ_TEMP_DATA);
- regmap_read(info->regmap, SUN4I_GPADC_TEMP_DATA, val);
+ pm_runtime_get_sync(indio_dev->dev.parent);
- pm_runtime_mark_last_busy(indio_dev->dev.parent);
- pm_runtime_put_autosuspend(indio_dev->dev.parent);
+ regmap_read(info->regmap, info->data->temp_data_base, val);
- return 0;
- }
+ pm_runtime_mark_last_busy(indio_dev->dev.parent);
+ pm_runtime_put_autosuspend(indio_dev->dev.parent);
- return sun4i_gpadc_read(indio_dev, 0, val, SUN4I_GPADC_IRQ_TEMP_DATA);
+ return 0;
}
static int sun4i_gpadc_temp_offset(struct iio_dev *indio_dev, int *val)
--
2.11.0
next prev parent reply other threads:[~2018-08-30 19:48 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-30 15:44 [PATCH v3 00/30] IIO-based thermal sensor driver for Allwinner H3 and A83T SoC Philipp Rossak
2018-08-30 15:44 ` [PATCH v3 01/30] mfd: Makefile: Remove build option for MFD:sun4i-gpadc Philipp Rossak
2018-08-31 8:25 ` Maxime Ripard
2018-09-02 19:58 ` Jonathan Cameron
2018-08-30 15:44 ` [PATCH v3 02/30] mfd: Kconfig: Remove MFD_SUN4I_GPADC config option Philipp Rossak
2018-09-02 19:58 ` Jonathan Cameron
2018-08-30 15:44 ` [PATCH v3 03/30] iio: adc: Remove ID table Philipp Rossak
2018-08-30 15:44 ` [PATCH v3 04/30] iio: adc: Kconfig: Update Kconfig to new build options Philipp Rossak
2018-08-31 8:32 ` Maxime Ripard
2018-08-30 15:44 ` [PATCH v3 05/30] iio: adc: move SUN4I_GPADC_CHANNEL define to header file Philipp Rossak
2018-09-02 20:01 ` Jonathan Cameron
2018-09-03 14:24 ` Philipp Rossak
2018-09-03 17:28 ` Jonathan Cameron
2018-08-30 15:44 ` [PATCH v3 06/30] iio: adc: remove ofnode options Philipp Rossak
2018-08-30 15:44 ` [PATCH v3 07/30] iio: adc: remove mfd_probe & sunwi_irq_init function Philipp Rossak
2018-08-31 8:34 ` Maxime Ripard
2018-08-30 15:44 ` [PATCH v3 08/30] iio: adc: remove hwmon structure Philipp Rossak
2018-08-31 8:34 ` Maxime Ripard
2018-08-30 15:44 ` [PATCH v3 09/30] iio: adc: Threat A33 as thermal sensor and remove non thermal sun4i channel Philipp Rossak
2018-08-30 16:40 ` [linux-sunxi] " Ondřej Jirman
2018-08-31 8:35 ` Maxime Ripard
2018-08-30 15:44 ` [PATCH v3 10/30] iio: adc: rework irq and adc_channel handling Philipp Rossak
2018-08-31 8:44 ` Maxime Ripard
2018-08-30 15:44 ` [PATCH v3 11/30] iio: adc: add new compatibles Philipp Rossak
2018-08-31 8:46 ` Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 12/30] mfd: Remove old mfd driver & Move sun4i-gpadc.h to iio/adc/ Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 13/30] arm: config: Enable SUN4I_GPADC in defconfig Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 14/30] dt-bindings: update the Allwinner GPADC device tree binding for H3 & A83T Philipp Rossak
2018-08-31 8:48 ` Maxime Ripard
2018-09-10 19:44 ` Rob Herring
2018-09-11 9:12 ` Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 15/30] iio: adc: sun4i-gpadc-iio: rename A33-specified registers to contain A33 Philipp Rossak
2018-08-30 15:45 ` Philipp Rossak [this message]
2018-08-31 8:50 ` [PATCH v3 16/30] iio: adc: sun4i-gpadc-iio: rework: readout temp_data Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 17/30] iio: adc: sun4i-gpadc-iio: rework: support clocks and reset Philipp Rossak
2018-08-31 9:03 ` Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 18/30] iio: adc: sun4i-gpadc-iio: rework: support multiple sensors Philipp Rossak
2018-08-31 9:05 ` Maxime Ripard
2018-09-02 20:11 ` Jonathan Cameron
2018-09-03 13:58 ` Philipp Rossak
2018-09-03 17:29 ` Jonathan Cameron
2018-08-30 15:45 ` [PATCH v3 19/30] iio: adc: sun4i-gpadc-iio: rework: support nvmem calibration data Philipp Rossak
2018-08-31 9:07 ` Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 20/30] iio: adc: sun4i-gpadc-iio: rework: device specific suspend & resume Philipp Rossak
2018-08-31 9:09 ` Maxime Ripard
2018-08-31 12:05 ` Philipp Rossak
2018-09-03 9:44 ` Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 21/30] iio: adc: sun4i-gpadc-iio: add support for H3 thermal sensor Philipp Rossak
2018-08-30 16:27 ` [linux-sunxi] " Ondřej Jirman
2018-08-30 20:00 ` Philipp Rossak
2018-08-30 20:46 ` Philipp Rossak
2018-08-31 9:11 ` Maxime Ripard
2018-08-31 9:51 ` Icenowy Zheng
2018-08-31 11:58 ` [linux-sunxi] " Philipp Rossak
2018-09-03 10:20 ` Maxime Ripard
2018-09-03 11:01 ` [linux-sunxi] " Icenowy Zheng
2018-09-05 14:58 ` Maxime Ripard
2018-08-31 12:01 ` Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 22/30] iio: adc: sun4i-gpadc-iio: add support for A83T " Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 23/30] ARM: dts: sunxi-h3-h5: add support for the thermal sensor in H3 and H5 Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 24/30] ARM: dts: sun8i: h3: add support for the thermal sensor in H3 Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 25/30] ARM: dts: sun8i: h3: add thermal zone to H3 Philipp Rossak
2018-08-31 9:14 ` Maxime Ripard
2018-08-30 15:45 ` [PATCH v3 26/30] ARM: dts: sun8i: h3: enable H3 sid controller Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 27/30] ARM: dts: sun8i: h3: use calibration for ths Philipp Rossak
2018-09-04 16:46 ` Emmanuel Vadot
2018-09-06 11:47 ` Philipp Rossak
2018-09-06 11:51 ` Maxime Ripard
2018-09-06 12:04 ` [linux-sunxi] " Icenowy Zheng
2018-09-06 12:18 ` Philipp Rossak
2019-02-19 7:54 ` Allwinner SID THS calibration data cell representation? Chen-Yu Tsai
2019-02-20 14:55 ` Maxime Ripard
2019-02-21 10:10 ` Emmanuel Vadot
2019-02-25 20:37 ` Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 28/30] ARM: dts: sun8i: a83t: add support for the thermal sensor in A83T Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 29/30] ARM: dts: sun8i: a83t: add thermal zone to A83T Philipp Rossak
2018-08-30 15:45 ` [PATCH v3 30/30] ARM: sun8i: a83t: full range OPP tables and CPUfreq Philipp Rossak
2018-08-30 16:38 ` [linux-sunxi] " Ondřej Jirman
2018-08-30 20:29 ` Philipp Rossak
2018-09-06 7:24 ` Quentin Schulz
2018-09-06 11:39 ` Philipp Rossak
2018-09-06 11:42 ` Maxime Ripard
2018-09-06 12:06 ` Quentin Schulz
2019-03-19 12:30 ` [PATCH v3 00/30] IIO-based thermal sensor driver for Allwinner H3 and A83T SoC Måns Rullgård
2019-03-19 12:37 ` Maxime Ripard
2019-03-19 13:04 ` [linux-sunxi] " Chen-Yu Tsai
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=20180830154518.29507-17-embed3d@gmail.com \
--to=embed3d@gmail.com \
--cc=arnaud.pouliquen@st.com \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=clabbe.montjoie@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=eugen.hristev@microchip.com \
--cc=geert+renesas@glider.be \
--cc=icenowy@aosc.io \
--cc=jic23@kernel.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=linux@armlinux.org.uk \
--cc=lukas@wunner.de \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=pmeerw@pmeerw.net \
--cc=quentin.schulz@bootlin.com \
--cc=rdunlap@infradead.org \
--cc=robh+dt@kernel.org \
--cc=vilhelm.gray@gmail.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).