Skip to contentSkip to conversation

iio: adc: mt6360: Add ADC driver for MT6360

PATCH Superseded Gene Chen 5 participants 8 messages Sep 30, 2020 – Oct 16, 2020

Subsystems (3)

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Gene Chen

author
#0 lore raw

v6 cover iio: adc: mt6360: Add ADC driver for MT6360

This patch series add MT6360 ADC support contains driver, testing document and binding document

Gene Chen (2)
dt-bindings: iio: adc: add bindings doc for MT6360 ADC
Documentation: ABI: testing: mt6360: Add ADC sysfs guideline
iio: adc: mt6360: Add ADC driver for MT6360

 Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360                 |   78 ++
 Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml |   34 
 drivers/iio/adc/Kconfig                                            |   11 
 drivers/iio/adc/Makefile                                           |    1 
 drivers/iio/adc/mt6360-adc.c                                       |  362 ++++++++++
 5 files changed, 486 insertions(+)

changelogs between v1 & v2
- adc: use IIO_CHAN_INFO_PROCESSED only
- adc: use devm_iio_triggered_buffer_setup
- adc: use use s64 to record timestamp

changelogs between v2 & v3
- Rearrange include file order by alphabet
- Set line length constraint below 100
- Add Document for testing adc sysfs node guideline
- Set compiler 64 bit aligned when handle iio timestamp

changelogs between v3 & v4
- Fix sysfs guideline description
- Replace iio channel processed by raw/scale/offset
- Add comment of read adc flow for special HW design

changelogs between v4 & v5
- Rename dt-bindings aligned to file name
- Aligned sysfs node name with driver and add VBUSDIVX description
- Add ADC channel sysfs node "*_labels"

changelogs between v5 & v6
- Memset aligned adc data
- Remove strong casting void pointer

author
#1 lore raw

PATCH v6 1/3 dt-bindings: iio: adc: add bindings doc for MT6360 ADC

From: Gene Chen <[email protected]>

This change adds the binding doc for the MT6360 ADC.

---
 .../bindings/iio/adc/mediatek,mt6360-adc.yaml      | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml
Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml new file +34 -0
new file mode 100644
index 0000000..a7350ec
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/iio/adc/mediatek,mt6360-adc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Mediatek MT6360 and similar ADCs
+
+maintainers:
+  - Gene Chen <[email protected]>
+
+description: |
+  Family of simple ADCs with i2c interface and internal references.
+
+properties:
+  compatible:
+    const: mediatek,mt6360-adc
+
+  "#io-channel-cells":
+    const: 1
+
+required:
+  - compatible
+  - "#io-channel-cells"
+
+additionalProperties: false
+
+examples:
+  - |
+    adc {
+      compatible = "mediatek,mt6360-adc";
+      #io-channel-cells = <1>;
+    };
+...
Signature · 1 line
2.7.4
maintainer
#2 lore raw

Re: [PATCH v6 1/3] dt-bindings: iio: adc: add bindings doc for MT6360 ADC

Quoted 10 lines · Gene Chen

From: Gene Chen <[email protected]>

This change adds the binding doc for the MT6360 ADC.

---
 .../bindings/iio/adc/mediatek,mt6360-adc.yaml      | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml

Please add Acked-by/Reviewed-by tags when posting new versions. However, there's no need to repost patches *only* to add the tags. The upstream maintainer will do that for acks received on the version they apply.

If a tag was not added on purpose, please state why and what changed.

author
#3 lore raw

PATCH v6 2/3 Documentation: ABI: testing: mt6360: Add ADC sysfs guideline

In reply to Gene Chen

From: Gene Chen <[email protected]>

Add ABI documentation for mt6360 ADC sysfs interfaces.

---
 Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360 | 78 ++++++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360
Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360 new file +78 -0
new file mode 100644
index 0000000..e5a7b1c
@@ -0,0 +1,78 @@
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage0_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 USBID ADC which connected to connector ID pin.
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage1_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 VBUS ADC with lower accuracy(+-75mA)
+		higher measure range(1~22mV)
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage2_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 VBUS ADC with higher accuracy(+-30mA)
+		lower measure range(1~9.76V)
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage3_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 VSYS ADC
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage4_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 VBAT ADC
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_current5_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 IBUS ADC
+		Calculating with scale and offset returns voltage in uA
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_current6_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 IBAT ADC
+		Calculating with scale and offset returns voltage in uA
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_current7_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 CHG_VDDP ADC
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_temp8_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 IC junction temperature
+		Calculating with scale and offset returns temperature in degree
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage9_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 VREF_TS ADC
+		Calculating with scale and offset returns voltage in uV
+
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage10_raw
+KernelVersion:	5.8.0
+Contact:	[email protected]
+Description:
+		Indicated MT6360 TS ADC
+		Calculating with scale and offset returns voltage in uV
Signature · 1 line
2.7.4
author
#4 lore raw

PATCH v6 3/3 iio: adc: mt6360: Add ADC driver for MT6360

In reply to Gene Chen

From: Gene Chen <[email protected]>

Add MT6360 ADC driver include Charger Current, Voltage, and Temperature.

---
 drivers/iio/adc/Kconfig      |  11 ++
 drivers/iio/adc/Makefile     |   1 +
 drivers/iio/adc/mt6360-adc.c | 362 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 374 insertions(+)
 create mode 100644 drivers/iio/adc/mt6360-adc.c
drivers/iio/adc/Kconfig +11 -0
index d94dc80..a135ada 100644
@@ -703,6 +703,17 @@ config MCP3911
 	  This driver can also be built as a module. If so, the module will be
 	  called mcp3911.
 
+config MEDIATEK_MT6360_ADC
+	tristate "Mediatek MT6360 ADC driver"
+	depends on MFD_MT6360
+	select IIO_BUFFER
+	select IIO_TRIGGERED_BUFFER
+	help
+	  Say Y here to enable MT6360 ADC support.
+	  Integrated for System Monitoring includes
+	  is used in smartphones and tablets and supports a 11 channel
+	  general purpose ADC.
+
 config MEDIATEK_MT6577_AUXADC
 	tristate "MediaTek AUXADC driver"
 	depends on ARCH_MEDIATEK || COMPILE_TEST
drivers/iio/adc/Makefile +1 -0
index 90f94ad..5fca90a 100644
@@ -65,6 +65,7 @@ obj-$(CONFIG_MAX9611) += max9611.o
 obj-$(CONFIG_MCP320X) += mcp320x.o
 obj-$(CONFIG_MCP3422) += mcp3422.o
 obj-$(CONFIG_MCP3911) += mcp3911.o
+obj-$(CONFIG_MEDIATEK_MT6360_ADC) += mt6360-adc.o
 obj-$(CONFIG_MEDIATEK_MT6577_AUXADC) += mt6577_auxadc.o
 obj-$(CONFIG_MEN_Z188_ADC) += men_z188_adc.o
 obj-$(CONFIG_MESON_SARADC) += meson_saradc.o
drivers/iio/adc/mt6360-adc.c new file +362 -0

362 lines not on this page · raw message

Signature · 1 line
2.7.4
#5 lore raw
Thank you for the patch! Yet something to improve:

Hi Gene,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on iio/togreg]
[also build test ERROR on robh/for-next soc/for-next v5.9-rc7 next-20200929] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Gene-Chen/iio-adc-mt6360-Add-ADC-driver-for-MT6360/20200930-165619
base:   https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
config: sh-allmodconfig (attached as .config)
compiler: sh4-linux-gcc (GCC) 9.3.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/c5eda86258a6e9fc21bae8a1e0cb3bc9f54ca87e
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Gene-Chen/iio-adc-mt6360-Add-ADC-driver-for-MT6360/20200930-165619 git checkout c5eda86258a6e9fc21bae8a1e0cb3bc9f54ca87e
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=sh

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> drivers/iio/adc/mt6360-adc.c:212:3: error: 'const struct iio_info' has no member named 'read_label'; did you mean 'read_raw'?
     212 |  .read_label = mt6360_adc_read_label,
         |   ^~~~~~~~~~
         |   read_raw
>> drivers/iio/adc/mt6360-adc.c:212:16: error: initialization of 'int (*)(struct iio_dev *, const struct iio_chan_spec *, int,  int *, int *, long int)' from incompatible pointer type 'int (*)(struct iio_dev *, const struct iio_chan_spec *, char *)' [-Werror=incompatible-pointer-types]
     212 |  .read_label = mt6360_adc_read_label,
         |                ^~~~~~~~~~~~~~~~~~~~~

drivers/iio/adc/mt6360-adc.c:212:16: note: (near initialization for 'mt6360_adc_iio_info.read_raw_multi')
cc1: some warnings being treated as errors

vim +212 drivers/iio/adc/mt6360-adc.c

209
210 static const struct iio_info mt6360_adc_iio_info = {
211 .read_raw = mt6360_adc_read_raw,

 > 212		.read_label = mt6360_adc_read_label,

213 };
214

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

#6 lore raw
In reply to Gene Chen
Quoted 4 lines · Gene Chen

From: Gene Chen <[email protected]>

Add MT6360 ADC driver include Charger Current, Voltage, and

including

Quoted 1 line

Temperature.

...

Quoted 1 line

+#define MT6360_AICR_MASK GENMASK(7, 2)

bits.h is missed.

...

Quoted 1 line

+#define MT6360_ADCEN_MASK 0x8000

BIT() ?

...

drivers/iio/adc/mt6360-adc.c line 89

Quoted 12 lines
drivers/iio/adc/mt6360-adc.c new file +11 -0
+static int mt6360_adc_read_channel(struct mt6360_adc_data *mad, int channel, int *val)
+{
 
+       start_t = ktime_get();
+       predict_end_t = ktime_add_ms(mad->last_off_timestamps[channel], 2 * ADC_WAIT_TIME_MS);
+
+       if (ktime_after(start_t, predict_end_t))
+               pre_wait_time = ADC_WAIT_TIME_MS;
+       else
+               pre_wait_time = 3 * ADC_WAIT_TIME_MS;
+
+       msleep(pre_wait_time);

This looks like NIH of wait_interruptible() or so.

...

Quoted 1 line

+ while (true) {

Oh, please avoid infinite loops.

Quoted 10 lines
drivers/iio/adc/mt6360-adc.c new file +10 -0
+               ret = regmap_raw_read(mad->regmap, MT6360_REG_PMUADCRPT1, rpt, sizeof(rpt));
+               if (ret)
+                       goto out_adc_conv;
+
+               /*
+                * There are two functions, ZCV and TypeC OTP, running ADC VBAT and TS in
+                * background, and ADC samples are taken on a fixed frequency no matter read the
+                * previous one or not.
+                * To avoid conflict, We set minimum time threshold after enable ADC and
+                * check report channel is the same.

drivers/iio/adc/mt6360-adc.c line 111

Quoted 10 lines
drivers/iio/adc/mt6360-adc.c new file +10 -0
+                * The worst case is run the same ADC twice and background function is also running,
+                * ADC conversion sequence is desire channel before start ADC, background ADC,
+                * desire channel after start ADC.
+                * So the minimum correct data is three times of typical conversion time.
+                */
+               if ((rpt[0] & MT6360_RPTCH_MASK) == channel)
+                       break;
+
+               msleep(ADC_WAIT_TIME_MS);
+       }

So, a new NIH of regmap_read_poll_timeout() ?

...

drivers/iio/adc/mt6360-adc.c line 114

Quoted 2 lines
drivers/iio/adc/mt6360-adc.c new file +2 -0
+       /* rpt[1]: ADC_HI_BYTE, rpt[2]: ADC_LOW_BYTE */
+       *val = rpt[1] << 8 | rpt[2];

get_unalined_be16() and hence redundant comment.

...

drivers/iio/adc/mt6360-adc.c line 179

Quoted 6 lines
drivers/iio/adc/mt6360-adc.c new file +5 -0
+static int mt6360_adc_read_offset(struct mt6360_adc_data *mad, int channel, int *val)
+{
+       *val = (channel == MT6360_CHAN_TEMP_JC) ? -80 : 0;
+       return IIO_VAL_INT;
 
+

Misplaced blank line.

drivers/iio/adc/mt6360-adc.c line 201

Quoted 5 lines
drivers/iio/adc/mt6360-adc.c new file +4 -0
+}
 
+static const char *mt6360_channel_labels[MT6360_CHAN_MAX] = {
+       "usbid", "vbusdiv5", "vbusdiv2", "vsys", "vbat", "ibus", "ibat", "chg_vddp", "temp_jc",
+       "vref_ts", "ts"

Leave comma.
And split either by power of two or equally between the lines (seems like 8 + 3 here).

Quoted 1 line

+};

...

drivers/iio/adc/mt6360-adc.c line 295

Quoted 4 lines
drivers/iio/adc/mt6360-adc.c new file +4 -0
+       /* Reset all channel off time to the current one */
+       all_off_time = ktime_get();
+       for (i = 0; i < MT6360_CHAN_MAX; i++)
+               info->last_off_timestamps[i] = all_off_time;

memset32() / memset64() / memset_l()
(Not applicable, but JFYI: memset_p() also present)

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#7 lore raw
In reply to Gene Chen
Quoted 7 lines · On Thu, 1 Oct 2020 16:54:05 +0800 Gene Chen <[email protected]>…

This patch series add MT6360 ADC support contains driver, testing document and binding document

Gene Chen (2)
dt-bindings: iio: adc: add bindings doc for MT6360 ADC
Documentation: ABI: testing: mt6360: Add ADC sysfs guideline
iio: adc: mt6360: Add ADC driver for MT6360

Hi Gene

This looks good to me. I'm just waiting now on some final reviews for the patch that adds the label attribute support. Once those are in I'll pick your driver up as well.

If I seem to have lost it, feel free to poke me!

Thanks,

Jonathan

Quoted 24 lines
 Documentation/ABI/testing/sysfs-bus-iio-adc-mt6360                 |   78 ++
 Documentation/devicetree/bindings/iio/adc/mediatek,mt6360-adc.yaml |   34 
 drivers/iio/adc/Kconfig                                            |   11 
 drivers/iio/adc/Makefile                                           |    1 
 drivers/iio/adc/mt6360-adc.c                                       |  362 ++++++++++
 5 files changed, 486 insertions(+)

changelogs between v1 & v2
- adc: use IIO_CHAN_INFO_PROCESSED only
- adc: use devm_iio_triggered_buffer_setup
- adc: use use s64 to record timestamp

changelogs between v2 & v3
- Rearrange include file order by alphabet
- Set line length constraint below 100
- Add Document for testing adc sysfs node guideline
- Set compiler 64 bit aligned when handle iio timestamp

changelogs between v3 & v4
- Fix sysfs guideline description
- Replace iio channel processed by raw/scale/offset
- Add comment of read adc flow for special HW design

Quoted 9 lines

changelogs between v4 & v5
- Rename dt-bindings aligned to file name
- Aligned sysfs node name with driver and add VBUSDIVX description
- Add ADC channel sysfs node "*_labels"

changelogs between v5 & v6
- Memset aligned adc data
- Remove strong casting void pointer

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek