Skip to contentSkip to conversation

Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs

PATCH Superseded Maksim Kiselev 3 participants 8 messages Jun 15, 2023 – Jun 17, 2023

Subsystems (4)
Device tree bindings RISC-V IIO Arm/Allwinner sunXi SoC support

v7 of 9 Superseded Latest is v9 →

lore
Share & tools
lore

Maksim Kiselev

author
#0 lore raw

v7 cover Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs

This series adds support for general purpose ADC (GPADC) on new Allwinner's SoCs, such as D1, T113s, T507 and R329. The implemented driver provides basic functionality for getting ADC channels data.

Change History:
v7:
- Fixed typo in DT bindings property

v6:
- Fixed DT bindings regexp for channel properties
- Dropped checking the max number of channels from the drivers code (This is redundant as we raly on DT bindings check)

v5:
- Fixed DT bindings properties for child nodes

v4:
- Fixed DT bindings warnings
- Used GENMASK to clear the irq register
- Minor formatting fixes

v3:
- Added DT bindings dual license, fixed property order and example formatting
- Added explanations comments for timeout and mutex
- Dropped unnecessary regmap and used readl/writel instead
- Added error message about getting channel number
- Renamed labels and variables to make them self-explanatory

v2:
- Added lastch flag to avoid addition work for already selected channel
- Added reset assertion on module remove
- Added dynamic channel allocation and dropped iio_chan_spec arrays
- Changed IIO_CHAN_INFO_SCALE type to FRACTIONAL_LOG2
- Dropped separate compatible strings and configs for T113s and R329
- Fixed includes
- Fixed Kconfig description
- Removed duplicate probe error messages
- Used FIELD_PREP for bit setup

v1:
- Initial version

Maksim Kiselev (3):
iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
riscv: dts: allwinner: d1: Add GPADC node

 .../iio/adc/allwinner,sun20i-d1-gpadc.yaml    |  91 ++++++
 .../boot/dts/allwinner/sunxi-d1s-t113.dtsi    |  10 +
 drivers/iio/adc/Kconfig                       |  10 +
 drivers/iio/adc/Makefile                      |   1 +
 drivers/iio/adc/sun20i-gpadc-iio.c            | 276 ++++++++++++++++++
 5 files changed, 388 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c
Signature · 1 line
2.39.2
author
#1 lore raw

PATCH v7 1/3 iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC

The General Purpose ADC (GPADC) can convert the external signal into a certain proportion of digital value, to realize the measurement of analog signal, which can be applied to power detection and key detection.

Theoretically, this ADC can support up to 16 channels. All SoCs below contain this GPADC IP. The only difference between them is the number of available channels:

T113 - 1 channel
D1 - 2 channels
R329 - 4 channels
T507 - 4 channels

Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Maksim Kiselev <[email protected]>
---
 drivers/iio/adc/Kconfig            |  10 ++
 drivers/iio/adc/Makefile           |   1 +
 drivers/iio/adc/sun20i-gpadc-iio.c | 276 +++++++++++++++++++++++++++++
 3 files changed, 287 insertions(+)
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c
drivers/iio/adc/Kconfig +10 -0
index eb2b09ef5d5b..deff7ae704ce 100644
@@ -1123,6 +1123,16 @@ config SUN4I_GPADC
 	  To compile this driver as a module, choose M here: the module will be
 	  called sun4i-gpadc-iio.
 
+config SUN20I_GPADC
+	tristate "Support for the Allwinner SoCs GPADC"
+	depends on ARCH_SUNXI || COMPILE_TEST
+	help
+	  Say yes here to build support for Allwinner (D1, T113, T507 and R329)
+	  SoCs GPADC. This ADC provides up to 16 channels.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called sun20i-gpadc-iio.
+
 config TI_ADC081C
 	tristate "Texas Instruments ADC081C/ADC101C/ADC121C family"
 	depends on I2C
drivers/iio/adc/Makefile +1 -0
index e07e4a3e6237..fc4ef71d5f8f 100644
@@ -95,6 +95,7 @@ obj-$(CONFIG_RZG2L_ADC) += rzg2l_adc.o
 obj-$(CONFIG_SC27XX_ADC) += sc27xx_adc.o
 obj-$(CONFIG_SPEAR_ADC) += spear_adc.o
 obj-$(CONFIG_SUN4I_GPADC) += sun4i-gpadc-iio.o
+obj-$(CONFIG_SUN20I_GPADC) += sun20i-gpadc-iio.o
 obj-$(CONFIG_STM32_ADC_CORE) += stm32-adc-core.o
 obj-$(CONFIG_STM32_ADC) += stm32-adc.o
 obj-$(CONFIG_STM32_DFSDM_CORE) += stm32-dfsdm-core.o
drivers/iio/adc/sun20i-gpadc-iio.c new file +276 -0

276 lines not on this page · raw message

Signature · 1 line
2.39.2
maintainer
#2 lore raw

Re: [PATCH v7 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC

Quoted 27 lines · On Thu, 15 Jun 2023 23:55:20 +0300 Maksim Kiselev <[email protected]> wrote:

The General Purpose ADC (GPADC) can convert the external signal into a certain proportion of digital value, to realize the measurement of analog signal, which can be applied to power detection and key detection.

Theoretically, this ADC can support up to 16 channels. All SoCs below contain this GPADC IP. The only difference between them is the number of available channels:

T113 - 1 channel
D1 - 2 channels
R329 - 4 channels
T507 - 4 channels

Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Maksim Kiselev <[email protected]>
---
 drivers/iio/adc/Kconfig            |  10 ++
 drivers/iio/adc/Makefile           |   1 +
 drivers/iio/adc/sun20i-gpadc-iio.c | 276 +++++++++++++++++++++++++++++
 3 files changed, 287 insertions(+)
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c
drivers/iio/adc/Kconfig +0 -0
index eb2b09ef5d5b..deff7ae704ce 100644

drivers/iio/adc/Kconfig config SUN4I_GPADC · line 1127

Quoted 5 lines
drivers/iio/adc/Kconfig +2 -0
@@ -1123,6 +1123,16 @@ config SUN4I_GPADC
 	  To compile this driver as a module, choose M here: the module will be
 	  called sun4i-gpadc-iio.
 
+config SUN20I_GPADC
+	tristate "Support for the Allwinner SoCs GPADC"

I applied this and started a build test before noticing that this Kconfig description is very vague and matches the one for the existing 4i driver...

The 'Support for the' bit also isn't appropriate for what you see in make menuconfig
menu etc. Please come up with something descriptive. Maybe
"sun20i and similar SoC GPADC"?

Bonus points if you change the text for the 4i at the same time to be more meaningful. I clearly missed that in review a long time ago!

It's now too late anyway for the 6.5 cycle, so no particular rush though I can queue this up for build testing whilst waiting for 6.5-rc1 to come along (I'll rebase my tree on that once available) and it will then end up in next etc.

Jonathan

Quoted 8 lines
drivers/iio/adc/Kconfig +8 -0
+	depends on ARCH_SUNXI || COMPILE_TEST
+	help
+	  Say yes here to build support for Allwinner (D1, T113, T507 and R329)
+	  SoCs GPADC. This ADC provides up to 16 channels.
+
+	  To compile this driver as a module, choose M here: the module will be
+	  called sun20i-gpadc-iio.
+
author
#3 lore raw

Re: [PATCH v7 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC

сб, 17 июн. 2023 г. в 16:49, Jonathan Cameron <[email protected]>:

Quoted 34 lines
Quoted 30 lines · On Thu, 15 Jun 2023 23:55:20 +0300 Maksim Kiselev <[email protected]> wrote:

The General Purpose ADC (GPADC) can convert the external signal into a certain proportion of digital value, to realize the measurement of analog signal, which can be applied to power detection and key detection.

Theoretically, this ADC can support up to 16 channels. All SoCs below contain this GPADC IP. The only difference between them is the number of available channels:

T113 - 1 channel
D1 - 2 channels
R329 - 4 channels
T507 - 4 channels

Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Maksim Kiselev <[email protected]>
---
 drivers/iio/adc/Kconfig            |  10 ++
 drivers/iio/adc/Makefile           |   1 +
 drivers/iio/adc/sun20i-gpadc-iio.c | 276 +++++++++++++++++++++++++++++
 3 files changed, 287 insertions(+)
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c
drivers/iio/adc/Kconfig +0 -0
index eb2b09ef5d5b..deff7ae704ce 100644
@@ -1123,6 +1123,16 @@ config SUN4I_GPADC
        To compile this driver as a module, choose M here: the module will be
        called sun4i-gpadc-iio.
Quoted 4 lines

drivers/iio/adc/Kconfig config SUN4I_GPADC · line 1127

Quoted 2 lines
drivers/iio/adc/Kconfig +2 -0
+config SUN20I_GPADC
+     tristate "Support for the Allwinner SoCs GPADC"

I applied this and started a build test before noticing that this Kconfig description is very vague and matches the one for the existing 4i driver...

Indeed. I must have forgotten to change this line when copying from sun4i...

Quoted 6 lines

The 'Support for the' bit also isn't appropriate for what you see in make menuconfig
menu etc. Please come up with something descriptive. Maybe
"sun20i and similar SoC GPADC"?

Bonus points if you change the text for the 4i at the same time to be more meaningful. I clearly missed that in review a long time ago!

Should I do this in a separate patch?

maintainer
#4 lore raw

Re: [PATCH v7 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC

Quoted 42 lines · On Sat, 17 Jun 2023 21:52:12 +0300 Maxim Kiselev <[email protected]> wrote:

сб, 17 июн. 2023 г. в 16:49, Jonathan Cameron <[email protected]>:

Quoted 34 lines
Quoted 30 lines · On Thu, 15 Jun 2023 23:55:20 +0300 Maksim Kiselev <[email protected]> wrote:

The General Purpose ADC (GPADC) can convert the external signal into a certain proportion of digital value, to realize the measurement of analog signal, which can be applied to power detection and key detection.

Theoretically, this ADC can support up to 16 channels. All SoCs below contain this GPADC IP. The only difference between them is the number of available channels:

T113 - 1 channel
D1 - 2 channels
R329 - 4 channels
T507 - 4 channels

Reviewed-by Andy Shevchenko <[email protected]>
Signed-off-by Maksim Kiselev <[email protected]>
---
 drivers/iio/adc/Kconfig            |  10 ++
 drivers/iio/adc/Makefile           |   1 +
 drivers/iio/adc/sun20i-gpadc-iio.c | 276 +++++++++++++++++++++++++++++
 3 files changed, 287 insertions(+)
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c
drivers/iio/adc/Kconfig +0 -0
index eb2b09ef5d5b..deff7ae704ce 100644
@@ -1123,6 +1123,16 @@ config SUN4I_GPADC
        To compile this driver as a module, choose M here: the module will be
        called sun4i-gpadc-iio.
Quoted 4 lines

drivers/iio/adc/Kconfig config SUN4I_GPADC · line 1127

Quoted 2 lines
drivers/iio/adc/Kconfig +2 -0
+config SUN20I_GPADC
+     tristate "Support for the Allwinner SoCs GPADC"

I applied this and started a build test before noticing that this Kconfig description is very vague and matches the one for the existing 4i driver...

Indeed. I must have forgotten to change this line when copying from sun4i...

Quoted 8 lines
Quoted 6 lines

The 'Support for the' bit also isn't appropriate for what you see in make menuconfig
menu etc. Please come up with something descriptive. Maybe
"sun20i and similar SoC GPADC"?

Bonus points if you change the text for the 4i at the same time to be more meaningful. I clearly missed that in review a long time ago!

Should I do this in a separate patch?

Yes please.

Thanks,

Jonathan

author
#5 lore raw

PATCH v7 2/3 dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC

In reply to Maksim Kiselev

Allwinner's D1/T113s/R329/T507 SoCs have a new general purpose ADC. This ADC is the same for all of this SoCs. The only difference is the number of available channels.

Reviewed-by Conor Dooley <[email protected]>
Signed-off-by Maksim Kiselev <[email protected]>
---
 .../iio/adc/allwinner,sun20i-d1-gpadc.yaml    | 91 +++++++++++++++++++
 1 file changed, 91 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml new file +91 -0
new file mode 100644
index 000000000000..23c584f5a6e6
@@ -0,0 +1,91 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/iio/adc/allwinner,sun20i-d1-gpadc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Allwinner D1 General Purpose ADC
+
+maintainers:
+  - Maksim Kiselev <[email protected]>
+
+properties:
+  compatible:
+    enum:
+      - allwinner,sun20i-d1-gpadc
+
+  "#io-channel-cells":
+    const: 1
+
+  "#address-cells":
+    const: 1
+
+  "#size-cells":
+    const: 0
+
+  clocks:
+    maxItems: 1
+
+  interrupts:
+    maxItems: 1
+
+  reg:
+    maxItems: 1
+
+  resets:
+    maxItems: 1
+
+patternProperties:
+  "^channel@[0-9a-f]+$":
+    $ref: adc.yaml
+    type: object
+    description:
+      Represents the internal channels of the ADC.
+
+    properties:
+      reg:
+        items:
+          minimum: 0
+          maximum: 15
+
+    required:
+      - reg
+
+    unevaluatedProperties: false
+
+required:
+  - "#io-channel-cells"
+  - clocks
+  - compatible
+  - interrupts
+  - reg
+  - resets
+
+additionalProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/clock/sun20i-d1-ccu.h>
+    #include <dt-bindings/reset/sun20i-d1-ccu.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+
+    gpadc: adc@2009000 {
+        compatible = "allwinner,sun20i-d1-gpadc";
+        reg = <0x2009000 0x1000>;
+        clocks = <&ccu CLK_BUS_GPADC>;
+        resets = <&ccu RST_BUS_GPADC>;
+        interrupts = <73 IRQ_TYPE_LEVEL_HIGH>;
+        #io-channel-cells = <1>;
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        channel@0 {
+            reg = <0>;
+        };
+
+        channel@1 {
+            reg = <1>;
+        };
+    };
+...
Signature · 1 line
2.39.2
author
#6 lore raw

PATCH v7 3/3 riscv: dts: allwinner: d1: Add GPADC node

In reply to Maksim Kiselev

This patch adds declaration of the general purpose ADC for D1 and T113s SoCs.

Signed-off-by Maksim Kiselev <[email protected]>
---
 arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +10 -0
index 922e8e0e2c09..90c79041cfba 100644
@@ -138,6 +138,16 @@ ccu: clock-controller@2001000 {
 			#reset-cells = <1>;
 		};
 
+		gpadc: adc@2009000 {
+			compatible = "allwinner,sun20i-d1-gpadc";
+			reg = <0x2009000 0x1000>;
+			clocks = <&ccu CLK_BUS_GPADC>;
+			resets = <&ccu RST_BUS_GPADC>;
+			interrupts = <SOC_PERIPHERAL_IRQ(57) IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
+			#io-channel-cells = <1>;
+		};
+
 		dmic: dmic@2031000 {
 			compatible = "allwinner,sun20i-d1-dmic",
 				     "allwinner,sun50i-h6-dmic";
Signature · 1 line
2.39.2