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: [PATCHv2 01/31] ARM: dts: r8a7790: Reference both DMA controllers in SCIFA nodes Date: Tue, 15 Mar 2016 13:41:38 +0100 [thread overview] Message-ID: <1458045728-4758-2-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw) In-Reply-To: <1458045728-4758-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> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/boot/dts/r8a7790.dtsi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 0077de7..7d9ff0b 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -633,8 +633,9 @@ interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>; clock-names = "fck"; - dmas = <&dmac0 0x21>, <&dmac0 0x22>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x21>, <&dmac0 0x22>, + <&dmac1 0x21>, <&dmac1 0x22>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; @@ -646,8 +647,9 @@ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>; clock-names = "fck"; - dmas = <&dmac0 0x25>, <&dmac0 0x26>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x25>, <&dmac0 0x26>, + <&dmac1 0x25>, <&dmac1 0x26>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; @@ -659,8 +661,9 @@ interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>; clock-names = "fck"; - dmas = <&dmac0 0x27>, <&dmac0 0x28>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x27>, <&dmac0 0x28>, + <&dmac1 0x27>, <&dmac1 0x28>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; -- 2.7.2
WARNING: multiple messages have this Message-ID (diff)
From: niklas.soderlund+renesas@ragnatech.se (Niklas Söderlund) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv2 01/31] ARM: dts: r8a7790: Reference both DMA controllers in SCIFA nodes Date: Tue, 15 Mar 2016 13:41:38 +0100 [thread overview] Message-ID: <1458045728-4758-2-git-send-email-niklas.soderlund+renesas@ragnatech.se> (raw) In-Reply-To: <1458045728-4758-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> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> --- arch/arm/boot/dts/r8a7790.dtsi | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 0077de7..7d9ff0b 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -633,8 +633,9 @@ interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7790_CLK_SCIFA0>; clock-names = "fck"; - dmas = <&dmac0 0x21>, <&dmac0 0x22>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x21>, <&dmac0 0x22>, + <&dmac1 0x21>, <&dmac1 0x22>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; @@ -646,8 +647,9 @@ interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7790_CLK_SCIFA1>; clock-names = "fck"; - dmas = <&dmac0 0x25>, <&dmac0 0x26>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x25>, <&dmac0 0x26>, + <&dmac1 0x25>, <&dmac1 0x26>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; @@ -659,8 +661,9 @@ interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp2_clks R8A7790_CLK_SCIFA2>; clock-names = "fck"; - dmas = <&dmac0 0x27>, <&dmac0 0x28>; - dma-names = "tx", "rx"; + dmas = <&dmac0 0x27>, <&dmac0 0x28>, + <&dmac1 0x27>, <&dmac1 0x28>; + dma-names = "tx", "rx", "tx", "rx"; power-domains = <&cpg_clocks>; status = "disabled"; }; -- 2.7.2
next prev parent reply other threads:[~2016-03-15 12:41 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-15 12:41 [PATCHv2 00/31] ARM: dts: r8a779[0-4]: Reference both DMA controllers Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund [this message] 2016-03-15 12:41 ` [PATCHv2 01/31] ARM: dts: r8a7790: Reference both DMA controllers in SCIFA nodes Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 02/31] ARM: dts: r8a7790: Reference both DMA controllers in SCIFB nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 03/31] ARM: dts: r8a7790: Reference both DMA controllers in HSCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 04/31] ARM: dts: r8a7790: Reference both DMA controllers in SCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 05/31] ARM: dts: r8a7790: Reference both DMA controllers in MSIOF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 07/31] ARM: dts: r8a7790: Reference both DMA controllers in IIC nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 08/31] ARM: dts: r8a7790: Reference both DMA controllers in SDHI nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 09/31] ARM: dts: r8a7790: Reference both DMA controllers in MMCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 10/31] ARM: dts: r8a7791: Reference both DMA controllers in SCIFA nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 12/31] ARM: dts: r8a7791: Reference both DMA controllers in HSCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 13/31] ARM: dts: r8a7791: Reference both DMA controllers in SCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 14/31] ARM: dts: r8a7791: Reference both DMA controllers in MSIOF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 15/31] ARM: dts: r8a7791: Reference both DMA controllers in QSPI node Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 18/31] ARM: dts: r8a7791: Reference both DMA controllers in MMCIF node Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund [not found] ` <1458045728-4758-1-git-send-email-niklas.soderlund+renesas-1zkq55x86MTxsAP9Fp7wbw@public.gmane.org> 2016-03-15 12:41 ` [PATCHv2 06/31] ARM: dts: r8a7790: Reference both DMA controllers in QSPI node Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 11/31] ARM: dts: r8a7791: Reference both DMA controllers in SCIFB nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 16/31] ARM: dts: r8a7791: Reference both DMA controllers in IIC nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 17/31] ARM: dts: r8a7791: Reference both DMA controllers in SDHI nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 19/31] ARM: dts: r8a7793: Reference both DMA controllers in SCIFA nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 22/31] ARM: dts: r8a7793: Reference both DMA controllers in SCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 27/31] ARM: dts: r8a7794: Reference both DMA controllers in HSCIF nodes Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 30/31] ARM: dts: r8a7794: Reference both DMA controllers in SDHI nodes Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 20/31] ARM: dts: r8a7793: Reference both DMA controllers in SCIFB nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:41 ` [PATCHv2 21/31] ARM: dts: r8a7793: Reference both DMA controllers in HSCIF nodes Niklas Söderlund 2016-03-15 12:41 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 23/31] ARM: dts: r8a7793: Reference both DMA controllers in QSPI node Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 24/31] ARM: dts: r8a7793: Reference both DMA controllers in IIC nodes Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 25/31] ARM: dts: r8a7794: Reference both DMA controllers in SCIFA nodes Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 26/31] ARM: dts: r8a7794: Reference both DMA controllers in SCIFB nodes Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 28/31] ARM: dts: r8a7794: Reference both DMA controllers in SCIF nodes Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 29/31] ARM: dts: r8a7794: Reference both DMA controllers in QSPI node Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-15 12:42 ` [PATCHv2 31/31] ARM: dts: r8a7794: Reference both DMA controllers in MMCIF node Niklas Söderlund 2016-03-15 12:42 ` Niklas Söderlund 2016-03-16 0:06 ` [PATCHv2 00/31] ARM: dts: r8a779[0-4]: Reference both DMA controllers Simon Horman 2016-03-16 0:06 ` 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=1458045728-4758-2-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.