diff for duplicates of <2440127.sDc7m91LPu@avalon> diff --git a/a/1.txt b/N1/1.txt index da61b6d..aab73ad 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,7 +33,7 @@ On Monday 02 June 2014 15:42:09 Geert Uytterhoeven wrote: > }; > }; > -> + dma0: dma-mux@0 { +> + dma0: dma-mux at 0 { > + compatible = "renesas,shdma-mux"; > + #dma-cells = <2>; > + dma-channels = <30>; @@ -42,7 +42,7 @@ On Monday 02 June 2014 15:42:09 Geert Uytterhoeven wrote: > + #size-cells = <2>; > + ranges; > + -> + sysdma0: dma-controller@e6700020 { +> + sysdma0: dma-controller at e6700020 { > + compatible = "renesas,shdma-r8a7791"; > + reg = <0 0xe6700020 0 0xffc0>; @@ -80,7 +80,7 @@ Interrupts and clocks look fine to me. > + status = "disabled"; > + }; > + -> + sysdma1: dma-controller@e6720020 { +> + sysdma1: dma-controller at e6720020 { > + compatible = "renesas,shdma-r8a7791"; > + reg = <0 0xe6720020 0 0xffc0>; > + clocks = <&mstp2_clks R8A7791_CLK_SYS_DMAC1>; @@ -110,7 +110,7 @@ Interrupts and clocks look fine to me. > + }; > + }; > + -> gic: interrupt-controller@f1001000 { +> gic: interrupt-controller at f1001000 { > compatible = "arm,cortex-a15-gic"; > #interrupt-cells = <3>; diff --git a/a/content_digest b/N1/content_digest index 2af7967..cafb7c1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01401716531-29794-1-git-send-email-geert+renesas@glider.be\0" "ref\01401716531-29794-6-git-send-email-geert+renesas@glider.be\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes\0" - "Date\0Wed, 04 Jun 2014 12:25:33 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes\0" + "Date\0Wed, 04 Jun 2014 14:25:33 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -41,7 +41,7 @@ "> \t\t};\n" "> \t};\n" "> \n" - "> +\tdma0: dma-mux@0 {\n" + "> +\tdma0: dma-mux at 0 {\n" "> +\t\tcompatible = \"renesas,shdma-mux\";\n" "> +\t\t#dma-cells = <2>;\n" "> +\t\tdma-channels = <30>;\n" @@ -50,7 +50,7 @@ "> +\t\t#size-cells = <2>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tsysdma0: dma-controller@e6700020 {\n" + "> +\t\tsysdma0: dma-controller at e6700020 {\n" "> +\t\t\tcompatible = \"renesas,shdma-r8a7791\";\n" "> +\t\t\treg = <0 0xe6700020 0 0xffc0>;\n" "\n" @@ -88,7 +88,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tsysdma1: dma-controller@e6720020 {\n" + "> +\t\tsysdma1: dma-controller at e6720020 {\n" "> +\t\t\tcompatible = \"renesas,shdma-r8a7791\";\n" "> +\t\t\treg = <0 0xe6720020 0 0xffc0>;\n" "> +\t\t\tclocks = <&mstp2_clks R8A7791_CLK_SYS_DMAC1>;\n" @@ -118,7 +118,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> \tgic: interrupt-controller@f1001000 {\n" + "> \tgic: interrupt-controller at f1001000 {\n" "> \t\tcompatible = \"arm,cortex-a15-gic\";\n" "> \t\t#interrupt-cells = <3>;\n" "\n" @@ -127,4 +127,4 @@ "\n" Laurent Pinchart -49f7c78aceda8ad94572f44597ade2f56b1725d30dd665031c9101a123be321b +5fa4f4c047d84c336c9d9185ab26338265b8f693ff52b71b0c752ccff82f5dfc
diff --git a/a/content_digest b/N2/content_digest index 2af7967..94c8c7b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,15 @@ "ref\01401716531-29794-6-git-send-email-geert+renesas@glider.be\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes\0" - "Date\0Wed, 04 Jun 2014 12:25:33 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 04 Jun 2014 14:25:33 +0200\0" + "To\0Geert Uytterhoeven <geert+renesas@glider.be>\0" + "Cc\0Simon Horman <horms@verge.net.au>" + Magnus Damm <magnus.damm@gmail.com> + Ben Dooks <ben.dooks@codethink.co.uk> + linux-sh@vger.kernel.org + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " dmaengine@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Geert,\n" @@ -127,4 +134,4 @@ "\n" Laurent Pinchart -49f7c78aceda8ad94572f44597ade2f56b1725d30dd665031c9101a123be321b +e50cf3053fda55bdffb0b26da13e53ba9aa9aaab09ee8f97fa75dc66731472c2
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.