diff for duplicates of <55DABCD3.60806@xilinx.com> diff --git a/a/1.txt b/N1/1.txt index 675a4c1..888baf4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,14 +19,14 @@ On 08/21/2015 06:32 PM, Moritz Fischer wrote: > - xlnx,datawidth: Should contain the stream data width, take values > {32,64...1024}. > -> @@ -36,11 +37,13 @@ axi_dma_0: axidma at 40400000 { -> dma-channel at 40400000 { +> @@ -36,11 +37,13 @@ axi_dma_0: axidma@40400000 { +> dma-channel@40400000 { > compatible = "xlnx,axi-dma-mm2s-channel"; > interrupts = < 0 59 4 >; > + interrupt-parent = <&intc>; > xlnx,datawidth = <0x40>; > } ; -> dma-channel at 40400030 { +> dma-channel@40400030 { > compatible = "xlnx,axi-dma-s2mm-channel"; > interrupts = < 0 58 4 >; > + interrupt-parent = <&intc>; diff --git a/a/content_digest b/N1/content_digest index a29892c..bc09c18 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,18 @@ "ref\01440174775-14470-1-git-send-email-moritz.fischer@ettus.com\0" - "From\0michal.simek@xilinx.com (Michal Simek)\0" - "Subject\0[PATCH] doc: dt: Add interrupt parent to Xilinx AXI DMA instantation example.\0" + "From\0Michal Simek <michal.simek@xilinx.com>\0" + "Subject\0Re: [PATCH] doc: dt: Add interrupt parent to Xilinx AXI DMA instantation example.\0" "Date\0Mon, 24 Aug 2015 08:42:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Moritz Fischer <moritz.fischer@ettus.com>" + " michal.simek@xilinx.com\0" + "Cc\0robh+dt@kernel.org" + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + soren.brinkmann@xilinx.com + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 08/21/2015 06:32 PM, Moritz Fischer wrote:\n" @@ -26,14 +36,14 @@ "> - xlnx,datawidth: Should contain the stream data width, take values\n" "> \t{32,64...1024}.\n" "> \n" - "> @@ -36,11 +37,13 @@ axi_dma_0: axidma at 40400000 {\n" - "> \tdma-channel at 40400000 {\n" + "> @@ -36,11 +37,13 @@ axi_dma_0: axidma@40400000 {\n" + "> \tdma-channel@40400000 {\n" "> \t\tcompatible = \"xlnx,axi-dma-mm2s-channel\";\n" "> \t\tinterrupts = < 0 59 4 >;\n" "> +\t\tinterrupt-parent = <&intc>;\n" "> \t\txlnx,datawidth = <0x40>;\n" "> \t} ;\n" - "> \tdma-channel at 40400030 {\n" + "> \tdma-channel@40400030 {\n" "> \t\tcompatible = \"xlnx,axi-dma-s2mm-channel\";\n" "> \t\tinterrupts = < 0 58 4 >;\n" "> +\t\tinterrupt-parent = <&intc>;\n" @@ -47,4 +57,4 @@ "Thanks,\n" Michal -2fb30a26c9442a34a7e26d7611f8c4d4d198a3b23108aba1ac6046967ddb5c19 +4096c1d4519f448f6debca14be2425d83ce4d4f98a25575c75f0d273a0313fd2
diff --git a/a/1.txt b/N2/1.txt index 675a4c1..888baf4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -19,14 +19,14 @@ On 08/21/2015 06:32 PM, Moritz Fischer wrote: > - xlnx,datawidth: Should contain the stream data width, take values > {32,64...1024}. > -> @@ -36,11 +37,13 @@ axi_dma_0: axidma at 40400000 { -> dma-channel at 40400000 { +> @@ -36,11 +37,13 @@ axi_dma_0: axidma@40400000 { +> dma-channel@40400000 { > compatible = "xlnx,axi-dma-mm2s-channel"; > interrupts = < 0 59 4 >; > + interrupt-parent = <&intc>; > xlnx,datawidth = <0x40>; > } ; -> dma-channel at 40400030 { +> dma-channel@40400030 { > compatible = "xlnx,axi-dma-s2mm-channel"; > interrupts = < 0 58 4 >; > + interrupt-parent = <&intc>; diff --git a/a/content_digest b/N2/content_digest index a29892c..eae4d5f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\01440174775-14470-1-git-send-email-moritz.fischer@ettus.com\0" - "From\0michal.simek@xilinx.com (Michal Simek)\0" - "Subject\0[PATCH] doc: dt: Add interrupt parent to Xilinx AXI DMA instantation example.\0" + "From\0Michal Simek <michal.simek@xilinx.com>\0" + "Subject\0Re: [PATCH] doc: dt: Add interrupt parent to Xilinx AXI DMA instantation example.\0" "Date\0Mon, 24 Aug 2015 08:42:27 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Moritz Fischer <moritz.fischer@ettus.com>" + " <michal.simek@xilinx.com>\0" + "Cc\0<robh+dt@kernel.org>" + <pawel.moll@arm.com> + <mark.rutland@arm.com> + <ijc+devicetree@hellion.org.uk> + <galak@codeaurora.org> + <soren.brinkmann@xilinx.com> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 08/21/2015 06:32 PM, Moritz Fischer wrote:\n" @@ -26,14 +36,14 @@ "> - xlnx,datawidth: Should contain the stream data width, take values\n" "> \t{32,64...1024}.\n" "> \n" - "> @@ -36,11 +37,13 @@ axi_dma_0: axidma at 40400000 {\n" - "> \tdma-channel at 40400000 {\n" + "> @@ -36,11 +37,13 @@ axi_dma_0: axidma@40400000 {\n" + "> \tdma-channel@40400000 {\n" "> \t\tcompatible = \"xlnx,axi-dma-mm2s-channel\";\n" "> \t\tinterrupts = < 0 59 4 >;\n" "> +\t\tinterrupt-parent = <&intc>;\n" "> \t\txlnx,datawidth = <0x40>;\n" "> \t} ;\n" - "> \tdma-channel at 40400030 {\n" + "> \tdma-channel@40400030 {\n" "> \t\tcompatible = \"xlnx,axi-dma-s2mm-channel\";\n" "> \t\tinterrupts = < 0 58 4 >;\n" "> +\t\tinterrupt-parent = <&intc>;\n" @@ -47,4 +57,4 @@ "Thanks,\n" Michal -2fb30a26c9442a34a7e26d7611f8c4d4d198a3b23108aba1ac6046967ddb5c19 +5845bee43e51b3d6a6ae4dffc9cb069b1761b0cd41784ed4fdb7fa7fa306fb40
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.