diff for duplicates of <2661832.Y18F3NymRL@avalon> diff --git a/a/1.txt b/N1/1.txt index 401c5cf..3cdb5f1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -24,7 +24,7 @@ Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > #gpio-range-cells = <3>; > }; > -> + dmac0: dma-controller@e6700000 { +> + dmac0: dma-controller at e6700000 { > + compatible = "renesas,rcar-dmac"; > + reg = <0 0xe6700000 0 0x20000>; > + interrupts = <0 197 IRQ_TYPE_LEVEL_HIGH @@ -55,7 +55,7 @@ Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > + dma-channels = <15>; > + }; > + -> + dmac1: dma-controller@e6720000 { +> + dmac1: dma-controller at e6720000 { > + compatible = "renesas,rcar-dmac"; > + reg = <0 0xe6720000 0 0x20000>; > + interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH @@ -86,14 +86,14 @@ Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > + dma-channels = <15>; > + }; > + -> scif0: serial@e6e60000 { +> scif0: serial at e6e60000 { > compatible = "renesas,scif-r8a7793", "renesas,scif"; > reg = <0 0xe6e60000 0 64>; > @@ -313,6 +375,16 @@ > "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1", > "vsp1-du0", "vsps"; > }; -> + mstp2_clks: mstp2_clks@e6150138 { +> + mstp2_clks: mstp2_clks at e6150138 { > + compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp- clocks"; > + reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>; @@ -104,7 +104,7 @@ clocks"; > + >; > + clock-output-names = "sys-dmac1", "sys-dmac0"; > + }; -> mstp3_clks: mstp3_clks@e615013c { +> mstp3_clks: mstp3_clks at e615013c { > compatible = "renesas,r8a7793-mstp-clocks", > "renesas,cpg-mstp-clocks"; diff --git a/a/content_digest b/N1/content_digest index ef39323..62fd371 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01447139641-11480-1-git-send-email-horms+renesas@verge.net.au\0" "ref\01447139641-11480-2-git-send-email-horms+renesas@verge.net.au\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT\0" - "Date\0Tue, 10 Nov 2015 09:11:36 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 1/3] ARM: shmobile: r8a7793: Add DMAC devices to DT\0" + "Date\0Tue, 10 Nov 2015 11:11:36 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -32,7 +32,7 @@ "> \t\t#gpio-range-cells = <3>;\n" "> \t};\n" "> \n" - "> +\tdmac0: dma-controller@e6700000 {\n" + "> +\tdmac0: dma-controller at e6700000 {\n" "> +\t\tcompatible = \"renesas,rcar-dmac\";\n" "> +\t\treg = <0 0xe6700000 0 0x20000>;\n" "> +\t\tinterrupts = <0 197 IRQ_TYPE_LEVEL_HIGH\n" @@ -63,7 +63,7 @@ "> +\t\tdma-channels = <15>;\n" "> +\t};\n" "> +\n" - "> +\tdmac1: dma-controller@e6720000 {\n" + "> +\tdmac1: dma-controller at e6720000 {\n" "> +\t\tcompatible = \"renesas,rcar-dmac\";\n" "> +\t\treg = <0 0xe6720000 0 0x20000>;\n" "> +\t\tinterrupts = <0 220 IRQ_TYPE_LEVEL_HIGH\n" @@ -94,14 +94,14 @@ "> +\t\tdma-channels = <15>;\n" "> +\t};\n" "> +\n" - "> \tscif0: serial@e6e60000 {\n" + "> \tscif0: serial at e6e60000 {\n" "> \t\tcompatible = \"renesas,scif-r8a7793\", \"renesas,scif\";\n" "> \t\treg = <0 0xe6e60000 0 64>;\n" "> @@ -313,6 +375,16 @@\n" "> \t\t\t\t\"tmu3\", \"tmu2\", \"cmt0\", \"tmu0\", \"vsp1-du1\",\n" "> \t\t\t\t\"vsp1-du0\", \"vsps\";\n" "> \t\t};\n" - "> +\t\tmstp2_clks: mstp2_clks@e6150138 {\n" + "> +\t\tmstp2_clks: mstp2_clks at e6150138 {\n" "> +\t\t\tcompatible = \"renesas,r8a7793-mstp-clocks\", \"renesas,cpg-mstp-\n" "clocks\";\n" "> +\t\t\treg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;\n" @@ -112,7 +112,7 @@ "> +\t\t\t>;\n" "> +\t\t\tclock-output-names = \"sys-dmac1\", \"sys-dmac0\";\n" "> +\t\t};\n" - "> \t\tmstp3_clks: mstp3_clks@e615013c {\n" + "> \t\tmstp3_clks: mstp3_clks at e615013c {\n" "> \t\t\tcompatible = \"renesas,r8a7793-mstp-clocks\",\n" "> \t\t\t\t \"renesas,cpg-mstp-clocks\";\n" "\n" @@ -121,4 +121,4 @@ "\n" Laurent Pinchart -019d7d66e02c6a4760bdaae7d260fca554bd1602c32a52898793c980b45d3b4d +c80239f098170d02e84dedd85a7ab74d036fcdba74268a0ec58d1bb7c6399cbe
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.