| Message ID | 1499855753-21630-1-git-send-email-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 71adc330aa7d88e7c64c66d28ff7b71ddab25465 |
| Headers | show |
On Wed, Jul 12, 2017 at 12:35:53PM +0200, Geert Uytterhoeven wrote: > MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of > DMA specifiers. However, the second pair of corresponding DMA names was > missing. > > Fixes: 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, applied for v4.14. Let me know if you would prefer it handled as a fix for v4.13. I see the commit it fixes was part of v4.11.
Hi Simon, On Thu, Jul 13, 2017 at 10:18 AM, Simon Horman <horms@verge.net.au> wrote: > On Wed, Jul 12, 2017 at 12:35:53PM +0200, Geert Uytterhoeven wrote: >> MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of >> DMA specifiers. However, the second pair of corresponding DMA names was >> missing. >> >> Fixes: 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes") >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> >> --- >> arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) > > Thanks, applied for v4.14. > > Let me know if you would prefer it handled as a fix for v4.13. > I see the commit it fixes was part of v4.11. Thanks! V4.14 is fine. It's not enabled in any board DTS, and DMA will stll work as long as there are free channels on DMAC1. 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
On Thu, Jul 13, 2017 at 10:23:43AM +0200, Geert Uytterhoeven wrote: > Hi Simon, > > On Thu, Jul 13, 2017 at 10:18 AM, Simon Horman <horms@verge.net.au> wrote: > > On Wed, Jul 12, 2017 at 12:35:53PM +0200, Geert Uytterhoeven wrote: > >> MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of > >> DMA specifiers. However, the second pair of corresponding DMA names was > >> missing. > >> > >> Fixes: 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes") > >> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > >> --- > >> arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > > > > Thanks, applied for v4.14. > > > > Let me know if you would prefer it handled as a fix for v4.13. > > I see the commit it fixes was part of v4.11. > > Thanks! > > V4.14 is fine. It's not enabled in any board DTS, and DMA will stll work as > long as there are free channels on DMAC1. Thanks, for clarifying. The second point above was the main part of my reasoning that it is v4.14 material.
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi index c7bbb501ebe06826..f63f9107f453b5b7 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi @@ -1000,7 +1000,7 @@ clocks = <&cpg CPG_MOD 211>; dmas = <&dmac1 0x41>, <&dmac1 0x40>, <&dmac2 0x41>, <&dmac2 0x40>; - dma-names = "tx", "rx"; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; resets = <&cpg 211>; #address-cells = <1>; @@ -1016,7 +1016,7 @@ clocks = <&cpg CPG_MOD 210>; dmas = <&dmac1 0x43>, <&dmac1 0x42>, <&dmac2 0x43>, <&dmac2 0x42>; - dma-names = "tx", "rx"; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&sysc R8A7796_PD_ALWAYS_ON>; resets = <&cpg 210>; #address-cells = <1>;
MSIOF0 and MSIOF1 are tied to two DMA controllers through two pairs of DMA specifiers. However, the second pair of corresponding DMA names was missing. Fixes: 80fab06e258da762 ("arm64: dts: r8a7796: Add all MSIOF nodes") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)