diff for duplicates of <110401ce98d2$d304e2f0$790ea8d0$@org> diff --git a/a/1.txt b/N1/1.txt index d27e9a6..03debd5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ Padmavathi Venna wrote: > + interrupt-parent = <&gic>; > + ranges; > + -> + pdma0: pdma@121A0000 { +> + pdma0: pdma at 121A0000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x121A0000 0x1000>; > + interrupts = <0 34 0>; @@ -36,7 +36,7 @@ Padmavathi Venna wrote: > + #dma-requests = <32>; > + }; > + -> + pdma1: pdma@121B0000 { +> + pdma1: pdma at 121B0000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x121B0000 0x1000>; > + interrupts = <0 35 0>; @@ -45,7 +45,7 @@ Padmavathi Venna wrote: > + #dma-requests = <32>; > + }; > + -> + mdma0: mdma@10800000 { +> + mdma0: mdma at 10800000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x10800000 0x1000>; > + interrupts = <0 33 0>; @@ -54,7 +54,7 @@ Padmavathi Venna wrote: > + #dma-requests = <1>; > + }; > + -> + mdma1: mdma@11C10000 { +> + mdma1: mdma at 11C10000 { > + compatible = "arm,pl330", "arm,primecell"; > + reg = <0x11C10000 0x1000>; > + interrupts = <0 124 0>; @@ -64,7 +64,7 @@ Padmavathi Venna wrote: > + }; > + }; > + -> dwmmc_0: dwmmc0@12200000 { +> dwmmc_0: dwmmc0 at 12200000 { > compatible = "samsung,exynos5250-dw-mshc"; > interrupts = <0 75 0>; > diff --git a/arch/arm/boot/dts/exynos5250.dtsi @@ -82,7 +82,7 @@ Padmavathi Venna wrote: > - interrupt-parent = <&gic>; > - ranges; > - -> pdma0: pdma@121A0000 { +> pdma0: pdma at 121A0000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x121A0000 0x1000>; > - interrupts = <0 34 0>; @@ -93,7 +93,7 @@ Padmavathi Venna wrote: > - #dma-requests = <32>; > }; > -> pdma1: pdma@121B0000 { +> pdma1: pdma at 121B0000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x121B0000 0x1000>; > - interrupts = <0 35 0>; @@ -104,7 +104,7 @@ Padmavathi Venna wrote: > - #dma-requests = <32>; > }; > -> mdma0: mdma@10800000 { +> mdma0: mdma at 10800000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x10800000 0x1000>; > - interrupts = <0 33 0>; @@ -115,7 +115,7 @@ Padmavathi Venna wrote: > - #dma-requests = <1>; > }; > -> mdma1: mdma@11C10000 { +> mdma1: mdma at 11C10000 { > - compatible = "arm,pl330", "arm,primecell"; > - reg = <0x11C10000 0x1000>; > - interrupts = <0 124 0>; diff --git a/a/content_digest b/N1/content_digest index 52a1558..9ab365c 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-2-git-send-email-padma.v@samsung.com\0" - "From\0Kukjin Kim <kgene@kernel.org>\0" - "Subject\0RE: [PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi\0" + "From\0kgene@kernel.org (Kukjin Kim)\0" + "Subject\0[PATCH 1/2] ARM: dts: Move the common DMA controller nodes to exynos5.dtsi\0" "Date\0Wed, 14 Aug 2013 18:44:08 +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" @@ -44,7 +35,7 @@ "> +\t\tinterrupt-parent = <&gic>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tpdma0: pdma@121A0000 {\n" + "> +\t\tpdma0: pdma at 121A0000 {\n" "> +\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> +\t\t\treg = <0x121A0000 0x1000>;\n" "> +\t\t\tinterrupts = <0 34 0>;\n" @@ -53,7 +44,7 @@ "> +\t\t\t#dma-requests = <32>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpdma1: pdma@121B0000 {\n" + "> +\t\tpdma1: pdma at 121B0000 {\n" "> +\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> +\t\t\treg = <0x121B0000 0x1000>;\n" "> +\t\t\tinterrupts = <0 35 0>;\n" @@ -62,7 +53,7 @@ "> +\t\t\t#dma-requests = <32>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tmdma0: mdma@10800000 {\n" + "> +\t\tmdma0: mdma at 10800000 {\n" "> +\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> +\t\t\treg = <0x10800000 0x1000>;\n" "> +\t\t\tinterrupts = <0 33 0>;\n" @@ -71,7 +62,7 @@ "> +\t\t\t#dma-requests = <1>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tmdma1: mdma@11C10000 {\n" + "> +\t\tmdma1: mdma at 11C10000 {\n" "> +\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> +\t\t\treg = <0x11C10000 0x1000>;\n" "> +\t\t\tinterrupts = <0 124 0>;\n" @@ -81,7 +72,7 @@ "> +\t\t};\n" "> +\t};\n" "> +\n" - "> \tdwmmc_0: dwmmc0@12200000 {\n" + "> \tdwmmc_0: dwmmc0 at 12200000 {\n" "> \t\tcompatible = \"samsung,exynos5250-dw-mshc\";\n" "> \t\tinterrupts = <0 75 0>;\n" "> diff --git a/arch/arm/boot/dts/exynos5250.dtsi\n" @@ -99,7 +90,7 @@ "> -\t\tinterrupt-parent = <&gic>;\n" "> -\t\tranges;\n" "> -\n" - "> \t\tpdma0: pdma@121A0000 {\n" + "> \t\tpdma0: pdma at 121A0000 {\n" "> -\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> -\t\t\treg = <0x121A0000 0x1000>;\n" "> -\t\t\tinterrupts = <0 34 0>;\n" @@ -110,7 +101,7 @@ "> -\t\t\t#dma-requests = <32>;\n" "> \t\t};\n" "> \n" - "> \t\tpdma1: pdma@121B0000 {\n" + "> \t\tpdma1: pdma at 121B0000 {\n" "> -\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> -\t\t\treg = <0x121B0000 0x1000>;\n" "> -\t\t\tinterrupts = <0 35 0>;\n" @@ -121,7 +112,7 @@ "> -\t\t\t#dma-requests = <32>;\n" "> \t\t};\n" "> \n" - "> \t\tmdma0: mdma@10800000 {\n" + "> \t\tmdma0: mdma at 10800000 {\n" "> -\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> -\t\t\treg = <0x10800000 0x1000>;\n" "> -\t\t\tinterrupts = <0 33 0>;\n" @@ -132,7 +123,7 @@ "> -\t\t\t#dma-requests = <1>;\n" "> \t\t};\n" "> \n" - "> \t\tmdma1: mdma@11C10000 {\n" + "> \t\tmdma1: mdma at 11C10000 {\n" "> -\t\t\tcompatible = \"arm,pl330\", \"arm,primecell\";\n" "> -\t\t\treg = <0x11C10000 0x1000>;\n" "> -\t\t\tinterrupts = <0 124 0>;\n" @@ -152,4 +143,4 @@ "\n" - Kukjin -2ef9f1a7afcbf79b32458ba486dba537f3e2d7b2773bd930fd334bdfca3d0505 +549f113ed18b19e91d6109d62908ae7b5f1263be7a62d8d7fc05da520fa2a08d
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.