diff for duplicates of <531F02B0.6060302@samsung.com> diff --git a/a/1.txt b/N1/1.txt index d3a947a..7e9b56f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,20 +36,20 @@ Tomasz > / { > compatible = "samsung,exynos4212"; > -> - gic: interrupt-controller@10490000 { +> - gic: interrupt-controller at 10490000 { > - cpu-offset = <0x8000>; -> + combiner: interrupt-controller@10440000 { +> + combiner: interrupt-controller at 10440000 { > + samsung,combiner-nr = <18>; > }; > -> - interrupt-controller@10440000 { +> - interrupt-controller at 10440000 { > - samsung,combiner-nr = <18>; > - interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, > - <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, > - <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, > - <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, > - <0 107 0>, <0 108 0>; -> + gic: interrupt-controller@10490000 { +> + gic: interrupt-controller at 10490000 { > + cpu-offset = <0x8000>; > }; > }; @@ -61,12 +61,12 @@ Tomasz > / { > compatible = "samsung,exynos4412"; > -> - gic: interrupt-controller@10490000 { +> - gic: interrupt-controller at 10490000 { > - cpu-offset = <0x4000>; > - }; > - -> - interrupt-controller@10440000 { -> + combiner: interrupt-controller@10440000 { +> - interrupt-controller at 10440000 { +> + combiner: interrupt-controller at 10440000 { > samsung,combiner-nr = <20>; > - interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, > - <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, @@ -75,7 +75,7 @@ Tomasz > - <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; > }; > -> + gic: interrupt-controller@10490000 { +> + gic: interrupt-controller at 10490000 { > + cpu-offset = <0x4000>; > + }; > }; @@ -87,7 +87,7 @@ Tomasz > }; > }; > -> + combiner: interrupt-controller@10440000 { +> + combiner: interrupt-controller at 10440000 { > + interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, > + <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, > + <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, @@ -95,7 +95,7 @@ Tomasz > + <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; > + }; > + -> pinctrl_0: pinctrl@11400000 { +> pinctrl_0: pinctrl at 11400000 { > compatible = "samsung,exynos4x12-pinctrl"; > reg = <0x11400000 0x1000>; > diff --git a/a/content_digest b/N1/content_digest index 78005ac..145a8b9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,21 +1,9 @@ "ref\01394524494-30641-1-git-send-email-cw00.choi@samsung.com\0" "ref\01394524494-30641-5-git-send-email-cw00.choi@samsung.com\0" - "From\0Tomasz Figa <t.figa@samsung.com>\0" - "Subject\0Re: [PATCH 4/5] ARM: dts: exynos: Move common dt data for interrupt combiner controller\0" + "From\0t.figa@samsung.com (Tomasz Figa)\0" + "Subject\0[PATCH 4/5] ARM: dts: exynos: Move common dt data for interrupt combiner controller\0" "Date\0Tue, 11 Mar 2014 13:33:52 +0100\0" - "To\0Chanwoo Choi <cw00.choi@samsung.com>" - " kgene.kim@samsung.com\0" - "Cc\0linux-samsung-soc@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - kyungmin.park@samsung.com - rob.herring@calxeda.com - pawel.moll@arm.com - mark.rutland@arm.com - swarren@wwwdotorg.org - ijc+devicetree@hellion.org.uk - " linux@arm.linux.org.uk\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Chanwoo,\n" @@ -56,20 +44,20 @@ "> / {\n" "> \tcompatible = \"samsung,exynos4212\";\n" ">\n" - "> -\tgic: interrupt-controller@10490000 {\n" + "> -\tgic: interrupt-controller at 10490000 {\n" "> -\t\tcpu-offset = <0x8000>;\n" - "> +\tcombiner: interrupt-controller@10440000 {\n" + "> +\tcombiner: interrupt-controller at 10440000 {\n" "> +\t\tsamsung,combiner-nr = <18>;\n" "> \t};\n" ">\n" - "> -\tinterrupt-controller@10440000 {\n" + "> -\tinterrupt-controller at 10440000 {\n" "> -\t\tsamsung,combiner-nr = <18>;\n" "> -\t\tinterrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,\n" "> -\t\t\t <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,\n" "> -\t\t\t <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,\n" "> -\t\t\t <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,\n" "> -\t\t\t <0 107 0>, <0 108 0>;\n" - "> +\tgic: interrupt-controller@10490000 {\n" + "> +\tgic: interrupt-controller at 10490000 {\n" "> +\t\tcpu-offset = <0x8000>;\n" "> \t};\n" "> };\n" @@ -81,12 +69,12 @@ "> / {\n" "> \tcompatible = \"samsung,exynos4412\";\n" ">\n" - "> -\tgic: interrupt-controller@10490000 {\n" + "> -\tgic: interrupt-controller at 10490000 {\n" "> -\t\tcpu-offset = <0x4000>;\n" "> -\t};\n" "> -\n" - "> -\tinterrupt-controller@10440000 {\n" - "> +\tcombiner: interrupt-controller@10440000 {\n" + "> -\tinterrupt-controller at 10440000 {\n" + "> +\tcombiner: interrupt-controller at 10440000 {\n" "> \t\tsamsung,combiner-nr = <20>;\n" "> -\t\tinterrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,\n" "> -\t\t\t <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,\n" @@ -95,7 +83,7 @@ "> -\t\t\t <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;\n" "> \t};\n" ">\n" - "> +\tgic: interrupt-controller@10490000 {\n" + "> +\tgic: interrupt-controller at 10490000 {\n" "> +\t\tcpu-offset = <0x4000>;\n" "> +\t};\n" "> };\n" @@ -107,7 +95,7 @@ "> \t\t};\n" "> \t};\n" ">\n" - "> +\tcombiner: interrupt-controller@10440000 {\n" + "> +\tcombiner: interrupt-controller at 10440000 {\n" "> +\t\tinterrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,\n" "> +\t\t\t <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,\n" "> +\t\t\t <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,\n" @@ -115,9 +103,9 @@ "> +\t\t\t <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;\n" "> +\t};\n" "> +\n" - "> \tpinctrl_0: pinctrl@11400000 {\n" + "> \tpinctrl_0: pinctrl at 11400000 {\n" "> \t\tcompatible = \"samsung,exynos4x12-pinctrl\";\n" "> \t\treg = <0x11400000 0x1000>;\n" > -7398a752154b47191e4f3ffa160d23b4a7250c119447f847204240319777e61f +96c71fd9a61d1f7b899cf7c0f29e85f52d0ec9675cd5fc7d06a967204a099ea6
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.