diff for duplicates of <201403191333.01095.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index c929c3d..b060173 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -84,13 +84,13 @@ index d53d376..ec216e0 100644 - #size-cells = <1>; - - compatible = "altr,socfpga-stmmac"; -+gmac0: ethernet at ff700000 { ++gmac0: ethernet@ff700000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; altr,sysmgr-syscon = <&sysmgr 0x60>; status = "disabled"; - ranges; - -- gmac0: gmac0 at ff700000 { +- gmac0: gmac0@ff700000 { - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff700000 0x2000>; - interrupts = <0 115 4>; @@ -117,12 +117,12 @@ index 6d7eaa4..1595712 100644 - #size-cells = <1>; - compatible = "altr,socfpga-stmmac"; - altr,sysmgr-syscon = <&sysmgr 0x60>; -+ gmac0: ethernet at ff700000 { ++ gmac0: ethernet@ff700000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; status = "disabled"; - ranges; - -- gmac0: gmac0 at ff700000 { +- gmac0: gmac0@ff700000 { - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff700000 0x2000>; - interrupts = <0 115 4>; @@ -143,12 +143,12 @@ index 6d7eaa4..1595712 100644 - #size-cells = <1>; - compatible = "altr,socfpga-stmmac"; - altr,sysmgr-syscon = <&sysmgr 0x60>; -+ gmac1: ethernet at ff702000 { ++ gmac1: ethernet@ff702000 { + compatible = "altr,socfpga-stmmac", "snps,dwmac-3.70a", "snps,dwmac"; status = "disabled"; - ranges; - -- gmac1: gmac1 at ff702000 { +- gmac1: gmac1@ff702000 { - device_type = "network"; - compatible = "snps,dwmac-3.70a", "snps,dwmac"; - reg = <0xff702000 0x2000>; @@ -165,7 +165,7 @@ index 6d7eaa4..1595712 100644 + clocks = <&emac1_clk>; }; - L2: l2-cache at fffef000 { + L2: l2-cache@fffef000 { diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index f2d7c70..f8d5112 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig diff --git a/a/content_digest b/N1/content_digest index 2d3cb4c..1138522 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,15 @@ - "From\0arnd@arndb.de (Arnd Bergmann)\0" + "From\0Arnd Bergmann <arnd@arndb.de>\0" "Subject\0stmmac-socfpga breakage in arm-soc\0" "Date\0Wed, 19 Mar 2014 13:33:00 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Dinh Nguyen <dinguyen@altera.com>\0" + "Cc\0David S. Miller <davem@davemloft.net>" + netdev@vger.kernel.org + arm@kernel.org + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + Giuseppe Cavallaro <peppe.cavallaro@st.com> + Srinivas Kandagatla <srinivas.kandagatla@st.com> + " Hans de Goede <hdegoede@redhat.com>\0" "\00:1\0" "b\0" "Hi Dinh,\n" @@ -90,13 +98,13 @@ "-\t#size-cells = <1>;\n" "-\n" "-\tcompatible = \"altr,socfpga-stmmac\";\n" - "+gmac0: ethernet at ff700000 {\n" + "+gmac0: ethernet@ff700000 {\n" "+\tcompatible = \"altr,socfpga-stmmac\", \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" " \taltr,sysmgr-syscon = <&sysmgr 0x60>;\n" " \tstatus = \"disabled\";\n" "-\tranges;\n" "-\n" - "-\tgmac0: gmac0 at ff700000 {\n" + "-\tgmac0: gmac0@ff700000 {\n" "-\t\tcompatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" "-\t\treg = <0xff700000 0x2000>;\n" "-\t\tinterrupts = <0 115 4>;\n" @@ -123,12 +131,12 @@ "-\t\t\t#size-cells = <1>;\n" "-\t\t\tcompatible = \"altr,socfpga-stmmac\";\n" "-\t\t\taltr,sysmgr-syscon = <&sysmgr 0x60>;\n" - "+\t\tgmac0: ethernet at ff700000 {\n" + "+\t\tgmac0: ethernet@ff700000 {\n" "+\t\t\tcompatible = \"altr,socfpga-stmmac\", \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" " \t\t\tstatus = \"disabled\";\n" "-\t\t\tranges;\n" "-\n" - "-\t\t\tgmac0: gmac0 at ff700000 {\n" + "-\t\t\tgmac0: gmac0@ff700000 {\n" "-\t\t\t\tcompatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" "-\t\t\t\treg = <0xff700000 0x2000>;\n" "-\t\t\t\tinterrupts = <0 115 4>;\n" @@ -149,12 +157,12 @@ "-\t\t\t#size-cells = <1>;\n" "-\t\t\tcompatible = \"altr,socfpga-stmmac\";\n" "-\t\t\taltr,sysmgr-syscon = <&sysmgr 0x60>;\n" - "+\t\tgmac1: ethernet at ff702000 {\n" + "+\t\tgmac1: ethernet@ff702000 {\n" "+\t\t\tcompatible = \"altr,socfpga-stmmac\", \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" " \t\t\tstatus = \"disabled\";\n" "-\t\t\tranges;\n" "-\n" - "-\t\t\tgmac1: gmac1 at ff702000 {\n" + "-\t\t\tgmac1: gmac1@ff702000 {\n" "-\t\t\t\tdevice_type = \"network\";\n" "-\t\t\t\tcompatible = \"snps,dwmac-3.70a\", \"snps,dwmac\";\n" "-\t\t\t\treg = <0xff702000 0x2000>;\n" @@ -171,7 +179,7 @@ "+\t\t\tclocks = <&emac1_clk>;\n" " \t\t};\n" " \n" - " \t\tL2: l2-cache at fffef000 {\n" + " \t\tL2: l2-cache@fffef000 {\n" "diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig\n" "index f2d7c70..f8d5112 100644\n" "--- a/drivers/net/ethernet/stmicro/stmmac/Kconfig\n" @@ -366,4 +374,4 @@ " \t{ .compatible = \"st,spear600-gmac\"},\n" " \t{ .compatible = \"snps,dwmac-3.610\"}," -53ddf4fab60b802438287addddb85a6a8ee8ddf5aea32f20aebbf1118bd2dc14 +2eb8d19457564f04d63f2d96d0e9a0a9c2cc713d501a0b49f85c7153b8d8d230
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.