| Message ID | 20180721110643.19624-2-paul@crapouillou.net (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
On Sat, Jul 21, 2018 at 01:06:26PM +0200, Paul Cercueil wrote: > The driver is now compatible with four SoCs: JZ4780, JZ4770, JZ4725B and > JZ4740. What the driver supports is irrelevant to the binding. > > Besides, it now expects the devicetree to supply a second memory > resource. This resource is mandatory on the newly supported SoCs. > For the JZ4780, new devicetree code must also provide it, although the > driver is still compatible with older devicetree binaries. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Tested-by: Mathieu Malaterre <malat@debian.org> > --- > Documentation/devicetree/bindings/dma/jz4780-dma.txt | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > v2: New patch in this series; regroups the changes made to the > jz4780-dma.txt doc file in the previous version of the patchset. > > v3: Updated example to comply with devicetree specification > > diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt > index f25feee62b15..14f33305e194 100644 > --- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt > +++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt > @@ -2,8 +2,13 @@ > > Required properties: > > -- compatible: Should be "ingenic,jz4780-dma" > -- reg: Should contain the DMA controller registers location and length. > +- compatible: Should be one of: > + * ingenic,jz4740-dma > + * ingenic,jz4725b-dma > + * ingenic,jz4770-dma > + * ingenic,jz4780-dma So none of these are compatible with each other? It should be one valid combination per line. > +- 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. > - interrupt-parent: Should be the phandle of the interrupt controller that > - clocks: Should contain a clock specifier for the JZ4780 PDMA clock. > @@ -20,9 +25,10 @@ Optional properties: > > Example: > > -dma: dma@13420000 { > +dma: dma-controller@13420000 { > compatible = "ingenic,jz4780-dma"; > - reg = <0x13420000 0x10000>; > + reg = <0x13420000 0x400 > + 0x13421000 0x40>; > > interrupt-parent = <&intc>; > interrupts = <10>; > -- > 2.11.0 > -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, Le mer. 25 juil. 2018 à 1:35, Rob Herring <robh@kernel.org> a écrit : > On Sat, Jul 21, 2018 at 01:06:26PM +0200, Paul Cercueil wrote: >> The driver is now compatible with four SoCs: JZ4780, JZ4770, >> JZ4725B and >> JZ4740. > > What the driver supports is irrelevant to the binding. That's just informative. But I can remove it, no problem. >> >> Besides, it now expects the devicetree to supply a second memory >> resource. This resource is mandatory on the newly supported SoCs. >> For the JZ4780, new devicetree code must also provide it, although >> the >> driver is still compatible with older devicetree binaries. >> >> Signed-off-by: Paul Cercueil <paul@crapouillou.net> >> Tested-by: Mathieu Malaterre <malat@debian.org> >> --- >> Documentation/devicetree/bindings/dma/jz4780-dma.txt | 14 >> ++++++++++---- >> 1 file changed, 10 insertions(+), 4 deletions(-) >> >> v2: New patch in this series; regroups the changes made to the >> jz4780-dma.txt doc file in the previous version of the patchset. >> >> v3: Updated example to comply with devicetree specification >> >> diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt >> b/Documentation/devicetree/bindings/dma/jz4780-dma.txt >> index f25feee62b15..14f33305e194 100644 >> --- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt >> +++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt >> @@ -2,8 +2,13 @@ >> >> Required properties: >> >> -- compatible: Should be "ingenic,jz4780-dma" >> -- reg: Should contain the DMA controller registers location and >> length. >> +- compatible: Should be one of: >> + * ingenic,jz4740-dma >> + * ingenic,jz4725b-dma >> + * ingenic,jz4770-dma >> + * ingenic,jz4780-dma > > So none of these are compatible with each other? It should be one > valid > combination per line. That's correct - they are all slightly different. >> +- 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. >> - interrupt-parent: Should be the phandle of the interrupt >> controller that >> - clocks: Should contain a clock specifier for the JZ4780 PDMA >> clock. >> @@ -20,9 +25,10 @@ Optional properties: >> >> Example: >> >> -dma: dma@13420000 { >> +dma: dma-controller@13420000 { >> compatible = "ingenic,jz4780-dma"; >> - reg = <0x13420000 0x10000>; >> + reg = <0x13420000 0x400 >> + 0x13421000 0x40>; >> >> interrupt-parent = <&intc>; >> interrupts = <10>; >> -- >> 2.11.0 >> -- To unsubscribe from this list: send the line "unsubscribe dmaengine" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/dma/jz4780-dma.txt b/Documentation/devicetree/bindings/dma/jz4780-dma.txt index f25feee62b15..14f33305e194 100644 --- a/Documentation/devicetree/bindings/dma/jz4780-dma.txt +++ b/Documentation/devicetree/bindings/dma/jz4780-dma.txt @@ -2,8 +2,13 @@ Required properties: -- compatible: Should be "ingenic,jz4780-dma" -- reg: Should contain the DMA controller registers location and length. +- compatible: Should be one of: + * ingenic,jz4740-dma + * ingenic,jz4725b-dma + * ingenic,jz4770-dma + * ingenic,jz4780-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. - interrupt-parent: Should be the phandle of the interrupt controller that - clocks: Should contain a clock specifier for the JZ4780 PDMA clock. @@ -20,9 +25,10 @@ Optional properties: Example: -dma: dma@13420000 { +dma: dma-controller@13420000 { compatible = "ingenic,jz4780-dma"; - reg = <0x13420000 0x10000>; + reg = <0x13420000 0x400 + 0x13421000 0x40>; interrupt-parent = <&intc>; interrupts = <10>;