Add dmaengine driver for X1830.

Add dmaengine driver for X1830.

[周琰杰 (Zhou Yanjie)]

1.Modify the documentation description to make it more relevant.
2.Add the dmaengine bindings for the X1830 SoC from Ingenic.
3.Add support for probing the dma-jz4780 driver on the
  X1830 SoC from Ingenic.
Notice:
The X1830's dma controller is very similar to the X1000, the
difference is that the X1830 has 32 dma channels and the
X1000 has only 8.

[PATCH 0/2] Add dmaengine driver for X1830.

[周琰杰 (Zhou Yanjie)]

1.Modify the documentation description to make it more relevant.
2.Add the dmaengine bindings for the X1830 SoC from Ingenic.
3.Add support for probing the dma-jz4780 driver on the
  X1830 SoC from Ingenic.
Notice:
The X1830's dma controller is very similar to the X1000, the
difference is that the X1830 has 32 dma channels and the
X1000 has only 8.

周琰杰 (Zhou Yanjie) (2):
  dt-bindings: dmaengine: Add X1830 bindings.
  dmaengine: JZ4780: Add support for the X1830.

 .../devicetree/bindings/dma/jz4780-dma.txt         |  6 ++--
 drivers/dma/dma-jz4780.c                           |  7 ++++
 include/dt-bindings/dma/x1830-dma.h                | 39 ++++++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/dma/x1830-dma.h

-- 
2.7.4

[PATCH 1/2] dt-bindings: dmaengine: Add X1830 bindings.

[周琰杰 (Zhou Yanjie)]

Add the dmaengine bindings for the X1830 Soc from Ingenic.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
 .../devicetree/bindings/dma/jz4780-dma.txt         |  6 ++--
 include/dt-bindings/dma/x1830-dma.h                | 39 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 include/dt-bindings/dma/x1830-dma.h

diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
index ec89782..3459e77 100644
--- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt
+++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
@@ -1,4 +1,4 @@
-* Ingenic JZ4780 DMA Controller
+* Ingenic XBurst DMA Controller
 
 Required properties:
 
@@ -8,10 +8,12 @@ Required properties:
   * ingenic,jz4770-dma
   * ingenic,jz4780-dma
   * ingenic,x1000-dma
+  * ingenic,x1830-dma
 - reg: Should contain the DMA channel registers location and length, followed
   by the DMA controller registers location and length.
 - interrupts: Should contain the interrupt specifier of the DMA controller.
-- clocks: Should contain a clock specifier for the JZ4780/X1000 PDMA clock.
+- clocks: Should contain a clock specifier for the JZ4780/X1000/X1830 PDMA
+  clock.
 - #dma-cells: Must be <2>. Number of integer cells in the dmas property of
   DMA clients (see below).
 
diff --git a/include/dt-bindings/dma/x1830-dma.h b/include/dt-bindings/dma/x1830-dma.h
new file mode 100644
index 00000000..35bcb89
--- /dev/null
+++ b/include/dt-bindings/dma/x1830-dma.h
@@ -0,0 +1,39 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * This header provides macros for X1830 DMA bindings.
+ *
+ * Copyright (c) 2019 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
+ */
+
+#ifndef __DT_BINDINGS_DMA_X1830_DMA_H__
+#define __DT_BINDINGS_DMA_X1830_DMA_H__
+
+/*
+ * Request type numbers for the X1830 DMA controller (written to the DRTn
+ * register for the channel).
+ */
+#define X1830_DMA_I2S0_TX	0x6
+#define X1830_DMA_I2S0_RX	0x7
+#define X1830_DMA_AUTO		0x8
+#define X1830_DMA_SADC_RX	0x9
+#define X1830_DMA_UART1_TX	0x12
+#define X1830_DMA_UART1_RX	0x13
+#define X1830_DMA_UART0_TX	0x14
+#define X1830_DMA_UART0_RX	0x15
+#define X1830_DMA_SSI0_TX	0x16
+#define X1830_DMA_SSI0_RX	0x17
+#define X1830_DMA_SSI1_TX	0x18
+#define X1830_DMA_SSI1_RX	0x19
+#define X1830_DMA_MSC0_TX	0x1a
+#define X1830_DMA_MSC0_RX	0x1b
+#define X1830_DMA_MSC1_TX	0x1c
+#define X1830_DMA_MSC1_RX	0x1d
+#define X1830_DMA_DMIC_RX	0x21
+#define X1830_DMA_SMB0_TX	0x24
+#define X1830_DMA_SMB0_RX	0x25
+#define X1830_DMA_SMB1_TX	0x26
+#define X1830_DMA_SMB1_RX	0x27
+#define X1830_DMA_DES_TX	0x2e
+#define X1830_DMA_DES_RX	0x2f
+
+#endif /* __DT_BINDINGS_DMA_X1830_DMA_H__ */
-- 
2.7.4

[PATCH 2/2] dmaengine: JZ4780: Add support for the X1830.

[周琰杰 (Zhou Yanjie)]

Add support for probing the dma-jz4780 driver on the X1830 Soc.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
 drivers/dma/dma-jz4780.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c
index fa626ac..f8ee4b7 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -1020,12 +1020,19 @@ static const struct jz4780_dma_soc_data x1000_dma_soc_data = {
 	.flags = JZ_SOC_DATA_PROGRAMMABLE_DMA,
 };
 
+static const struct jz4780_dma_soc_data x1830_dma_soc_data = {
+	.nb_channels = 32,
+	.transfer_ord_max = 7,
+	.flags = JZ_SOC_DATA_PROGRAMMABLE_DMA,
+};
+
 static const struct of_device_id jz4780_dma_dt_match[] = {
 	{ .compatible = "ingenic,jz4740-dma", .data = &jz4740_dma_soc_data },
 	{ .compatible = "ingenic,jz4725b-dma", .data = &jz4725b_dma_soc_data },
 	{ .compatible = "ingenic,jz4770-dma", .data = &jz4770_dma_soc_data },
 	{ .compatible = "ingenic,jz4780-dma", .data = &jz4780_dma_soc_data },
 	{ .compatible = "ingenic,x1000-dma", .data = &x1000_dma_soc_data },
+	{ .compatible = "ingenic,x1830-dma", .data = &x1830_dma_soc_data },
 	{},
 };
 MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);
-- 
2.7.4

Re: Add dmaengine driver for X1830.

[Vinod Koul]

On 17-12-19, 21:58, 周琰杰 (Zhou Yanjie) wrote:
> 1.Modify the documentation description to make it more relevant.
> 2.Add the dmaengine bindings for the X1830 SoC from Ingenic.
> 3.Add support for probing the dma-jz4780 driver on the
>   X1830 SoC from Ingenic.
> Notice:
> The X1830's dma controller is very similar to the X1000, the
> difference is that the X1830 has 32 dma channels and the
> X1000 has only 8.

Applied, thanks

-- 
~Vinod

Re: [PATCH 1/2] dt-bindings: dmaengine: Add X1830 bindings.

[Rob Herring]

On Tue, 17 Dec 2019 21:58:59 +0800, =?UTF-8?q?=E5=91=A8=E7=90=B0=E6=9D=B0=20=28Zhou=20Yanjie=29?=          wrote:
> Add the dmaengine bindings for the X1830 Soc from Ingenic.
> 
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
>  .../devicetree/bindings/dma/jz4780-dma.txt         |  6 ++--
>  include/dt-bindings/dma/x1830-dma.h                | 39 ++++++++++++++++++++++
>  2 files changed, 43 insertions(+), 2 deletions(-)
>  create mode 100644 include/dt-bindings/dma/x1830-dma.h
> 

Reviewed-by: Rob Herring <robh@kernel.org>