| Message ID | 1397511312-4845-7-git-send-email-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Vinod Koul |
| Headers | show |
On Mon, Apr 14, 2014 at 11:35 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote: > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi > index de3ca15..582e687 100644 > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > + audiodma0: dma-contorller@ec700000 { dma-controller (we really need better dts validation tools) Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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
On Mon, Apr 14, 2014 at 11:35 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote: > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -158,6 +158,72 @@ > }; > }; > > + dma1: dma-mux@1 { > + compatible = "renesas,shdma-mux"; > + #dma-cells = <2>; > + dma-channels = <20>; 26, cfr. the sum of the subnodes? > + audiodma0: dma-contorller@ec700000 { > + compatible = "renesas,shdma-r8a7790"; > + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC0>; > + dma-channels = <13>; > + audiodma1: dma-controller@ec720000 { > + compatible = "renesas,shdma-r8a7790"; > + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC1>; > + dma-channels = <13>; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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 Ben, On Mon, Apr 14, 2014 at 11:35 PM, Ben Dooks <ben.dooks@codethink.co.uk> wrote: > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > + audiodma0: dma-contorller@ec700000 { > + reg = <0 0xec700020 0 0xffc0>; > + audiodma1: dma-controller@ec720000 { > + reg = <0 0xec720020 0 0xffc0>; ePAPR: "The unit-address must match the first address specified in the reg property of the node." Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- 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/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index de3ca15..582e687 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -158,6 +158,72 @@ }; }; + dma1: dma-mux@1 { + compatible = "renesas,shdma-mux"; + #dma-cells = <2>; + dma-channels = <20>; + dma-requests = <256>; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + audiodma0: dma-contorller@ec700000 { + compatible = "renesas,shdma-r8a7790"; + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC0>; + dma-channels = <13>; + status = "disabled"; + reg = <0 0xec700020 0 0xffc0>; + + interrupts = <0 346 IRQ_TYPE_LEVEL_HIGH>, /* error */ + <0 320 IRQ_TYPE_LEVEL_HIGH>, /* ch0 */ + <0 321 IRQ_TYPE_LEVEL_HIGH>, + <0 322 IRQ_TYPE_LEVEL_HIGH>, + <0 323 IRQ_TYPE_LEVEL_HIGH>, + <0 324 IRQ_TYPE_LEVEL_HIGH>, + <0 325 IRQ_TYPE_LEVEL_HIGH>, + <0 326 IRQ_TYPE_LEVEL_HIGH>, + <0 327 IRQ_TYPE_LEVEL_HIGH>, + <0 328 IRQ_TYPE_LEVEL_HIGH>, + <0 329 IRQ_TYPE_LEVEL_HIGH>, + <0 330 IRQ_TYPE_LEVEL_HIGH>, + <0 331 IRQ_TYPE_LEVEL_HIGH>, + <0 332 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12"; + }; + + audiodma1: dma-controller@ec720000 { + compatible = "renesas,shdma-r8a7790"; + clocks = <&mstp5_clks R8A7790_CLK_AUDIO_DMAC1>; + dma-channels = <13>; + status = "disabled"; + reg = <0 0xec720020 0 0xffc0>; + + interrupts = <0 347 IRQ_TYPE_LEVEL_HIGH>, /* error */ + <0 333 IRQ_TYPE_LEVEL_HIGH>, /* ch0 */ + <0 334 IRQ_TYPE_LEVEL_HIGH>, + <0 335 IRQ_TYPE_LEVEL_HIGH>, + <0 336 IRQ_TYPE_LEVEL_HIGH>, + <0 337 IRQ_TYPE_LEVEL_HIGH>, + <0 338 IRQ_TYPE_LEVEL_HIGH>, + <0 339 IRQ_TYPE_LEVEL_HIGH>, + <0 340 IRQ_TYPE_LEVEL_HIGH>, + <0 341 IRQ_TYPE_LEVEL_HIGH>, + <0 342 IRQ_TYPE_LEVEL_HIGH>, + <0 343 IRQ_TYPE_LEVEL_HIGH>, + <0 344 IRQ_TYPE_LEVEL_HIGH>, + <0 345 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12"; + }; + }; + gic: interrupt-controller@f1001000 { compatible = "arm,cortex-a15-gic"; #interrupt-cells = <3>;
Add initial audio dmac node and resources. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- arch/arm/boot/dts/r8a7790.dtsi | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+)