diff for duplicates of <55914278.5070106@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 87a4250..7ec6bc9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,7 +28,7 @@ Gregory > @@ -270,7 +270,6 @@ > }; > -> eth0: ethernet at 70000 { +> eth0: ethernet@70000 { > - compatible = "marvell,armada-370-neta"; > reg = <0x70000 0x4000>; > interrupts = <8>; @@ -36,7 +36,7 @@ Gregory > @@ -286,7 +285,6 @@ > }; > -> eth1: ethernet at 74000 { +> eth1: ethernet@74000 { > - compatible = "marvell,armada-370-neta"; > reg = <0x74000 0x4000>; > interrupts = <10>; @@ -50,11 +50,11 @@ Gregory > }; > }; > + -> + ethernet at 70000 { +> + ethernet@70000 { > + compatible = "marvell,armada-370-neta"; > + }; > + -> + ethernet at 74000 { +> + ethernet@74000 { > + compatible = "marvell,armada-370-neta"; > + }; > }; @@ -67,7 +67,7 @@ Gregory > @@ -318,7 +318,7 @@ > }; > -> eth3: ethernet at 34000 { +> eth3: ethernet@34000 { > - compatible = "marvell,armada-370-neta"; > + compatible = "marvell,armada-xp-neta"; > reg = <0x34000 0x4000>; @@ -80,7 +80,7 @@ Gregory > @@ -356,7 +356,7 @@ > }; > -> eth3: ethernet at 34000 { +> eth3: ethernet@34000 { > - compatible = "marvell,armada-370-neta"; > + compatible = "marvell,armada-xp-neta"; > reg = <0x34000 0x4000>; @@ -93,7 +93,7 @@ Gregory > @@ -177,7 +177,7 @@ > }; > -> eth2: ethernet at 30000 { +> eth2: ethernet@30000 { > - compatible = "marvell,armada-370-neta"; > + compatible = "marvell,armada-xp-neta"; > reg = <0x30000 0x4000>; @@ -103,15 +103,15 @@ Gregory > }; > }; > -> + ethernet at 70000 { +> + ethernet@70000 { > + compatible = "marvell,armada-xp-neta"; > + }; > + -> + ethernet at 74000 { +> + ethernet@74000 { > + compatible = "marvell,armada-xp-neta"; > + }; > + -> xor at f0900 { +> xor@f0900 { > compatible = "marvell,orion-xor"; > reg = <0xF0900 0x100 > diff --git a/a/content_digest b/N1/content_digest index 7241d57..1db5aaf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,17 @@ "ref\01434547162-6275-1-git-send-email-simon.guinot@sequanux.org\0" "ref\01434547162-6275-3-git-send-email-simon.guinot@sequanux.org\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH v2 2/3] ARM: mvebu: update Ethernet compatible string for Armada XP\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH v2 2/3] ARM: mvebu: update Ethernet compatible string for Armada XP\0" "Date\0Mon, 29 Jun 2015 15:04:56 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Simon Guinot <simon.guinot@sequanux.org>\0" + "Cc\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>" + Jason Cooper <jason@lakedaemon.net> + Andrew Lunn <andrew@lunn.ch> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + netdev@vger.kernel.org + linux-arm-kernel@lists.infradead.org + Vincent Donnefort <vdonnefort@gmail.com> + " stable@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Simon,\n" @@ -36,7 +44,7 @@ "> @@ -270,7 +270,6 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\teth0: ethernet at 70000 {\n" + "> \t\t\teth0: ethernet@70000 {\n" "> -\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> \t\t\t\treg = <0x70000 0x4000>;\n" "> \t\t\t\tinterrupts = <8>;\n" @@ -44,7 +52,7 @@ "> @@ -286,7 +285,6 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\teth1: ethernet at 74000 {\n" + "> \t\t\teth1: ethernet@74000 {\n" "> -\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> \t\t\t\treg = <0x74000 0x4000>;\n" "> \t\t\t\tinterrupts = <10>;\n" @@ -58,11 +66,11 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 70000 {\n" + "> +\t\t\tethernet@70000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 74000 {\n" + "> +\t\t\tethernet@74000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> +\t\t\t};\n" "> \t\t};\n" @@ -75,7 +83,7 @@ "> @@ -318,7 +318,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\teth3: ethernet at 34000 {\n" + "> \t\t\teth3: ethernet@34000 {\n" "> -\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> +\t\t\t\tcompatible = \"marvell,armada-xp-neta\";\n" "> \t\t\t\treg = <0x34000 0x4000>;\n" @@ -88,7 +96,7 @@ "> @@ -356,7 +356,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\teth3: ethernet at 34000 {\n" + "> \t\t\teth3: ethernet@34000 {\n" "> -\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> +\t\t\t\tcompatible = \"marvell,armada-xp-neta\";\n" "> \t\t\t\treg = <0x34000 0x4000>;\n" @@ -101,7 +109,7 @@ "> @@ -177,7 +177,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\teth2: ethernet at 30000 {\n" + "> \t\t\teth2: ethernet@30000 {\n" "> -\t\t\t\tcompatible = \"marvell,armada-370-neta\";\n" "> +\t\t\t\tcompatible = \"marvell,armada-xp-neta\";\n" "> \t\t\t\treg = <0x30000 0x4000>;\n" @@ -111,15 +119,15 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tethernet at 70000 {\n" + "> +\t\t\tethernet@70000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-xp-neta\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tethernet at 74000 {\n" + "> +\t\t\tethernet@74000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-xp-neta\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\txor at f0900 {\n" + "> \t\t\txor@f0900 {\n" "> \t\t\t\tcompatible = \"marvell,orion-xor\";\n" "> \t\t\t\treg = <0xF0900 0x100\n" "> \n" @@ -131,4 +139,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -2c6f7c9392ac77bf8bff448c8c40b7d2846eedcc41161ced5ea1e508296a776c +57129907ad666cbb427978eeb11f7169ee562350bbb5ec69520544b5d8302e96
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.