diff for duplicates of <5391A465.5080403@codethink.co.uk> diff --git a/a/1.txt b/N1/1.txt index 2759289..e688c6e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,7 +34,7 @@ On 04/06/14 13:25, Laurent Pinchart wrote: >> }; >> }; >> ->> + dma0: dma-mux@0 { +>> + dma0: dma-mux at 0 { >> + compatible = "renesas,shdma-mux"; >> + #dma-cells = <2>; >> + dma-channels = <30>; @@ -43,7 +43,7 @@ On 04/06/14 13:25, Laurent Pinchart wrote: >> + #size-cells = <2>; >> + ranges; >> + ->> + sysdma0: dma-controller@e6700020 { +>> + sysdma0: dma-controller at e6700020 { >> + compatible = "renesas,shdma-r8a7791"; >> + reg = <0 0xe6700020 0 0xffc0>; > diff --git a/a/content_digest b/N1/content_digest index 3083b5b..66f593a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\01401716531-29794-1-git-send-email-geert+renesas@glider.be\0" "ref\01401716531-29794-6-git-send-email-geert+renesas@glider.be\0" "ref\02440127.sDc7m91LPu@avalon\0" - "From\0Ben Dooks <ben.dooks@codethink.co.uk>\0" - "Subject\0Re: [PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes\0" - "Date\0Fri, 06 Jun 2014 11:22:13 +0000\0" + "From\0ben.dooks@codethink.co.uk (Ben Dooks)\0" + "Subject\0[PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes\0" + "Date\0Fri, 06 Jun 2014 12:22:13 +0100\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -43,7 +43,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" @@ -52,7 +52,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" @@ -70,4 +70,4 @@ "Ben Dooks\t\t\t\thttp://www.codethink.co.uk/\n" "Senior Engineer\t\t\t\tCodethink - Providing Genius" -fc1a28cd2160bba03a2b81b2406edef3e4c94768ed9e97b0dd51fef6a1627c96 +412c186082cfc1b13aef063d201d651188874fe8468b70d405875fb25692e5e3
diff --git a/a/content_digest b/N2/content_digest index 3083b5b..947e278 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,15 @@ "ref\02440127.sDc7m91LPu@avalon\0" "From\0Ben Dooks <ben.dooks@codethink.co.uk>\0" "Subject\0Re: [PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes\0" - "Date\0Fri, 06 Jun 2014 11:22:13 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Fri, 06 Jun 2014 12:22:13 +0100\0" + "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>" + " Geert Uytterhoeven <geert+renesas@glider.be>\0" + "Cc\0Simon Horman <horms@verge.net.au>" + Magnus Damm <magnus.damm@gmail.com> + 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" "On 04/06/14 13:25, Laurent Pinchart wrote:\n" @@ -70,4 +77,4 @@ "Ben Dooks\t\t\t\thttp://www.codethink.co.uk/\n" "Senior Engineer\t\t\t\tCodethink - Providing Genius" -fc1a28cd2160bba03a2b81b2406edef3e4c94768ed9e97b0dd51fef6a1627c96 +7a3c849b5a7c905b45aac3c3ee95b0612fd156ca3817a030662fa91fe47b974f
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.