From: "Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
To: horms@verge.net.au, magnus.damm@gmail.com, geert@linux-m68k.org,
laurent.pinchart@ideasonboard.com
Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>
Subject: [PATCH 08/30] ARM: dts: r8a7790: Reference both DMA controllers in SDHI nodes
Date: Thu, 10 Mar 2016 12:36:00 +0100 [thread overview]
Message-ID: <1457609782-24108-9-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw)
In-Reply-To: <1457609782-24108-1-git-send-email-niklas.soderlund+renesas@ragnatech.se>
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/r8a7790.dtsi | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index b89bf28..ae86a68 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -549,8 +549,9 @@
reg = <0 0xee100000 0 0x328>;
interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
- dmas = <&dmac1 0xcd>, <&dmac1 0xce>;
- dma-names = "tx", "rx";
+ dmas = <&dmac1 0xcd>, <&dmac1 0xce>,
+ <&dmac0 0xcd>, <&dmac0 0xce>;
+ dma-names = "tx", "rx", "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -560,8 +561,9 @@
reg = <0 0xee120000 0 0x328>;
interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
- dmas = <&dmac1 0xc9>, <&dmac1 0xca>;
- dma-names = "tx", "rx";
+ dmas = <&dmac1 0xc9>, <&dmac1 0xca>,
+ <&dmac0 0xc9>, <&dmac0 0xca>;
+ dma-names = "tx", "rx", "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -571,8 +573,9 @@
reg = <0 0xee140000 0 0x100>;
interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
- dmas = <&dmac1 0xc1>, <&dmac1 0xc2>;
- dma-names = "tx", "rx";
+ dmas = <&dmac1 0xc1>, <&dmac1 0xc2>,
+ <&dmac0 0xc1>, <&dmac0 0xc2>;
+ dma-names = "tx", "rx", "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
@@ -582,8 +585,9 @@
reg = <0 0xee160000 0 0x100>;
interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
- dmas = <&dmac1 0xd3>, <&dmac1 0xd4>;
- dma-names = "tx", "rx";
+ dmas = <&dmac1 0xd3>, <&dmac1 0xd4>,
+ <&dmac0 0xd3>, <&dmac0 0xd4>;
+ dma-names = "tx", "rx", "tx", "rx";
power-domains = <&cpg_clocks>;
status = "disabled";
};
--
2.7.2
next prev parent reply other threads:[~2016-03-10 11:36 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-10 11:35 [PATCH 00/30] ARM: dts: r8a779[0-4]: Reference both DMA controllers Niklas Söderlund
2016-03-10 11:35 ` [PATCH 01/30] ARM: dts: r8a7790: Reference both DMA controllers in SCIFA nodes Niklas Söderlund
2016-03-10 11:35 ` [PATCH 02/30] ARM: dts: r8a7790: Reference both DMA controllers in SCIFB nodes Niklas Söderlund
2016-03-10 11:35 ` [PATCH 03/30] ARM: dts: r8a7790: Reference both DMA controllers in HSCIF nodes Niklas Söderlund
2016-03-10 11:35 ` [PATCH 04/30] ARM: dts: r8a7790: Reference both DMA controllers in SCIF nodes Niklas Söderlund
2016-03-10 11:35 ` [PATCH 05/30] ARM: dts: r8a7790: Reference both DMA controllers in MSIOF nodes Niklas Söderlund
2016-03-10 11:35 ` [PATCH 06/30] ARM: dts: r8a7790: Reference both DMA controllers in QSPI node Niklas Söderlund
2016-03-10 11:35 ` [PATCH 07/30] ARM: dts: r8a7790: Reference both DMA controllers in IIC nodes Niklas Söderlund
2016-03-10 11:36 ` Niklas Söderlund [this message]
2016-03-10 11:36 ` [PATCH 09/30] ARM: dts: r8a7790: Reference both DMA controllers in MMCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 10/30] ARM: dts: r8a7791: Reference both DMA controllers in SCIFA nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 11/30] ARM: dts: r8a7791: Reference both DMA controllers in SCIFB nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 12/30] ARM: dts: r8a7791: Reference both DMA controllers in HSCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 13/30] ARM: dts: r8a7791: Reference both DMA controllers in SCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 14/30] ARM: dts: r8a7791: Reference both DMA controllers in MSIOF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 15/30] ARM: dts: r8a7791: Reference both DMA controllers in QSPI node Niklas Söderlund
2016-03-10 11:36 ` [PATCH 16/30] ARM: dts: r8a7791: Reference both DMA controllers in IIC nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 17/30] ARM: dts: r8a7791: Reference both DMA controllers in SDHI nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 18/30] ARM: dts: r8a7791: Reference both DMA controllers in MMCIF node Niklas Söderlund
2016-03-10 11:36 ` [PATCH 19/30] ARM: dts: r8a7793: Reference both DMA controllers in SCIFA nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 20/30] ARM: dts: r8a7793: Reference both DMA controllers in SCIFB nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 21/30] ARM: dts: r8a7793: Reference both DMA controllers in HSCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 22/30] ARM: dts: r8a7793: Reference both DMA controllers in SCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 23/30] ARM: dts: r8a7793: Reference both DMA controllers in QSPI node Niklas Söderlund
2016-03-10 11:36 ` [PATCH 24/30] ARM: dts: r8a7794: Reference both DMA controllers in SCIFA nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 25/30] ARM: dts: r8a7794: Reference both DMA controllers in SCIFB nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 26/30] ARM: dts: r8a7794: Reference both DMA controllers in HSCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 27/30] ARM: dts: r8a7794: Reference both DMA controllers in SCIF nodes Niklas Söderlund
2016-03-10 11:36 ` [PATCH 28/30] ARM: dts: r8a7794: Reference both DMA controllers in QSPI node Niklas Söderlund
2016-03-10 11:36 ` [PATCH 29/30] ARM: dts: r8a7794: Reference both DMA controllers in SDHI nodes Niklas Söderlund
2016-03-10 12:09 ` Geert Uytterhoeven
2016-03-10 11:36 ` [PATCH 30/30] ARM: dts: r8a7794: Reference both DMA controllers in QSPI node Niklas Söderlund
[not found] ` <1457609782-24108-31-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org>
2016-03-10 12:08 ` Geert Uytterhoeven
2016-03-10 13:42 ` Niklas Söderlund
2016-03-10 12:20 ` [PATCH 00/30] ARM: dts: r8a779[0-4]: Reference both DMA controllers Geert Uytterhoeven
2016-03-10 13:43 ` Niklas Söderlund
2016-03-10 23:38 ` Simon Horman
2016-03-11 0:23 ` Niklas Söderlund
2016-03-11 1:16 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1457609782-24108-9-git-send-email-niklas.soderlund+renesas@ragnatech.se \
--to=niklas.soderlund+renesas@ragnatech.se \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=horms@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).