diff mbox

[30/30] ARM: dts: r8a7794: Reference both DMA controllers in QSPI node

Message ID 1457609782-24108-31-git-send-email-niklas.soderlund+renesas@ragnatech.se (mailing list archive)
State Superseded
Delegated to: Simon Horman
Headers show

Commit Message

Niklas Söderlund March 10, 2016, 11:36 a.m. UTC
R-Car Gen2 have two DMA controllers, which are equivalent. Add
references to both dmac0 and dmac1 so the driver can fallback to the
later if the first one is unavailable.

Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
 arch/arm/boot/dts/r8a7794.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Geert Uytterhoeven March 10, 2016, 12:08 p.m. UTC | #1
Hi Niklas,

On Thu, Mar 10, 2016 at 12:36 PM, Niklas Söderlund
<niklas.soderlund+renesas@ragnatech.se> wrote:
> R-Car Gen2 have two DMA controllers, which are equivalent. Add
> references to both dmac0 and dmac1 so the driver can fallback to the
> later if the first one is unavailable.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> ---
>  arch/arm/boot/dts/r8a7794.dtsi | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
> index 76709ff..e098eab 100644
> --- a/arch/arm/boot/dts/r8a7794.dtsi
> +++ b/arch/arm/boot/dts/r8a7794.dtsi
> @@ -605,8 +605,9 @@
>                 reg = <0 0xee200000 0 0x80>;
>                 interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
>                 clocks = <&mstp3_clks R8A7794_CLK_MMCIF0>;

This one has the wrong subject: QSPI vs. MMCIF.

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
Niklas Söderlund March 10, 2016, 1:42 p.m. UTC | #2
On 2016-03-10 13:08:56 +0100, Geert Uytterhoeven wrote:
> Hi Niklas,
> 
> On Thu, Mar 10, 2016 at 12:36 PM, Niklas Söderlund
> <niklas.soderlund+renesas@ragnatech.se> wrote:
> > R-Car Gen2 have two DMA controllers, which are equivalent. Add
> > references to both dmac0 and dmac1 so the driver can fallback to the
> > later if the first one is unavailable.
> >
> > Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
> > ---
> >  arch/arm/boot/dts/r8a7794.dtsi | 5 +++--
> >  1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
> > index 76709ff..e098eab 100644
> > --- a/arch/arm/boot/dts/r8a7794.dtsi
> > +++ b/arch/arm/boot/dts/r8a7794.dtsi
> > @@ -605,8 +605,9 @@
> >                 reg = <0 0xee200000 0 0x80>;
> >                 interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
> >                 clocks = <&mstp3_clks R8A7794_CLK_MMCIF0>;
> 
> This one has the wrong subject: QSPI vs. MMCIF.

Thanks for noticing, would have been embarrassing for me.

> 
> 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
diff mbox

Patch

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 76709ff..e098eab 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -605,8 +605,9 @@ 
 		reg = <0 0xee200000 0 0x80>;
 		interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A7794_CLK_MMCIF0>;
-		dmas = <&dmac0 0xd1>, <&dmac0 0xd2>;
-		dma-names = "tx", "rx";
+		dmas = <&dmac0 0xd1>, <&dmac0 0xd2>,
+		       <&dmac1 0xd1>, <&dmac1 0xd2>;
+		dma-names = "tx", "rx", "tx", "rx";
 		power-domains = <&cpg_clocks>;
 		reg-io-width = <4>;
 		status = "disabled";