diff for duplicates of <110501ce98d3$0288bc40$079a34c0$@org> diff --git a/a/1.txt b/N1/1.txt index 37ec2b5..c07aa9a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,27 +20,27 @@ Padmavathi Venna wrote: > }; > > + amba { -> + pdma0: pdma@121A0000 { +> + pdma0: pdma at 121A0000 { > + clocks = <&clock 362>; > + clock-names = "apb_pclk"; > + }; > + -> + pdma1: pdma@121B0000 { +> + pdma1: pdma at 121B0000 { > + clocks = <&clock 363>; > + clock-names = "apb_pclk"; > + }; > + -> + mdma0: mdma@10800000 { +> + mdma0: mdma at 10800000 { > + clocks = <&clock 473>; > + clock-names = "apb_pclk"; > + }; > + -> + mdma1: mdma@11C10000 { +> + mdma1: mdma at 11C10000 { > + clocks = <&clock 442>; > + clock-names = "apb_pclk"; > + }; > + -> + adma: adma@03880000 { +> + adma: adma at 03880000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x03880000 0x1000>; > + interrupts = <0 110 0>; @@ -52,7 +52,7 @@ Padmavathi Venna wrote: > + }; > + }; > + -> serial@12C00000 { +> serial at 12C00000 { > clocks = <&clock 257>, <&clock 128>; > clock-names = "uart", "clk_uart_baud0"; > -- diff --git a/a/content_digest b/N1/content_digest index fa2b1e6..db37d86 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01373458449-19039-1-git-send-email-padma.v@samsung.com\0" "ref\01373458449-19039-3-git-send-email-padma.v@samsung.com\0" - "From\0Kukjin Kim <kgene@kernel.org>\0" - "Subject\0RE: [PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420.\0" + "From\0kgene@kernel.org (Kukjin Kim)\0" + "Subject\0[PATCH 2/2] ARM: dts: Add DMA controller node info on Exynos5420.\0" "Date\0Wed, 14 Aug 2013 18:45:28 +0900\0" - "To\0'Padmavathi Venna' <padma.v@samsung.com>" - linux-samsung-soc@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - linux-arm-kernel@lists.infradead.org - " padma.kvr@gmail.com\0" - "Cc\0sbkim73@samsung.com" - broonie@kernel.org - dianders@chromium.org - abrestic@chromium.org - " vinod.koul@intel.com\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Padmavathi Venna wrote:\n" @@ -37,27 +28,27 @@ "> \t};\n" "> \n" "> +\tamba {\n" - "> +\t\tpdma0: pdma@121A0000 {\n" + "> +\t\tpdma0: pdma at 121A0000 {\n" "> +\t\t\tclocks = <&clock 362>;\n" "> +\t\t\tclock-names = \"apb_pclk\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tpdma1: pdma@121B0000 {\n" + "> +\t\tpdma1: pdma at 121B0000 {\n" "> +\t\t\tclocks = <&clock 363>;\n" "> +\t\t\tclock-names = \"apb_pclk\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmdma0: mdma@10800000 {\n" + "> +\t\tmdma0: mdma at 10800000 {\n" "> +\t\t\tclocks = <&clock 473>;\n" "> +\t\t\tclock-names = \"apb_pclk\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tmdma1: mdma@11C10000 {\n" + "> +\t\tmdma1: mdma at 11C10000 {\n" "> +\t\t\tclocks = <&clock 442>;\n" "> +\t\t\tclock-names = \"apb_pclk\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tadma: adma@03880000 {\n" + "> +\t\tadma: adma at 03880000 {\n" "> +\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> +\t\t\treg = <0x03880000 0x1000>;\n" "> +\t\t\tinterrupts = <0 110 0>;\n" @@ -69,7 +60,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> \tserial@12C00000 {\n" + "> \tserial at 12C00000 {\n" "> \t\tclocks = <&clock 257>, <&clock 128>;\n" "> \t\tclock-names = \"uart\", \"clk_uart_baud0\";\n" "> --\n" @@ -80,4 +71,4 @@ "Thanks,\n" Kukjin -25877369ef4b9d968bb3987ea2ebb17e2fa80d573848fafec87b84de9b7075b7 +53e57fdb8b8fab7d62300ab720c1fb87285d07dea4ed77b9fbba1351aa893177
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.