diff for duplicates of <87inpwf7e7.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 4a3b3c1..0001a83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,10 +28,10 @@ Gregory > }; > > - mdio { -> + mdio at 72004 { +> + mdio@72004 { > status = "okay"; > + -> + switch at 0 { +> + switch@0 { > + compatible = "marvell,mv88e6095"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -41,32 +41,32 @@ Gregory > + #address-cells = <1>; > + #size-cells = <0>; > + -> + port at 0 { +> + port@0 { > + reg = <0>; > + label = "lan4"; > + }; > + -> + port at 1 { +> + port@1 { > + reg = <1>; > + label = "lan3"; > + }; > + -> + port at 2 { +> + port@2 { > + reg = <2>; > + label = "lan2"; > + }; > + -> + port at 3 { +> + port@3 { > + reg = <3>; > + label = "lan1"; > + }; > + -> + port at 4 { +> + port@4 { > + reg = <4>; > + label = "wan"; > + }; > + -> + port at 5 { +> + port@5 { > + reg = <5>; > + label = "cpu"; > + ethernet = <ð2>; @@ -80,11 +80,11 @@ Gregory > + }; > }; > -> sata at a8000 { +> sata@a8000 { > @@ -261,6 +309,8 @@ > }; > -> dsa at 0 { +> dsa@0 { > + status = "disabled"; > + > compatible = "marvell,dsa"; diff --git a/a/content_digest b/N1/content_digest index 0e1cc8b..c829b17 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,19 @@ "ref\020170102022249.10657-1-f.fainelli@gmail.com\0" "ref\020170102022249.10657-3-f.fainelli@gmail.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH 2/8] ARM: dts: armada-38x: Utilize new DSA binding\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH 2/8] ARM: dts: armada-38x: Utilize new DSA binding\0" "Date\0Tue, 03 Jan 2017 17:14:08 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Florian Fainelli <f.fainelli@gmail.com>\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + Andrew Lunn <andrew@lunn.ch> + Jason Cooper <jason@lakedaemon.net> + vivien.didelot@savoirfairelinux.com + Russell King <linux@armlinux.org.uk> + open list <linux-kernel@vger.kernel.org> + open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS <devicetree@vger.kernel.org> + Rob Herring <robh+dt@kernel.org> + linux-arm-kernel@lists.infradead.org + " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" "\00:1\0" "b\0" "Hi Florian,\n" @@ -36,10 +46,10 @@ "> \t\t\t};\n" "> \n" "> -\t\t\tmdio {\n" - "> +\t\t\tmdio at 72004 {\n" + "> +\t\t\tmdio@72004 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\tswitch at 0 {\n" + "> +\t\t\t\tswitch@0 {\n" "> +\t\t\t\t\tcompatible = \"marvell,mv88e6095\";\n" "> +\t\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t\t#size-cells = <0>;\n" @@ -49,32 +59,32 @@ "> +\t\t\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\t\t\tport at 0 {\n" + "> +\t\t\t\t\t\tport@0 {\n" "> +\t\t\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan4\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 1 {\n" + "> +\t\t\t\t\t\tport@1 {\n" "> +\t\t\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan3\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 2 {\n" + "> +\t\t\t\t\t\tport@2 {\n" "> +\t\t\t\t\t\t\treg = <2>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan2\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 3 {\n" + "> +\t\t\t\t\t\tport@3 {\n" "> +\t\t\t\t\t\t\treg = <3>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan1\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 4 {\n" + "> +\t\t\t\t\t\tport@4 {\n" "> +\t\t\t\t\t\t\treg = <4>;\n" "> +\t\t\t\t\t\t\tlabel = \"wan\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 5 {\n" + "> +\t\t\t\t\t\tport@5 {\n" "> +\t\t\t\t\t\t\treg = <5>;\n" "> +\t\t\t\t\t\t\tlabel = \"cpu\";\n" "> +\t\t\t\t\t\t\tethernet = <ð2>;\n" @@ -88,11 +98,11 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tsata at a8000 {\n" + "> \t\t\tsata@a8000 {\n" "> @@ -261,6 +309,8 @@\n" "> \t};\n" "> \n" - "> \tdsa at 0 {\n" + "> \tdsa@0 {\n" "> +\t\tstatus = \"disabled\";\n" "> +\n" "> \t\tcompatible = \"marvell,dsa\";\n" @@ -108,4 +118,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -450e89be22380551e7042566c245d59eb62ca82360b612fb739f7cb61dc143d6 +c2aadba4916316d5cf2b397917a0e2da68e51d15610665abe42cb22ce0ce34dc
diff --git a/a/1.txt b/N2/1.txt index 4a3b3c1..0001a83 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -28,10 +28,10 @@ Gregory > }; > > - mdio { -> + mdio at 72004 { +> + mdio@72004 { > status = "okay"; > + -> + switch at 0 { +> + switch@0 { > + compatible = "marvell,mv88e6095"; > + #address-cells = <1>; > + #size-cells = <0>; @@ -41,32 +41,32 @@ Gregory > + #address-cells = <1>; > + #size-cells = <0>; > + -> + port at 0 { +> + port@0 { > + reg = <0>; > + label = "lan4"; > + }; > + -> + port at 1 { +> + port@1 { > + reg = <1>; > + label = "lan3"; > + }; > + -> + port at 2 { +> + port@2 { > + reg = <2>; > + label = "lan2"; > + }; > + -> + port at 3 { +> + port@3 { > + reg = <3>; > + label = "lan1"; > + }; > + -> + port at 4 { +> + port@4 { > + reg = <4>; > + label = "wan"; > + }; > + -> + port at 5 { +> + port@5 { > + reg = <5>; > + label = "cpu"; > + ethernet = <ð2>; @@ -80,11 +80,11 @@ Gregory > + }; > }; > -> sata at a8000 { +> sata@a8000 { > @@ -261,6 +309,8 @@ > }; > -> dsa at 0 { +> dsa@0 { > + status = "disabled"; > + > compatible = "marvell,dsa"; diff --git a/a/content_digest b/N2/content_digest index 0e1cc8b..1af4e01 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,19 @@ "ref\020170102022249.10657-1-f.fainelli@gmail.com\0" "ref\020170102022249.10657-3-f.fainelli@gmail.com\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH 2/8] ARM: dts: armada-38x: Utilize new DSA binding\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH 2/8] ARM: dts: armada-38x: Utilize new DSA binding\0" "Date\0Tue, 03 Jan 2017 17:14:08 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Florian Fainelli <f.fainelli@gmail.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + vivien.didelot@savoirfairelinux.com + Jason Cooper <jason@lakedaemon.net> + Andrew Lunn <andrew@lunn.ch> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + Russell King <linux@armlinux.org.uk> + devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) + " linux-kernel@vger.kernel.org (open list)\0" "\00:1\0" "b\0" "Hi Florian,\n" @@ -36,10 +46,10 @@ "> \t\t\t};\n" "> \n" "> -\t\t\tmdio {\n" - "> +\t\t\tmdio at 72004 {\n" + "> +\t\t\tmdio@72004 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\tswitch at 0 {\n" + "> +\t\t\t\tswitch@0 {\n" "> +\t\t\t\t\tcompatible = \"marvell,mv88e6095\";\n" "> +\t\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t\t#size-cells = <0>;\n" @@ -49,32 +59,32 @@ "> +\t\t\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\t\t\tport at 0 {\n" + "> +\t\t\t\t\t\tport@0 {\n" "> +\t\t\t\t\t\t\treg = <0>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan4\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 1 {\n" + "> +\t\t\t\t\t\tport@1 {\n" "> +\t\t\t\t\t\t\treg = <1>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan3\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 2 {\n" + "> +\t\t\t\t\t\tport@2 {\n" "> +\t\t\t\t\t\t\treg = <2>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan2\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 3 {\n" + "> +\t\t\t\t\t\tport@3 {\n" "> +\t\t\t\t\t\t\treg = <3>;\n" "> +\t\t\t\t\t\t\tlabel = \"lan1\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 4 {\n" + "> +\t\t\t\t\t\tport@4 {\n" "> +\t\t\t\t\t\t\treg = <4>;\n" "> +\t\t\t\t\t\t\tlabel = \"wan\";\n" "> +\t\t\t\t\t\t};\n" "> +\n" - "> +\t\t\t\t\t\tport at 5 {\n" + "> +\t\t\t\t\t\tport@5 {\n" "> +\t\t\t\t\t\t\treg = <5>;\n" "> +\t\t\t\t\t\t\tlabel = \"cpu\";\n" "> +\t\t\t\t\t\t\tethernet = <ð2>;\n" @@ -88,11 +98,11 @@ "> +\t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> \t\t\tsata at a8000 {\n" + "> \t\t\tsata@a8000 {\n" "> @@ -261,6 +309,8 @@\n" "> \t};\n" "> \n" - "> \tdsa at 0 {\n" + "> \tdsa@0 {\n" "> +\t\tstatus = \"disabled\";\n" "> +\n" "> \t\tcompatible = \"marvell,dsa\";\n" @@ -108,4 +118,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -450e89be22380551e7042566c245d59eb62ca82360b612fb739f7cb61dc143d6 +569fdc38e267c5e0ae675d0c6f033a654bdf59eaba19d9ed6377cca51be5bcf3
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.