linux-riscv.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v4 0/3] Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs
@ 2023-06-10 12:29 Maksim Kiselev
  2023-06-10 12:29 ` [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC Maksim Kiselev
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Maksim Kiselev @ 2023-06-10 12:29 UTC (permalink / raw)
  To: linux-iio
  Cc: Maksim Kiselev, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Andy Shevchenko,
	Cosmin Tanislav, Ramona Bolboaca, Marcus Folkesson,
	Hugo Villeneuve, William Breathitt Gray, ChiYuan Huang,
	Ibrahim Tilki, ChiaEn Wu, Arnd Bergmann, Haibo Chen,
	Caleb Connolly, Mike Looijmans, Leonard Göhrs, devicetree,
	linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv

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:
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
Maxim 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            | 281 ++++++++++++++++++
 5 files changed, 393 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c

-- 
2.39.2


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 12:29 [PATCH v4 0/3] Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs Maksim Kiselev
@ 2023-06-10 12:29 ` Maksim Kiselev
  2023-06-10 18:12   ` Jonathan Cameron
  2023-06-10 12:29 ` [PATCH v4 2/3] dt-bindings: " Maksim Kiselev
  2023-06-10 12:29 ` [PATCH v4 3/3] riscv: dts: allwinner: d1: Add GPADC node Maksim Kiselev
  2 siblings, 1 reply; 10+ messages in thread
From: Maksim Kiselev @ 2023-06-10 12:29 UTC (permalink / raw)
  To: linux-iio
  Cc: Maxim Kiselev, Andy Shevchenko, Jonathan Cameron,
	Lars-Peter Clausen, Rob Herring, Krzysztof Kozlowski,
	Conor Dooley, Chen-Yu Tsai, Jernej Skrabec, Samuel Holland,
	Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel,
	Cristian Ciocaltea, Andy Shevchenko, Cosmin Tanislav,
	Ramona Bolboaca, William Breathitt Gray, ChiYuan Huang,
	Ibrahim Tilki, ChiaEn Wu, Arnd Bergmann, Leonard Göhrs,
	Hugo Villeneuve, Caleb Connolly, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv

From: Maxim Kiselev <bigunclemax@gmail.com>

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

Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
 drivers/iio/adc/Kconfig            |  10 +
 drivers/iio/adc/Makefile           |   1 +
 drivers/iio/adc/sun20i-gpadc-iio.c | 281 +++++++++++++++++++++++++++++
 3 files changed, 292 insertions(+)
 create mode 100644 drivers/iio/adc/sun20i-gpadc-iio.c

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index eb2b09ef5d5b..deff7ae704ce 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -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
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index e07e4a3e6237..fc4ef71d5f8f 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -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
diff --git a/drivers/iio/adc/sun20i-gpadc-iio.c b/drivers/iio/adc/sun20i-gpadc-iio.c
new file mode 100644
index 000000000000..bd14a6449030
--- /dev/null
+++ b/drivers/iio/adc/sun20i-gpadc-iio.c
@@ -0,0 +1,281 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * GPADC driver for sunxi platforms (D1, T113-S3 and R329)
+ * Copyright (c) 2023 Maksim Kiselev <bigunclemax@gmail.com>
+ */
+
+#include <linux/bitfield.h>
+#include <linux/clk.h>
+#include <linux/completion.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/property.h>
+#include <linux/reset.h>
+
+#include <linux/iio/iio.h>
+
+#define SUN20I_GPADC_DRIVER_NAME	"sun20i-gpadc"
+
+/* Register map definition */
+#define SUN20I_GPADC_SR			0x00
+#define SUN20I_GPADC_CTRL		0x04
+#define SUN20I_GPADC_CS_EN		0x08
+#define SUN20I_GPADC_FIFO_INTC		0x0c
+#define SUN20I_GPADC_FIFO_INTS		0x10
+#define SUN20I_GPADC_FIFO_DATA		0X14
+#define SUN20I_GPADC_CB_DATA		0X18
+#define SUN20I_GPADC_DATAL_INTC		0x20
+#define SUN20I_GPADC_DATAH_INTC		0x24
+#define SUN20I_GPADC_DATA_INTC		0x28
+#define SUN20I_GPADC_DATAL_INTS		0x30
+#define SUN20I_GPADC_DATAH_INTS		0x34
+#define SUN20I_GPADC_DATA_INTS		0x38
+#define SUN20I_GPADC_CH_CMP_DATA(x)	(0x40 + (x) * 4)
+#define SUN20I_GPADC_CH_DATA(x)		(0x80 + (x) * 4)
+
+#define SUN20I_GPADC_CTRL_ADC_AUTOCALI_EN_MASK		BIT(23)
+#define SUN20I_GPADC_CTRL_WORK_MODE_MASK		GENMASK(19, 18)
+#define SUN20I_GPADC_CTRL_ADC_EN_MASK			BIT(16)
+#define SUN20I_GPADC_CS_EN_ADC_CH(x)			BIT(x)
+#define SUN20I_GPADC_DATA_INTC_CH_DATA_IRQ_EN(x)	BIT(x)
+
+#define SUN20I_GPADC_WORK_MODE_SINGLE			0
+
+#define SUN20I_GPADC_MAX_CHANNELS			16
+
+struct sun20i_gpadc_iio {
+	void __iomem		*regs;
+	struct completion	completion;
+	int			last_channel;
+	/*
+	 * Lock to protect the device state during a potential concurrent
+	 * read access from userspace. Reading a raw value requires a sequence
+	 * of register writes, then a wait for a completion callback,
+	 * and finally a register read, during which userspace could issue
+	 * another read request. This lock protects a read access from
+	 * ocurring before another one has finished.
+	 */
+	struct mutex		lock;
+};
+
+static int sun20i_gpadc_adc_read(struct sun20i_gpadc_iio *info,
+				 struct iio_chan_spec const *chan, int *val)
+{
+	u32 ctrl;
+	int ret = IIO_VAL_INT;
+
+	mutex_lock(&info->lock);
+
+	reinit_completion(&info->completion);
+
+	if (info->last_channel != chan->channel) {
+		info->last_channel = chan->channel;
+
+		/* enable the analog input channel */
+		writel(SUN20I_GPADC_CS_EN_ADC_CH(chan->channel),
+		       info->regs + SUN20I_GPADC_CS_EN);
+
+		/* enable the data irq for input channel */
+		writel(SUN20I_GPADC_DATA_INTC_CH_DATA_IRQ_EN(chan->channel),
+		       info->regs + SUN20I_GPADC_DATA_INTC);
+	}
+
+	/* enable the ADC function */
+	ctrl = readl(info->regs + SUN20I_GPADC_CTRL);
+	ctrl |= FIELD_PREP(SUN20I_GPADC_CTRL_ADC_EN_MASK, 1);
+	writel(ctrl, info->regs + SUN20I_GPADC_CTRL);
+
+	/*
+	 * According to the datasheet maximum acquire time(TACQ) can be
+	 * (65535+1)/24Mhz and conversion time(CONV_TIME) is always constant
+	 * and equal to 14/24Mhz, so (TACQ+CONV_TIME) <= 2.73125ms.
+	 * A 10ms delay should be enough to make sure an interrupt occurs in
+	 * normal conditions. If it doesn't occur, then there is a timeout.
+	 */
+	if (!wait_for_completion_timeout(&info->completion, msecs_to_jiffies(10))) {
+		ret = -ETIMEDOUT;
+		goto err_unlock;
+	}
+
+	/* read the ADC data */
+	*val = readl(info->regs + SUN20I_GPADC_CH_DATA(chan->channel));
+
+err_unlock:
+	mutex_unlock(&info->lock);
+
+	return ret;
+}
+
+static int sun20i_gpadc_read_raw(struct iio_dev *indio_dev,
+				 struct iio_chan_spec const *chan, int *val,
+				 int *val2, long mask)
+{
+	struct sun20i_gpadc_iio *info = iio_priv(indio_dev);
+
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+		return sun20i_gpadc_adc_read(info, chan, val);
+	case IIO_CHAN_INFO_SCALE:
+		/* value in mv = 1800mV / 4096 raw */
+		*val = 1800;
+		*val2 = 12;
+		return IIO_VAL_FRACTIONAL_LOG2;
+	default:
+		return -EINVAL;
+	}
+}
+
+static irqreturn_t sun20i_gpadc_irq_handler(int irq, void *data)
+{
+	struct sun20i_gpadc_iio *info = data;
+
+	/* clear data interrupt status register */
+	writel(GENMASK(31, 0), info->regs + SUN20I_GPADC_DATA_INTS);
+
+	complete(&info->completion);
+
+	return IRQ_HANDLED;
+}
+
+static const struct iio_info sun20i_gpadc_iio_info = {
+	.read_raw = sun20i_gpadc_read_raw,
+};
+
+static void sun20i_gpadc_reset_assert(void *data)
+{
+	struct reset_control *rst = data;
+
+	reset_control_assert(rst);
+}
+
+static int sun20i_gpadc_alloc_channels(struct iio_dev *indio_dev,
+				       struct device *dev)
+{
+	unsigned int channel;
+	int num_channels, i, ret;
+	struct iio_chan_spec *channels;
+	struct fwnode_handle *node;
+
+	num_channels = device_get_child_node_count(dev);
+	if (num_channels == 0)
+		return dev_err_probe(dev, -ENODEV, "no channel children\n");
+
+	if (num_channels > SUN20I_GPADC_MAX_CHANNELS)
+		return dev_err_probe(dev, -EINVAL, "num of channel children out of range\n");
+
+	channels = devm_kcalloc(dev, num_channels, sizeof(*channels),
+				GFP_KERNEL);
+	if (!channels)
+		return -ENOMEM;
+
+	i = 0;
+	device_for_each_child_node(dev, node) {
+		ret = fwnode_property_read_u32(node, "reg", &channel);
+		if (ret) {
+			fwnode_handle_put(node);
+			return dev_err_probe(dev, ret, "invalid channel number\n");
+		}
+
+		channels[i].type = IIO_VOLTAGE;
+		channels[i].indexed = 1;
+		channels[i].channel = channel;
+		channels[i].info_mask_separate = BIT(IIO_CHAN_INFO_RAW);
+		channels[i].info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE);
+
+		i++;
+	}
+
+	indio_dev->channels = channels;
+	indio_dev->num_channels = num_channels;
+
+	return 0;
+}
+
+static int sun20i_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct iio_dev *indio_dev;
+	struct sun20i_gpadc_iio *info;
+	struct reset_control *rst;
+	struct clk *clk;
+	int irq;
+	int ret;
+
+	indio_dev = devm_iio_device_alloc(dev, sizeof(*info));
+	if (!indio_dev)
+		return -ENOMEM;
+
+	info = iio_priv(indio_dev);
+	info->last_channel = -1;
+
+	mutex_init(&info->lock);
+	init_completion(&info->completion);
+
+	ret = sun20i_gpadc_alloc_channels(indio_dev, dev);
+	if (ret)
+		return ret;
+
+	indio_dev->info = &sun20i_gpadc_iio_info;
+	indio_dev->name = SUN20I_GPADC_DRIVER_NAME;
+
+	info->regs = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(info->regs))
+		return PTR_ERR(info->regs);
+
+	clk = devm_clk_get_enabled(dev, NULL);
+	if (IS_ERR(clk))
+		return dev_err_probe(dev, PTR_ERR(clk), "failed to enable bus clock\n");
+
+	rst = devm_reset_control_get_exclusive(dev, NULL);
+	if (IS_ERR(rst))
+		return dev_err_probe(dev, PTR_ERR(rst), "failed to get reset control\n");
+
+	ret = reset_control_deassert(rst);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed to deassert reset\n");
+
+	ret = devm_add_action_or_reset(dev, sun20i_gpadc_reset_assert, rst);
+	if (ret)
+		return ret;
+
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return irq;
+
+	ret = devm_request_irq(dev, irq, sun20i_gpadc_irq_handler, 0,
+			       dev_name(dev), info);
+	if (ret)
+		return dev_err_probe(dev, ret, "failed requesting irq %d\n", irq);
+
+	writel(FIELD_PREP(SUN20I_GPADC_CTRL_ADC_AUTOCALI_EN_MASK, 1) |
+	       FIELD_PREP(SUN20I_GPADC_CTRL_WORK_MODE_MASK, SUN20I_GPADC_WORK_MODE_SINGLE),
+	       info->regs + SUN20I_GPADC_CTRL);
+
+	ret = devm_iio_device_register(dev, indio_dev);
+	if (ret)
+		return dev_err_probe(dev, ret, "could not register the device\n");
+
+	return 0;
+}
+
+static const struct of_device_id sun20i_gpadc_of_id[] = {
+	{ .compatible = "allwinner,sun20i-d1-gpadc" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, sun20i_gpadc_of_id);
+
+static struct platform_driver sun20i_gpadc_driver = {
+	.driver = {
+		.name = SUN20I_GPADC_DRIVER_NAME,
+		.of_match_table = sun20i_gpadc_of_id,
+	},
+	.probe = sun20i_gpadc_probe,
+};
+module_platform_driver(sun20i_gpadc_driver);
+
+MODULE_DESCRIPTION("ADC driver for sunxi platforms");
+MODULE_AUTHOR("Maksim Kiselev <bigunclemax@gmail.com>");
+MODULE_LICENSE("GPL");
-- 
2.39.2


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v4 2/3] dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 12:29 [PATCH v4 0/3] Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs Maksim Kiselev
  2023-06-10 12:29 ` [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC Maksim Kiselev
@ 2023-06-10 12:29 ` Maksim Kiselev
  2023-06-10 15:06   ` Conor Dooley
  2023-06-10 12:29 ` [PATCH v4 3/3] riscv: dts: allwinner: d1: Add GPADC node Maksim Kiselev
  2 siblings, 1 reply; 10+ messages in thread
From: Maksim Kiselev @ 2023-06-10 12:29 UTC (permalink / raw)
  To: linux-iio
  Cc: Maxim Kiselev, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Greg Kroah-Hartman,
	Andy Shevchenko, Cosmin Tanislav, Ulf Hansson, Arnd Bergmann,
	Hugo Villeneuve, William Breathitt Gray, ChiYuan Huang,
	Ramona Bolboaca, Ibrahim Tilki, Caleb Connolly, ChiaEn Wu,
	Haibo Chen, Leonard Göhrs, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv

From: Maxim Kiselev <bigunclemax@gmail.com>

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.

Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
---
 .../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

diff --git a/Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml b/Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
new file mode 100644
index 000000000000..2b59844b7c07
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
@@ -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 <bigunclemax@gmail.com>
+
+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-15])$":
+    $ref: adc.yaml
+    type: object
+    description:
+      Represents the internal channels of the ADC.
+
+    properties:
+      reg:
+        items:
+          minimum: 0
+          maximum: 15
+
+    required:
+      - reg
+
+    additionalProperties: false
+
+required:
+  - "#io-channel-cells"
+  - clocks
+  - compatible
+  - interrupts
+  - reg
+  - resets
+
+unevaluatedProperties: 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>;
+        };
+    };
+...
-- 
2.39.2


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v4 3/3] riscv: dts: allwinner: d1: Add GPADC node
  2023-06-10 12:29 [PATCH v4 0/3] Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs Maksim Kiselev
  2023-06-10 12:29 ` [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC Maksim Kiselev
  2023-06-10 12:29 ` [PATCH v4 2/3] dt-bindings: " Maksim Kiselev
@ 2023-06-10 12:29 ` Maksim Kiselev
  2 siblings, 0 replies; 10+ messages in thread
From: Maksim Kiselev @ 2023-06-10 12:29 UTC (permalink / raw)
  To: linux-iio
  Cc: Maxim Kiselev, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Andre Przywara,
	Andy Shevchenko, Cosmin Tanislav, Ramona Bolboaca, ChiYuan Huang,
	Leonard Göhrs, Marcus Folkesson, Ibrahim Tilki, ChiaEn Wu,
	William Breathitt Gray, Arnd Bergmann, Hugo Villeneuve,
	Haibo Chen, devicetree, linux-arm-kernel, linux-sunxi,
	linux-kernel, linux-riscv

From: Maxim Kiselev <bigunclemax@gmail.com>

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

Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
---
 arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
index 922e8e0e2c09..90c79041cfba 100644
--- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
+++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
@@ -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";
-- 
2.39.2


_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 12:29 ` [PATCH v4 2/3] dt-bindings: " Maksim Kiselev
@ 2023-06-10 15:06   ` Conor Dooley
  2023-06-10 15:48     ` Maxim Kiselev
  0 siblings, 1 reply; 10+ messages in thread
From: Conor Dooley @ 2023-06-10 15:06 UTC (permalink / raw)
  To: Maksim Kiselev
  Cc: linux-iio, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Greg Kroah-Hartman,
	Andy Shevchenko, Cosmin Tanislav, Ulf Hansson, Arnd Bergmann,
	Hugo Villeneuve, William Breathitt Gray, ChiYuan Huang,
	Ramona Bolboaca, Ibrahim Tilki, Caleb Connolly, ChiaEn Wu,
	Haibo Chen, Leonard Göhrs, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv


[-- Attachment #1.1: Type: text/plain, Size: 3117 bytes --]

Hey,

On Sat, Jun 10, 2023 at 03:29:08PM +0300, Maksim Kiselev wrote:
> From: Maxim Kiselev <bigunclemax@gmail.com>
> 
> 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.
> 
> Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
> ---
>  .../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
> 
> diff --git a/Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml b/Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
> new file mode 100644
> index 000000000000..2b59844b7c07
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/adc/allwinner,sun20i-d1-gpadc.yaml
> @@ -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 <bigunclemax@gmail.com>
> +
> +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-15])$":
> +    $ref: adc.yaml
> +    type: object
> +    description:
> +      Represents the internal channels of the ADC.
> +
> +    properties:
> +      reg:
> +        items:
> +          minimum: 0
> +          maximum: 15
> +
> +    required:
> +      - reg
> +
> +    additionalProperties: false
> +
> +required:
> +  - "#io-channel-cells"
> +  - clocks
> +  - compatible
> +  - interrupts
> +  - reg
> +  - resets
> +
> +unevaluatedProperties: false

How come this one changed to unevaluatedProperties: false?
Wasn't it for the ADC that we previously discussed whether
additionalProperties: false was correct or not?

Cheers,
Conor.

> +
> +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>;
> +        };
> +    };
> +...
> -- 
> 2.39.2
> 

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 161 bytes --]

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 15:06   ` Conor Dooley
@ 2023-06-10 15:48     ` Maxim Kiselev
  2023-06-10 15:53       ` Conor Dooley
  0 siblings, 1 reply; 10+ messages in thread
From: Maxim Kiselev @ 2023-06-10 15:48 UTC (permalink / raw)
  To: Conor Dooley
  Cc: linux-iio, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Greg Kroah-Hartman,
	Andy Shevchenko, Cosmin Tanislav, Ulf Hansson, Arnd Bergmann,
	Hugo Villeneuve, William Breathitt Gray, ChiYuan Huang,
	Ramona Bolboaca, Ibrahim Tilki, Caleb Connolly, ChiaEn Wu,
	Haibo Chen, Leonard Göhrs, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv

Hey,

сб, 10 июн. 2023 г. в 18:06, Conor Dooley <conor@kernel.org>:

...

> >+
> >+    required:
> >+      - reg
> >+
> >+    additionalProperties: false
> >+
> >+required:
> >+  - "#io-channel-cells"
> >+  - clocks
> >+  - compatible
> >+  - interrupts
> >+  - reg
> >+  - resets
> >+
> >+unevaluatedProperties: false
>
> How come this one changed to unevaluatedProperties: false?
> Wasn't it for the ADC that we previously discussed whether
> additionalProperties: false was correct or not?

Hmm, I changed it to `unevaluatedProperties: false` as you suggested
in this message
https://lore.kernel.org/lkml/20230604-afternoon-frighten-42222010557b@spud/

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 15:48     ` Maxim Kiselev
@ 2023-06-10 15:53       ` Conor Dooley
  2023-06-10 16:15         ` Maxim Kiselev
  0 siblings, 1 reply; 10+ messages in thread
From: Conor Dooley @ 2023-06-10 15:53 UTC (permalink / raw)
  To: Maxim Kiselev
  Cc: linux-iio, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Greg Kroah-Hartman,
	Andy Shevchenko, Cosmin Tanislav, Ulf Hansson, Arnd Bergmann,
	Hugo Villeneuve, William Breathitt Gray, ChiYuan Huang,
	Ramona Bolboaca, Ibrahim Tilki, Caleb Connolly, ChiaEn Wu,
	Haibo Chen, Leonard Göhrs, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv


[-- Attachment #1.1: Type: text/plain, Size: 914 bytes --]

On Sat, Jun 10, 2023 at 06:48:08PM +0300, Maxim Kiselev wrote:
> Hey,
> 
> сб, 10 июн. 2023 г. в 18:06, Conor Dooley <conor@kernel.org>:
> 
> ...
> 
> > >+
> > >+    required:
> > >+      - reg
> > >+
> > >+    additionalProperties: false

[1]

> > >+
> > >+required:
> > >+  - "#io-channel-cells"
> > >+  - clocks
> > >+  - compatible
> > >+  - interrupts
> > >+  - reg
> > >+  - resets
> > >+
> > >+unevaluatedProperties: false
> >
> > How come this one changed to unevaluatedProperties: false?
> > Wasn't it for the ADC that we previously discussed whether
> > additionalProperties: false was correct or not?
> 
> Hmm, I changed it to `unevaluatedProperties: false` as you suggested
> in this message
> https://lore.kernel.org/lkml/20230604-afternoon-frighten-42222010557b@spud/

That was about the adc child nodes [1], not at the top level, no?

Cheers,
Conor.


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

[-- Attachment #2: Type: text/plain, Size: 161 bytes --]

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 2/3] dt-bindings: iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 15:53       ` Conor Dooley
@ 2023-06-10 16:15         ` Maxim Kiselev
  0 siblings, 0 replies; 10+ messages in thread
From: Maxim Kiselev @ 2023-06-10 16:15 UTC (permalink / raw)
  To: Conor Dooley
  Cc: linux-iio, Jonathan Cameron, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Greg Kroah-Hartman,
	Andy Shevchenko, Cosmin Tanislav, Ulf Hansson, Arnd Bergmann,
	Hugo Villeneuve, William Breathitt Gray, ChiYuan Huang,
	Ramona Bolboaca, Ibrahim Tilki, Caleb Connolly, ChiaEn Wu,
	Haibo Chen, Leonard Göhrs, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv

сб, 10 июн. 2023 г. в 18:53, Conor Dooley <conor@kernel.org>:
>
> On Sat, Jun 10, 2023 at 06:48:08PM +0300, Maxim Kiselev wrote:
> > Hey,
> >
> > сб, 10 июн. 2023 г. в 18:06, Conor Dooley <conor@kernel.org>:
> >
> > ...
> >
> > > >+
> > > >+    required:
> > > >+      - reg
> > > >+
> > > >+    additionalProperties: false
>
> [1]
>
> > > >+
> > > >+required:
> > > >+  - "#io-channel-cells"
> > > >+  - clocks
> > > >+  - compatible
> > > >+  - interrupts
> > > >+  - reg
> > > >+  - resets
> > > >+
> > > >+unevaluatedProperties: false
> > >
> > > How come this one changed to unevaluatedProperties: false?
> > > Wasn't it for the ADC that we previously discussed whether
> > > additionalProperties: false was correct or not?
> >
> > Hmm, I changed it to `unevaluatedProperties: false` as you suggested
> > in this message
> > https://lore.kernel.org/lkml/20230604-afternoon-frighten-42222010557b@spud/
>
> That was about the adc child nodes [1], not at the top level, no?

Indeed, I confused it, sorry.

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 12:29 ` [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC Maksim Kiselev
@ 2023-06-10 18:12   ` Jonathan Cameron
  2023-06-10 19:06     ` Jernej Škrabec
  0 siblings, 1 reply; 10+ messages in thread
From: Jonathan Cameron @ 2023-06-10 18:12 UTC (permalink / raw)
  To: Maksim Kiselev
  Cc: linux-iio, Andy Shevchenko, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Jernej Skrabec,
	Samuel Holland, Paul Walmsley, Palmer Dabbelt, Albert Ou,
	Philipp Zabel, Cristian Ciocaltea, Andy Shevchenko,
	Cosmin Tanislav, Ramona Bolboaca, William Breathitt Gray,
	ChiYuan Huang, Ibrahim Tilki, ChiaEn Wu, Arnd Bergmann,
	Leonard Göhrs, Hugo Villeneuve, Caleb Connolly, devicetree,
	linux-arm-kernel, linux-sunxi, linux-kernel, linux-riscv

On Sat, 10 Jun 2023 15:29:07 +0300
Maksim Kiselev <bigunclemax@gmail.com> wrote:

> From: Maxim Kiselev <bigunclemax@gmail.com>
> 
> 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
> 
> Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

Looks good to me. Just the issue Connor pointed out in the DT binding to resolve.
Note that this will be cutting it fine for this cycle, but 'might'
make it in if the stars align.  If not it will need to wait for next cycle.

Jonathan

_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC
  2023-06-10 18:12   ` Jonathan Cameron
@ 2023-06-10 19:06     ` Jernej Škrabec
  0 siblings, 0 replies; 10+ messages in thread
From: Jernej Škrabec @ 2023-06-10 19:06 UTC (permalink / raw)
  To: Maksim Kiselev, Jonathan Cameron
  Cc: linux-iio, Andy Shevchenko, Lars-Peter Clausen, Rob Herring,
	Krzysztof Kozlowski, Conor Dooley, Chen-Yu Tsai, Samuel Holland,
	Paul Walmsley, Palmer Dabbelt, Albert Ou, Philipp Zabel,
	Cristian Ciocaltea, Andy Shevchenko, Cosmin Tanislav,
	Ramona Bolboaca, William Breathitt Gray, ChiYuan Huang,
	Ibrahim Tilki, ChiaEn Wu, Arnd Bergmann, Leonard Göhrs,
	Hugo Villeneuve, Caleb Connolly, devicetree, linux-arm-kernel,
	linux-sunxi, linux-kernel, linux-riscv

Dne sobota, 10. junij 2023 ob 20:12:04 CEST je Jonathan Cameron napisal(a):
> On Sat, 10 Jun 2023 15:29:07 +0300
> Maksim Kiselev <bigunclemax@gmail.com> wrote:
> 
> > From: Maxim Kiselev <bigunclemax@gmail.com>
> > 
> > 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
> > 
> > Signed-off-by: Maxim Kiselev <bigunclemax@gmail.com>
> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> 
> Looks good to me. Just the issue Connor pointed out in the DT binding to resolve.
> Note that this will be cutting it fine for this cycle, but 'might'
> make it in if the stars align.  If not it will need to wait for next cycle.

Cutoff for sunxi DT changes is at -rc6, so I would say at least that part will
land in 6.6 for sure.

Best regards,
Jernej




_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2023-06-10 19:06 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-10 12:29 [PATCH v4 0/3] Add support for Allwinner GPADC on D1/T113s/R329/T507 SoCs Maksim Kiselev
2023-06-10 12:29 ` [PATCH v4 1/3] iio: adc: Add Allwinner D1/T113s/R329/T507 SoCs GPADC Maksim Kiselev
2023-06-10 18:12   ` Jonathan Cameron
2023-06-10 19:06     ` Jernej Škrabec
2023-06-10 12:29 ` [PATCH v4 2/3] dt-bindings: " Maksim Kiselev
2023-06-10 15:06   ` Conor Dooley
2023-06-10 15:48     ` Maxim Kiselev
2023-06-10 15:53       ` Conor Dooley
2023-06-10 16:15         ` Maxim Kiselev
2023-06-10 12:29 ` [PATCH v4 3/3] riscv: dts: allwinner: d1: Add GPADC node Maksim Kiselev

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).