* [PATCH 1/2] dt-bindings: DMA: Add X1000 bindings.
2019-10-23 3:05 DMA: JZ4780: Add DMA driver for X1000 Zhou Yanjie
@ 2019-10-23 3:05 ` Zhou Yanjie
2019-10-23 3:05 ` [PATCH 2/2] DMA: JZ4780: Add support for the X1000 Zhou Yanjie
` (3 subsequent siblings)
4 siblings, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-23 3:05 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Add the DMA bindings for the X1000 Soc from Ingenic.
Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
---
.../devicetree/bindings/dma/jz4780-dma.txt | 3 +-
include/dt-bindings/dma/x1000-dma.h | 40 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 include/dt-bindings/dma/x1000-dma.h
diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
index 636fcb2..ec89782 100644
--- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt
+++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
@@ -7,10 +7,11 @@ Required properties:
* ingenic,jz4725b-dma
* ingenic,jz4770-dma
* ingenic,jz4780-dma
+ * ingenic,x1000-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 PDMA clock.
+- clocks: Should contain a clock specifier for the JZ4780/X1000 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/x1000-dma.h b/include/dt-bindings/dma/x1000-dma.h
new file mode 100644
index 00000000..401e165
--- /dev/null
+++ b/include/dt-bindings/dma/x1000-dma.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * This header provides macros for X1000 DMA bindings.
+ *
+ * Copyright (c) 2019 Zhou Yanjie <zhouyanjie@zoho.com>
+ */
+
+#ifndef __DT_BINDINGS_DMA_X1000_DMA_H__
+#define __DT_BINDINGS_DMA_X1000_DMA_H__
+
+/*
+ * Request type numbers for the X1000 DMA controller (written to the DRTn
+ * register for the channel).
+ */
+#define X1000_DMA_DMIC_RX 0x5
+#define X1000_DMA_I2S0_TX 0x6
+#define X1000_DMA_I2S0_RX 0x7
+#define X1000_DMA_AUTO 0x8
+#define X1000_DMA_UART2_TX 0x10
+#define X1000_DMA_UART2_RX 0x11
+#define X1000_DMA_UART1_TX 0x12
+#define X1000_DMA_UART1_RX 0x13
+#define X1000_DMA_UART0_TX 0x14
+#define X1000_DMA_UART0_RX 0x15
+#define X1000_DMA_SSI0_TX 0x16
+#define X1000_DMA_SSI0_RX 0x17
+#define X1000_DMA_MSC0_TX 0x1a
+#define X1000_DMA_MSC0_RX 0x1b
+#define X1000_DMA_MSC1_TX 0x1c
+#define X1000_DMA_MSC1_RX 0x1d
+#define X1000_DMA_PCM0_TX 0x20
+#define X1000_DMA_PCM0_RX 0x21
+#define X1000_DMA_SMB0_TX 0x24
+#define X1000_DMA_SMB0_RX 0x25
+#define X1000_DMA_SMB1_TX 0x26
+#define X1000_DMA_SMB1_RX 0x27
+#define X1000_DMA_SMB2_TX 0x28
+#define X1000_DMA_SMB2_RX 0x29
+
+#endif /* __DT_BINDINGS_DMA_X1000_DMA_H__ */
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH 2/2] DMA: JZ4780: Add support for the X1000.
2019-10-23 3:05 DMA: JZ4780: Add DMA driver for X1000 Zhou Yanjie
2019-10-23 3:05 ` [PATCH 1/2] dt-bindings: DMA: Add X1000 bindings Zhou Yanjie
@ 2019-10-23 3:05 ` Zhou Yanjie
2019-10-23 5:15 ` DMA: JZ4780: Add DMA driver for X1000 Vinod Koul
` (2 subsequent siblings)
4 siblings, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-23 3:05 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Add support for probing the dma-jz4780 driver on the X1000 Soc.
Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.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 7fe9309..c7f1199 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -1012,11 +1012,18 @@ static const struct jz4780_dma_soc_data jz4780_dma_soc_data = {
.flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA,
};
+static const struct jz4780_dma_soc_data x1000_dma_soc_data = {
+ .nb_channels = 8,
+ .transfer_ord_max = 7,
+ .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | 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 },
{},
};
MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: DMA: JZ4780: Add DMA driver for X1000.
2019-10-23 3:05 DMA: JZ4780: Add DMA driver for X1000 Zhou Yanjie
2019-10-23 3:05 ` [PATCH 1/2] dt-bindings: DMA: Add X1000 bindings Zhou Yanjie
2019-10-23 3:05 ` [PATCH 2/2] DMA: JZ4780: Add support for the X1000 Zhou Yanjie
@ 2019-10-23 5:15 ` Vinod Koul
2019-10-23 7:05 ` Zhou Yanjie
2019-10-23 7:02 ` dmaengine: JZ4780: Add dmaengine " Zhou Yanjie
2019-10-24 17:21 ` dmaengine: JZ4780: Add support for the X1000 v2 Zhou Yanjie
4 siblings, 1 reply; 16+ messages in thread
From: Vinod Koul @ 2019-10-23 5:15 UTC (permalink / raw)
To: Zhou Yanjie
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
On 23-10-19, 11:05, Zhou Yanjie wrote:
> 1.Add the DMA bindings for the X1000 SoC from Ingenic.
> 2.Add support for probing the dma-jz4780 driver on the
> X1000 SoC from Ingenic.
The subsystem in dmaengine and not dma
Please resend with correct tags!
Thanks
--
~Vinod
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: DMA: JZ4780: Add DMA driver for X1000.
2019-10-23 5:15 ` DMA: JZ4780: Add DMA driver for X1000 Vinod Koul
@ 2019-10-23 7:05 ` Zhou Yanjie
0 siblings, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-23 7:05 UTC (permalink / raw)
To: Vinod Koul
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Hi Vinod,
On 2019年10月23日 13:15, Vinod Koul wrote:
> On 23-10-19, 11:05, Zhou Yanjie wrote:
>> 1.Add the DMA bindings for the X1000 SoC from Ingenic.
>> 2.Add support for probing the dma-jz4780 driver on the
>> X1000 SoC from Ingenic.
> The subsystem in dmaengine and not dma
>
> Please resend with correct tags!
>
> Thanks
I already resend this patches.
Best regards!
^ permalink raw reply [flat|nested] 16+ messages in thread
* dmaengine: JZ4780: Add dmaengine driver for X1000.
2019-10-23 3:05 DMA: JZ4780: Add DMA driver for X1000 Zhou Yanjie
` (2 preceding siblings ...)
2019-10-23 5:15 ` DMA: JZ4780: Add DMA driver for X1000 Vinod Koul
@ 2019-10-23 7:02 ` Zhou Yanjie
2019-10-23 7:02 ` [PATCH RESEND 1/2] dt-bindings: dmaengine: Add X1000 bindings Zhou Yanjie
2019-10-23 7:02 ` [PATCH RESEND 2/2] dmaengine: JZ4780: Add support for the X1000 Zhou Yanjie
2019-10-24 17:21 ` dmaengine: JZ4780: Add support for the X1000 v2 Zhou Yanjie
4 siblings, 2 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-23 7:02 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
1.Add the dmaengine bindings for the X1000 SoC from Ingenic.
2.Add support for probing the dma-jz4780 driver on the
X1000 SoC from Ingenic.
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH RESEND 1/2] dt-bindings: dmaengine: Add X1000 bindings.
2019-10-23 7:02 ` dmaengine: JZ4780: Add dmaengine " Zhou Yanjie
@ 2019-10-23 7:02 ` Zhou Yanjie
2019-10-23 7:02 ` [PATCH RESEND 2/2] dmaengine: JZ4780: Add support for the X1000 Zhou Yanjie
1 sibling, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-23 7:02 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Add the dmaengine bindings for the X1000 Soc from Ingenic.
Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
---
.../devicetree/bindings/dma/jz4780-dma.txt | 3 +-
include/dt-bindings/dma/x1000-dma.h | 40 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 include/dt-bindings/dma/x1000-dma.h
diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
index 636fcb2..ec89782 100644
--- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt
+++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
@@ -7,10 +7,11 @@ Required properties:
* ingenic,jz4725b-dma
* ingenic,jz4770-dma
* ingenic,jz4780-dma
+ * ingenic,x1000-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 PDMA clock.
+- clocks: Should contain a clock specifier for the JZ4780/X1000 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/x1000-dma.h b/include/dt-bindings/dma/x1000-dma.h
new file mode 100644
index 00000000..401e165
--- /dev/null
+++ b/include/dt-bindings/dma/x1000-dma.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * This header provides macros for X1000 DMA bindings.
+ *
+ * Copyright (c) 2019 Zhou Yanjie <zhouyanjie@zoho.com>
+ */
+
+#ifndef __DT_BINDINGS_DMA_X1000_DMA_H__
+#define __DT_BINDINGS_DMA_X1000_DMA_H__
+
+/*
+ * Request type numbers for the X1000 DMA controller (written to the DRTn
+ * register for the channel).
+ */
+#define X1000_DMA_DMIC_RX 0x5
+#define X1000_DMA_I2S0_TX 0x6
+#define X1000_DMA_I2S0_RX 0x7
+#define X1000_DMA_AUTO 0x8
+#define X1000_DMA_UART2_TX 0x10
+#define X1000_DMA_UART2_RX 0x11
+#define X1000_DMA_UART1_TX 0x12
+#define X1000_DMA_UART1_RX 0x13
+#define X1000_DMA_UART0_TX 0x14
+#define X1000_DMA_UART0_RX 0x15
+#define X1000_DMA_SSI0_TX 0x16
+#define X1000_DMA_SSI0_RX 0x17
+#define X1000_DMA_MSC0_TX 0x1a
+#define X1000_DMA_MSC0_RX 0x1b
+#define X1000_DMA_MSC1_TX 0x1c
+#define X1000_DMA_MSC1_RX 0x1d
+#define X1000_DMA_PCM0_TX 0x20
+#define X1000_DMA_PCM0_RX 0x21
+#define X1000_DMA_SMB0_TX 0x24
+#define X1000_DMA_SMB0_RX 0x25
+#define X1000_DMA_SMB1_TX 0x26
+#define X1000_DMA_SMB1_RX 0x27
+#define X1000_DMA_SMB2_TX 0x28
+#define X1000_DMA_SMB2_RX 0x29
+
+#endif /* __DT_BINDINGS_DMA_X1000_DMA_H__ */
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH RESEND 2/2] dmaengine: JZ4780: Add support for the X1000.
2019-10-23 7:02 ` dmaengine: JZ4780: Add dmaengine " Zhou Yanjie
2019-10-23 7:02 ` [PATCH RESEND 1/2] dt-bindings: dmaengine: Add X1000 bindings Zhou Yanjie
@ 2019-10-23 7:02 ` Zhou Yanjie
2019-10-23 16:08 ` Paul Cercueil
1 sibling, 1 reply; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-23 7:02 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Add support for probing the dma-jz4780 driver on the X1000 Soc.
Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.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 cafb1cc0..f809a6e 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -1019,11 +1019,18 @@ static const struct jz4780_dma_soc_data jz4780_dma_soc_data = {
.flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA,
};
+static const struct jz4780_dma_soc_data x1000_dma_soc_data = {
+ .nb_channels = 8,
+ .transfer_ord_max = 7,
+ .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | 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 },
{},
};
MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH RESEND 2/2] dmaengine: JZ4780: Add support for the X1000.
2019-10-23 7:02 ` [PATCH RESEND 2/2] dmaengine: JZ4780: Add support for the X1000 Zhou Yanjie
@ 2019-10-23 16:08 ` Paul Cercueil
2019-10-24 8:32 ` Zhou Yanjie
0 siblings, 1 reply; 16+ messages in thread
From: Paul Cercueil @ 2019-10-23 16:08 UTC (permalink / raw)
To: Zhou Yanjie
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, vkoul, mark.rutland, Zubair.Kakakhel,
dan.j.williams
Hi Zhou,
Le mer., oct. 23, 2019 at 15:02, Zhou Yanjie <zhouyanjie@zoho.com> a
écrit :
> Add support for probing the dma-jz4780 driver on the X1000 Soc.
>
> Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.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 cafb1cc0..f809a6e 100644
> --- a/drivers/dma/dma-jz4780.c
> +++ b/drivers/dma/dma-jz4780.c
> @@ -1019,11 +1019,18 @@ static const struct jz4780_dma_soc_data
> jz4780_dma_soc_data = {
> .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA,
> };
>
> +static const struct jz4780_dma_soc_data x1000_dma_soc_data = {
> + .nb_channels = 8,
> + .transfer_ord_max = 7,
> + .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA,
Please don't use JZ_SOC_DATA_ALLOW_LEGACY_DT for new bindings.
With that flag removed:
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
> +};
> +
> 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 },
> {},
> };
> MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH RESEND 2/2] dmaengine: JZ4780: Add support for the X1000.
2019-10-23 16:08 ` Paul Cercueil
@ 2019-10-24 8:32 ` Zhou Yanjie
0 siblings, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-24 8:32 UTC (permalink / raw)
To: Paul Cercueil
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, vkoul, mark.rutland, Zubair.Kakakhel,
dan.j.williams
Hi Paul,
On 2019年10月24日 00:08, Paul Cercueil wrote:
> Hi Zhou,
>
>
> Le mer., oct. 23, 2019 at 15:02, Zhou Yanjie <zhouyanjie@zoho.com> a
> écrit :
>> Add support for probing the dma-jz4780 driver on the X1000 Soc.
>>
>> Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.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 cafb1cc0..f809a6e 100644
>> --- a/drivers/dma/dma-jz4780.c
>> +++ b/drivers/dma/dma-jz4780.c
>> @@ -1019,11 +1019,18 @@ static const struct jz4780_dma_soc_data
>> jz4780_dma_soc_data = {
>> .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT |
>> JZ_SOC_DATA_PROGRAMMABLE_DMA,
>> };
>>
>> +static const struct jz4780_dma_soc_data x1000_dma_soc_data = {
>> + .nb_channels = 8,
>> + .transfer_ord_max = 7,
>> + .flags = JZ_SOC_DATA_ALLOW_LEGACY_DT |
>> JZ_SOC_DATA_PROGRAMMABLE_DMA,
>
> Please don't use JZ_SOC_DATA_ALLOW_LEGACY_DT for new bindings.
>
> With that flag removed:
> Reviewed-by: Paul Cercueil <paul@crapouillou.net>
>
I'll remove it in v2.
Best regards!
>
>> +};
>> +
>> 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 },
>> {},
>> };
>> MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);
>> --
>> 2.7.4
>>
>>
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* dmaengine: JZ4780: Add support for the X1000 v2
2019-10-23 3:05 DMA: JZ4780: Add DMA driver for X1000 Zhou Yanjie
` (3 preceding siblings ...)
2019-10-23 7:02 ` dmaengine: JZ4780: Add dmaengine " Zhou Yanjie
@ 2019-10-24 17:21 ` Zhou Yanjie
2019-10-24 17:21 ` [PATCH 1/2 v2] dt-bindings: dmaengine: Add X1000 bindings Zhou Yanjie
` (2 more replies)
4 siblings, 3 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-24 17:21 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
v1->v2:remove flag JZ_SOC_DATA_ALLOW_LEGACY_DT.
^ permalink raw reply [flat|nested] 16+ messages in thread* [PATCH 1/2 v2] dt-bindings: dmaengine: Add X1000 bindings.
2019-10-24 17:21 ` dmaengine: JZ4780: Add support for the X1000 v2 Zhou Yanjie
@ 2019-10-24 17:21 ` Zhou Yanjie
2019-10-29 21:35 ` Rob Herring
2019-10-24 17:21 ` [PATCH 2/2 v2] dmaengine: JZ4780: Add support for the X1000 Zhou Yanjie
2019-11-06 17:11 ` dmaengine: JZ4780: Add support for the X1000 v2 Vinod Koul
2 siblings, 1 reply; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-24 17:21 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Add the dmaengine bindings for the X1000 Soc from Ingenic.
Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
---
.../devicetree/bindings/dma/jz4780-dma.txt | 3 +-
include/dt-bindings/dma/x1000-dma.h | 40 ++++++++++++++++++++++
2 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 include/dt-bindings/dma/x1000-dma.h
diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
index 636fcb2..ec89782 100644
--- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt
+++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt
@@ -7,10 +7,11 @@ Required properties:
* ingenic,jz4725b-dma
* ingenic,jz4770-dma
* ingenic,jz4780-dma
+ * ingenic,x1000-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 PDMA clock.
+- clocks: Should contain a clock specifier for the JZ4780/X1000 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/x1000-dma.h b/include/dt-bindings/dma/x1000-dma.h
new file mode 100644
index 00000000..401e165
--- /dev/null
+++ b/include/dt-bindings/dma/x1000-dma.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * This header provides macros for X1000 DMA bindings.
+ *
+ * Copyright (c) 2019 Zhou Yanjie <zhouyanjie@zoho.com>
+ */
+
+#ifndef __DT_BINDINGS_DMA_X1000_DMA_H__
+#define __DT_BINDINGS_DMA_X1000_DMA_H__
+
+/*
+ * Request type numbers for the X1000 DMA controller (written to the DRTn
+ * register for the channel).
+ */
+#define X1000_DMA_DMIC_RX 0x5
+#define X1000_DMA_I2S0_TX 0x6
+#define X1000_DMA_I2S0_RX 0x7
+#define X1000_DMA_AUTO 0x8
+#define X1000_DMA_UART2_TX 0x10
+#define X1000_DMA_UART2_RX 0x11
+#define X1000_DMA_UART1_TX 0x12
+#define X1000_DMA_UART1_RX 0x13
+#define X1000_DMA_UART0_TX 0x14
+#define X1000_DMA_UART0_RX 0x15
+#define X1000_DMA_SSI0_TX 0x16
+#define X1000_DMA_SSI0_RX 0x17
+#define X1000_DMA_MSC0_TX 0x1a
+#define X1000_DMA_MSC0_RX 0x1b
+#define X1000_DMA_MSC1_TX 0x1c
+#define X1000_DMA_MSC1_RX 0x1d
+#define X1000_DMA_PCM0_TX 0x20
+#define X1000_DMA_PCM0_RX 0x21
+#define X1000_DMA_SMB0_TX 0x24
+#define X1000_DMA_SMB0_RX 0x25
+#define X1000_DMA_SMB1_TX 0x26
+#define X1000_DMA_SMB1_RX 0x27
+#define X1000_DMA_SMB2_TX 0x28
+#define X1000_DMA_SMB2_RX 0x29
+
+#endif /* __DT_BINDINGS_DMA_X1000_DMA_H__ */
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 1/2 v2] dt-bindings: dmaengine: Add X1000 bindings.
2019-10-24 17:21 ` [PATCH 1/2 v2] dt-bindings: dmaengine: Add X1000 bindings Zhou Yanjie
@ 2019-10-29 21:35 ` Rob Herring
0 siblings, 0 replies; 16+ messages in thread
From: Rob Herring @ 2019-10-29 21:35 UTC (permalink / raw)
To: Zhou Yanjie
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, vkoul, paul, mark.rutland, Zubair.Kakakhel,
dan.j.williams
On Fri, 25 Oct 2019 01:21:09 +0800, Zhou Yanjie wrote:
> Add the dmaengine bindings for the X1000 Soc from Ingenic.
>
> Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
> ---
> .../devicetree/bindings/dma/jz4780-dma.txt | 3 +-
> include/dt-bindings/dma/x1000-dma.h | 40 ++++++++++++++++++++++
> 2 files changed, 42 insertions(+), 1 deletion(-)
> create mode 100644 include/dt-bindings/dma/x1000-dma.h
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 2/2 v2] dmaengine: JZ4780: Add support for the X1000.
2019-10-24 17:21 ` dmaengine: JZ4780: Add support for the X1000 v2 Zhou Yanjie
2019-10-24 17:21 ` [PATCH 1/2 v2] dt-bindings: dmaengine: Add X1000 bindings Zhou Yanjie
@ 2019-10-24 17:21 ` Zhou Yanjie
2019-11-06 17:11 ` dmaengine: JZ4780: Add support for the X1000 v2 Vinod Koul
2 siblings, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-10-24 17:21 UTC (permalink / raw)
To: linux-mips
Cc: linux-kernel, dmaengine, devicetree, robh+dt, paul.burton, vkoul,
paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Add support for probing the dma-jz4780 driver on the X1000 Soc.
Signed-off-by: Zhou Yanjie <zhouyanjie@zoho.com>
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
---
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 cafb1cc0..5e3af48 100644
--- a/drivers/dma/dma-jz4780.c
+++ b/drivers/dma/dma-jz4780.c
@@ -1019,11 +1019,18 @@ static const struct jz4780_dma_soc_data jz4780_dma_soc_data = {
.flags = JZ_SOC_DATA_ALLOW_LEGACY_DT | JZ_SOC_DATA_PROGRAMMABLE_DMA,
};
+static const struct jz4780_dma_soc_data x1000_dma_soc_data = {
+ .nb_channels = 8,
+ .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 },
{},
};
MODULE_DEVICE_TABLE(of, jz4780_dma_dt_match);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: dmaengine: JZ4780: Add support for the X1000 v2
2019-10-24 17:21 ` dmaengine: JZ4780: Add support for the X1000 v2 Zhou Yanjie
2019-10-24 17:21 ` [PATCH 1/2 v2] dt-bindings: dmaengine: Add X1000 bindings Zhou Yanjie
2019-10-24 17:21 ` [PATCH 2/2 v2] dmaengine: JZ4780: Add support for the X1000 Zhou Yanjie
@ 2019-11-06 17:11 ` Vinod Koul
2019-11-08 18:51 ` Zhou Yanjie
2 siblings, 1 reply; 16+ messages in thread
From: Vinod Koul @ 2019-11-06 17:11 UTC (permalink / raw)
To: Zhou Yanjie
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
On 25-10-19, 01:21, Zhou Yanjie wrote:
> v1->v2:remove flag JZ_SOC_DATA_ALLOW_LEGACY_DT.
>
Hmm this cover letter is devoid of any details for the series. One would
expect a description of the series attempting to address.
Neverthless I have applied, but in future please take care to write a
*decent* cover letter and also document changes as you done in the only
line.
Also auto generate the letter using --cover-letter option, it shows up
nice diff stat which helps while applying
Thanks
--
~Vinod
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: dmaengine: JZ4780: Add support for the X1000 v2
2019-11-06 17:11 ` dmaengine: JZ4780: Add support for the X1000 v2 Vinod Koul
@ 2019-11-08 18:51 ` Zhou Yanjie
0 siblings, 0 replies; 16+ messages in thread
From: Zhou Yanjie @ 2019-11-08 18:51 UTC (permalink / raw)
To: Vinod Koul
Cc: linux-mips, linux-kernel, dmaengine, devicetree, robh+dt,
paul.burton, paul, mark.rutland, Zubair.Kakakhel, dan.j.williams
Hi Vinod,
On 2019年11月07日 01:11, Vinod Koul wrote:
> On 25-10-19, 01:21, Zhou Yanjie wrote:
>> v1->v2:remove flag JZ_SOC_DATA_ALLOW_LEGACY_DT.
>>
> Hmm this cover letter is devoid of any details for the series. One would
> expect a description of the series attempting to address.
>
> Neverthless I have applied, but in future please take care to write a
> *decent* cover letter and also document changes as you done in the only
> line.
>
> Also auto generate the letter using --cover-letter option, it shows up
> nice diff stat which helps while applying
>
> Thanks
>
Thanks, I will pay more attention in the future.
Best regards!
^ permalink raw reply [flat|nested] 16+ messages in thread