diff for duplicates of <20160716161745.GF1777@lunn.ch> diff --git a/a/1.txt b/N1/1.txt index 24812f6..1215175 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ Otherwise this looks O.K. Andrew -> Signed-off-by: Jamie Lentin <jm@lentin.co.uk> +> Signed-off-by: Jamie Lentin <jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org> > --- > .../bindings/arm/marvell/marvell,orion5x.txt | 1 + > arch/arm/boot/dts/orion5x-mv88f5181.dtsi | 35 ++++++++++++++++++++++ @@ -32,7 +32,7 @@ Otherwise this looks O.K. > +++ b/arch/arm/boot/dts/orion5x-mv88f5181.dtsi > @@ -0,0 +1,35 @@ > +/* -> + * Copyright (C) 2016 Jamie Lentin <jm@lentin.co.uk> +> + * Copyright (C) 2016 Jamie Lentin <jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org> > + * > + * This file is licensed under the terms of the GNU General Public > + * License version 2. This program is licensed "as is" without any @@ -48,18 +48,18 @@ Otherwise this looks O.K. > + compatible = "marvell,orion5x-88f5181-mbus", "simple-bus"; > + > + internal-regs { -> + pinctrl: pinctrl at 10000 { +> + pinctrl: pinctrl@10000 { > + compatible = "marvell,88f5181-pinctrl"; > + reg = <0x10000 0x8>, <0x10050 0x4>; > + }; > + -> + core_clk: core-clocks at 10030 { +> + core_clk: core-clocks@10030 { > + compatible = "marvell,mv88f5181-core-clock"; > + reg = <0x10010 0x4>; > + #clock-cells = <1>; > + }; > + -> + mbusc: mbus-controller at 20000 { +> + mbusc: mbus-controller@20000 { > + compatible = "marvell,mbus-controller"; > + reg = <0x20000 0x100>, <0x1500 0x20>; > + }; @@ -68,4 +68,8 @@ Otherwise this looks O.K. > +}; > -- > 2.8.1 -> +> +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index edc7134..d27ce85 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,19 @@ "ref\01468679348-10522-1-git-send-email-jm@lentin.co.uk\0" "ref\01468679348-10522-6-git-send-email-jm@lentin.co.uk\0" - "From\0andrew@lunn.ch (Andrew Lunn)\0" - "Subject\0[PATCH v0 05/10] arm: orion5x: Add DT include for mv88f5181\0" + "ref\01468679348-10522-6-git-send-email-jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org\0" + "From\0Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\0" + "Subject\0Re: [PATCH v0 05/10] arm: orion5x: Add DT include for mv88f5181\0" "Date\0Sat, 16 Jul 2016 18:17:45 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jamie Lentin <jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org>\0" + "Cc\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>" + Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + Imre Kaloz <kaloz-p3rKhJxN3npAfugRpC6u6w@public.gmane.org> + Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Sat, Jul 16, 2016 at 03:29:03PM +0100, Jamie Lentin wrote:\n" @@ -14,7 +24,7 @@ "\n" "\t Andrew\n" "\n" - "> Signed-off-by: Jamie Lentin <jm@lentin.co.uk>\n" + "> Signed-off-by: Jamie Lentin <jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org>\n" "> ---\n" "> .../bindings/arm/marvell/marvell,orion5x.txt | 1 +\n" "> arch/arm/boot/dts/orion5x-mv88f5181.dtsi | 35 ++++++++++++++++++++++\n" @@ -40,7 +50,7 @@ "> +++ b/arch/arm/boot/dts/orion5x-mv88f5181.dtsi\n" "> @@ -0,0 +1,35 @@\n" "> +/*\n" - "> + * Copyright (C) 2016 Jamie Lentin <jm@lentin.co.uk>\n" + "> + * Copyright (C) 2016 Jamie Lentin <jm-Pj/HzkgeCk7QXOPxS62xeg@public.gmane.org>\n" "> + *\n" "> + * This file is licensed under the terms of the GNU General Public\n" "> + * License version 2. This program is licensed \"as is\" without any\n" @@ -56,18 +66,18 @@ "> +\t\tcompatible = \"marvell,orion5x-88f5181-mbus\", \"simple-bus\";\n" "> +\n" "> +\t\tinternal-regs {\n" - "> +\t\t\tpinctrl: pinctrl at 10000 {\n" + "> +\t\t\tpinctrl: pinctrl@10000 {\n" "> +\t\t\t\tcompatible = \"marvell,88f5181-pinctrl\";\n" "> +\t\t\t\treg = <0x10000 0x8>, <0x10050 0x4>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tcore_clk: core-clocks at 10030 {\n" + "> +\t\t\tcore_clk: core-clocks@10030 {\n" "> +\t\t\t\tcompatible = \"marvell,mv88f5181-core-clock\";\n" "> +\t\t\t\treg = <0x10010 0x4>;\n" "> +\t\t\t\t#clock-cells = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmbusc: mbus-controller at 20000 {\n" + "> +\t\t\tmbusc: mbus-controller@20000 {\n" "> +\t\t\t\tcompatible = \"marvell,mbus-controller\";\n" "> +\t\t\t\treg = <0x20000 0x100>, <0x1500 0x20>;\n" "> +\t\t\t};\n" @@ -76,6 +86,10 @@ "> +};\n" "> -- \n" "> 2.8.1\n" - > + "> \n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -84f74172b7a4f074537e3496137a2362700783a8be75c84c37fdc68f5faea189 +d7967d14e3abad72257f4bdbce4bc2730c1b359f0e129793972473c80ed535f5
diff --git a/a/1.txt b/N2/1.txt index 24812f6..9cc21f4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -48,18 +48,18 @@ Otherwise this looks O.K. > + compatible = "marvell,orion5x-88f5181-mbus", "simple-bus"; > + > + internal-regs { -> + pinctrl: pinctrl at 10000 { +> + pinctrl: pinctrl@10000 { > + compatible = "marvell,88f5181-pinctrl"; > + reg = <0x10000 0x8>, <0x10050 0x4>; > + }; > + -> + core_clk: core-clocks at 10030 { +> + core_clk: core-clocks@10030 { > + compatible = "marvell,mv88f5181-core-clock"; > + reg = <0x10010 0x4>; > + #clock-cells = <1>; > + }; > + -> + mbusc: mbus-controller at 20000 { +> + mbusc: mbus-controller@20000 { > + compatible = "marvell,mbus-controller"; > + reg = <0x20000 0x100>, <0x1500 0x20>; > + }; diff --git a/a/content_digest b/N2/content_digest index edc7134..0e07c6f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,18 @@ "ref\01468679348-10522-1-git-send-email-jm@lentin.co.uk\0" "ref\01468679348-10522-6-git-send-email-jm@lentin.co.uk\0" - "From\0andrew@lunn.ch (Andrew Lunn)\0" - "Subject\0[PATCH v0 05/10] arm: orion5x: Add DT include for mv88f5181\0" + "From\0Andrew Lunn <andrew@lunn.ch>\0" + "Subject\0Re: [PATCH v0 05/10] arm: orion5x: Add DT include for mv88f5181\0" "Date\0Sat, 16 Jul 2016 18:17:45 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jamie Lentin <jm@lentin.co.uk>\0" + "Cc\0Jason Cooper <jason@lakedaemon.net>" + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + Gregory Clement <gregory.clement@free-electrons.com> + Imre Kaloz <kaloz@openwrt.org> + Florian Fainelli <f.fainelli@gmail.com> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + netdev@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On Sat, Jul 16, 2016 at 03:29:03PM +0100, Jamie Lentin wrote:\n" @@ -56,18 +65,18 @@ "> +\t\tcompatible = \"marvell,orion5x-88f5181-mbus\", \"simple-bus\";\n" "> +\n" "> +\t\tinternal-regs {\n" - "> +\t\t\tpinctrl: pinctrl at 10000 {\n" + "> +\t\t\tpinctrl: pinctrl@10000 {\n" "> +\t\t\t\tcompatible = \"marvell,88f5181-pinctrl\";\n" "> +\t\t\t\treg = <0x10000 0x8>, <0x10050 0x4>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tcore_clk: core-clocks at 10030 {\n" + "> +\t\t\tcore_clk: core-clocks@10030 {\n" "> +\t\t\t\tcompatible = \"marvell,mv88f5181-core-clock\";\n" "> +\t\t\t\treg = <0x10010 0x4>;\n" "> +\t\t\t\t#clock-cells = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmbusc: mbus-controller at 20000 {\n" + "> +\t\t\tmbusc: mbus-controller@20000 {\n" "> +\t\t\t\tcompatible = \"marvell,mbus-controller\";\n" "> +\t\t\t\treg = <0x20000 0x100>, <0x1500 0x20>;\n" "> +\t\t\t};\n" @@ -78,4 +87,4 @@ "> 2.8.1\n" > -84f74172b7a4f074537e3496137a2362700783a8be75c84c37fdc68f5faea189 +452188483b584f523354b5ea0ede56ca767d44a6f78c1919f5282eb276be32ad
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.