| Message ID | 20220629184343.3438856-6-mail@conchuod.ie (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Canaan devicetree fixes | expand |
On Wed, Jun 29, 2022 at 07:43:34PM +0100, Conor Dooley wrote: > From: Conor Dooley <conor.dooley@microchip.com> > > The Canaan k210 apparently has a Sysnopsys Designware AXI DMA > controller, but according to the documentation & devicetree it has 6 > interrupts rather than the standard one. Support the 6 interrupt > configuration by unconditionally extending the binding to a maximum of > 8 per-channel interrupts thereby matching the number of possible > channels. > > Link: https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_standalone_programming_guide_20190311144158_en.pdf #Page 51 > Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > --- > Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml > index 4324a94b26b2..e33ef22aec9c 100644 > --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml > +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml > @@ -34,7 +34,9 @@ properties: > - const: axidma_apb_regs > > interrupts: > - maxItems: 1 > + description: per channel interrupts Description is inaccurate. It's either combined or per-channel IRQs. Other than that: Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Sergey > + minItems: 1 > + maxItems: 8 > > clocks: > items: > -- > 2.36.1 >
On 30/06/2022 22:55, Serge Semin wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > On Wed, Jun 29, 2022 at 07:43:34PM +0100, Conor Dooley wrote: >> From: Conor Dooley <conor.dooley@microchip.com> >> >> The Canaan k210 apparently has a Sysnopsys Designware AXI DMA >> controller, but according to the documentation & devicetree it has 6 >> interrupts rather than the standard one. Support the 6 interrupt >> configuration by unconditionally extending the binding to a maximum of >> 8 per-channel interrupts thereby matching the number of possible >> channels. >> >> Link: https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_standalone_programming_guide_20190311144158_en.pdf #Page 51 >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> >> --- >> Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml >> index 4324a94b26b2..e33ef22aec9c 100644 >> --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml >> +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml >> @@ -34,7 +34,9 @@ properties: >> - const: axidma_apb_regs >> >> interrupts: > >> - maxItems: 1 >> + description: per channel interrupts > > Description is inaccurate. It's either combined or per-channel IRQs. I will change it to: interrupts: description: | If the IP-core synthesis parameter DMAX_INTR_IO_TYPE is set to 1, this will be per-channel interrupts. Otherwise, this is a single combined IRQ for all channels. minItems: 1 maxItems: 8 How's that sound? > > Other than that: > Reviewed-by: Serge Semin <fancer.lancer@gmail.com> > > -Sergey > >> + minItems: 1 >> + maxItems: 8 >> >> clocks: >> items: >> -- >> 2.36.1 >>
On Thu, Jun 30, 2022 at 11:12:53PM +0000, Conor.Dooley@microchip.com wrote: > On 30/06/2022 22:55, Serge Semin wrote: > > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > > > On Wed, Jun 29, 2022 at 07:43:34PM +0100, Conor Dooley wrote: > >> From: Conor Dooley <conor.dooley@microchip.com> > >> > >> The Canaan k210 apparently has a Sysnopsys Designware AXI DMA > >> controller, but according to the documentation & devicetree it has 6 > >> interrupts rather than the standard one. Support the 6 interrupt > >> configuration by unconditionally extending the binding to a maximum of > >> 8 per-channel interrupts thereby matching the number of possible > >> channels. > >> > >> Link: https://canaan-creative.com/wp-content/uploads/2020/03/kendryte_standalone_programming_guide_20190311144158_en.pdf #Page 51 > >> Signed-off-by: Conor Dooley <conor.dooley@microchip.com> > >> --- > >> Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 4 +++- > >> 1 file changed, 3 insertions(+), 1 deletion(-) > >> > >> diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml > >> index 4324a94b26b2..e33ef22aec9c 100644 > >> --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml > >> +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml > >> @@ -34,7 +34,9 @@ properties: > >> - const: axidma_apb_regs > >> > >> interrupts: > > > >> - maxItems: 1 > >> + description: per channel interrupts > > > > Description is inaccurate. It's either combined or per-channel IRQs. > > I will change it to: > interrupts: > description: | Don't need '|'. > If the IP-core synthesis parameter DMAX_INTR_IO_TYPE is set to 1, this > will be per-channel interrupts. Otherwise, this is a single combined IRQ > for all channels. > minItems: 1 > maxItems: 8 > > How's that sound? With that, Reviewed-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml index 4324a94b26b2..e33ef22aec9c 100644 --- a/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml +++ b/Documentation/devicetree/bindings/dma/snps,dw-axi-dmac.yaml @@ -34,7 +34,9 @@ properties: - const: axidma_apb_regs interrupts: - maxItems: 1 + description: per channel interrupts + minItems: 1 + maxItems: 8 clocks: items: