From: Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
To: Quentin Schulz
<quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Cc: 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,
icenowy-h8G6r0blFSE@public.gmane.org,
edu.molinas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
singhalsimran0-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org,
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: Re: [PATCH v2 06/16] iio: adc: sun4i-gpadc-iio: rework: support multiple sensors
Date: Fri, 2 Feb 2018 15:13:28 +0100 [thread overview]
Message-ID: <42632deb-077a-ad73-58e1-92d92dbd0963@gmail.com> (raw)
In-Reply-To: <20180131184236.4yhp732l5kenhmp2@qschulz>
On 31.01.2018 19:42, Quentin Schulz wrote:
> Hi Philipp,
>
> On Mon, Jan 29, 2018 at 12:29:09AM +0100, Philipp Rossak wrote:
>> For adding newer sensor some basic rework of the code is necessary.
>>
>> This patch reworks the driver to be able to handle more than one
>> thermal sensor. Newer SoC like the A80 have 4 thermal sensors.
>> Because of this the maximal sensor count value was set to 4.
>>
>> The sensor_id value is set during sensor registration and is for each
>> registered sensor indiviual. This makes it able to differntiate the
>> sensors when the value is read from the register.
>>
>> In function sun4i_gpadc_read_raw(), the sensor number of the ths sensor
>> was directly set to 0 (sun4i_gpadc_temp_read(x,x,0)). This selects
>> in the temp_read function automatically sensor 0. A check for the
>> sensor_id is here not required since the old sensors only have one
>> thermal sensor. In addition to that is the sun4i_gpadc_read_raw()
>> function only used by the "older" sensors (before A33) where the
>> thermal sensor was a cobination of an adc and a thermal sensor.
>>
>> Signed-off-by: Philipp Rossak <embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>> ---
>> drivers/iio/adc/sun4i-gpadc-iio.c | 36 +++++++++++++++++++++++-------------
>> include/linux/mfd/sun4i-gpadc.h | 3 +++
>> 2 files changed, 26 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/iio/adc/sun4i-gpadc-iio.c b/drivers/iio/adc/sun4i-gpadc-iio.c
>> index 51ec0104d678..ac9ad2f8232f 100644
>> --- a/drivers/iio/adc/sun4i-gpadc-iio.c
>> +++ b/drivers/iio/adc/sun4i-gpadc-iio.c
>> @@ -67,12 +67,13 @@ struct gpadc_data {
>> unsigned int tp_adc_select;
>> unsigned int (*adc_chan_select)(unsigned int chan);
>> unsigned int adc_chan_mask;
>> - unsigned int temp_data;
>> + unsigned int temp_data[MAX_SENSOR_COUNT];
>> int (*sample_start)(struct sun4i_gpadc_iio *info);
>> int (*sample_end)(struct sun4i_gpadc_iio *info);
>> bool has_bus_clk;
>> bool has_bus_rst;
>> bool has_mod_clk;
>> + int sensor_count;
>> };
>>
>
> I've noticed that for H3, A83T, A64 (at least), if DATA reg of sensor 0
> is e.g. 0x80, DATA reg of sensor N is at 0x80 + 0x04 * N.
>
> Is that verified for other SoCs? Does anyone have some input on this?
>
> We could then just use temp_data as the DATA reg "base" and increment by
> 0x4 depending on the sensor id instead of using a fixed-size array.
>
This sounds like a good idea! I will add this to the next version.
I can verify this with a table, I created during development. I will
upload it during the weekend here: [1]
>> static const struct gpadc_data sun4i_gpadc_data = {
>> @@ -82,9 +83,10 @@ static const struct gpadc_data sun4i_gpadc_data = {
>> .tp_adc_select = SUN4I_GPADC_CTRL1_TP_ADC_SELECT,
>> .adc_chan_select = &sun4i_gpadc_chan_select,
>> .adc_chan_mask = SUN4I_GPADC_CTRL1_ADC_CHAN_MASK,
>> - .temp_data = SUN4I_GPADC_TEMP_DATA,
>> + .temp_data = {SUN4I_GPADC_TEMP_DATA, 0, 0, 0},
>> .sample_start = sun4i_gpadc_sample_start,
>> .sample_end = sun4i_gpadc_sample_end,
>> + .sensor_count = 1,
>
> If the solution above is not desirable/possible, could we use something
> like:
>
> unsigned int sun4i_temp_data[] = {SUN4I_GPADC_TEMP_DATA,};
>
> static const struct gpadc_data sun4i_gpadc_data = {
> .temp_data = &sun4i_temp_data,
> .sensor_count = ARRAY_SIZE(sun4i_temp_data),
> };
>
> That avoids 1) inconsistencies between the array size and the array
> itself, 2) does not require to pad the array with zeroes.
>
> [...]
>
>> @@ -745,9 +752,12 @@ static int sun4i_gpadc_probe(struct platform_device *pdev)
>> pm_runtime_enable(&pdev->dev);
>>
>> if (IS_ENABLED(CONFIG_THERMAL_OF)) {
>> - info->tzd = thermal_zone_of_sensor_register(info->sensor_device,
>> - 0, info,
>> - &sun4i_ts_tz_ops);
>> + for (i = 0; i < info->data->sensor_count; i++) {
>> + info->sensor_id = i;
>> + info->tzd = thermal_zone_of_sensor_register(
>> + info->sensor_device,
>> + i, info, &sun4i_ts_tz_ops);
>> + }
>
> As Maxime said, this does not work.
>
> One way would be to have a new structure being:
> struct sun4i_sensor_info {
> struct sun4i_gpadc_iio *info;
> unsigned int sensor_id;
> };
>
> Or since we only use the iio_dev within the sun4i_gpadc_iio in the
> .get_temp function, we may replace info by struct iio_dev *indio_dev
> above.
>
> Quentin
>
I will have a closer look on this next week, when I start to work on the
next version..
Thanks,
Philipp
[1]: http://linux-sunxi.org/Thermal_Sensor
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2018-02-02 14:13 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 [this message]
2018-01-28 23:29 ` [PATCH v2 07/16] iio: adc: sun4i-gpadc-iio: rework: support nvmem calibration data Philipp Rossak
[not found] ` <20180128232919.12639-8-embed3d-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2018-01-29 9:40 ` 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=42632deb-077a-ad73-58e1-92d92dbd0963@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).