diff for duplicates of <20140825160118.GG17254@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 1e0fc33..b30e7cc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ > cpts_clock_mult = <0x80000000>; > cpts_clock_shift = <29>; > + syscon = <&cm>; -> cpsw_emac0: slave@0 { +> cpsw_emac0: slave at 0 { > phy_id = <&davinci_mdio>, <0>; > phy-mode = "rgmii-txid"; > @@ -85,6 +88,7 @@ Examples: @@ -43,7 +43,7 @@ > cpts_clock_mult = <0x80000000>; > cpts_clock_shift = <29>; > + syscon = <&cm>; -> cpsw_emac0: slave@0 { +> cpsw_emac0: slave at 0 { > phy_id = <&davinci_mdio>, <0>; > phy-mode = "rgmii-txid"; > diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig diff --git a/a/content_digest b/N1/content_digest index 48f91d3..c7e43b1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01408947828-22316-1-git-send-email-mpa@pengutronix.de\0" "ref\01408947828-22316-6-git-send-email-mpa@pengutronix.de\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH v5 5/7] net: cpsw: Add am33xx MACID readout\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH v5 5/7] net: cpsw: Add am33xx MACID readout\0" "Date\0Mon, 25 Aug 2014 09:01:19 -0700\0" - "To\0Markus Pargmann <mpa@pengutronix.de>\0" - "Cc\0David S. Miller <davem@davemloft.net>" - " Beno\303\256t Cousson <bcousson@baylibre.com>" - Wolfram Sang <wsa@the-dreams.de> - Steven Rostedt <rostedt@goodmis.org> - Mugunthan V N <mugunthanvnm@ti.com> - linux-omap@vger.kernel.org - devicetree@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " kernel@pengutronix.de\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Markus Pargmann <mpa@pengutronix.de> [140824 23:24]:\n" @@ -52,7 +43,7 @@ "> \t\tcpts_clock_mult = <0x80000000>;\n" "> \t\tcpts_clock_shift = <29>;\n" "> +\t\tsyscon = <&cm>;\n" - "> \t\tcpsw_emac0: slave@0 {\n" + "> \t\tcpsw_emac0: slave at 0 {\n" "> \t\t\tphy_id = <&davinci_mdio>, <0>;\n" "> \t\t\tphy-mode = \"rgmii-txid\";\n" "> @@ -85,6 +88,7 @@ Examples:\n" @@ -60,7 +51,7 @@ "> \t\tcpts_clock_mult = <0x80000000>;\n" "> \t\tcpts_clock_shift = <29>;\n" "> +\t\tsyscon = <&cm>;\n" - "> \t\tcpsw_emac0: slave@0 {\n" + "> \t\tcpsw_emac0: slave at 0 {\n" "> \t\t\tphy_id = <&davinci_mdio>, <0>;\n" "> \t\t\tphy-mode = \"rgmii-txid\";\n" "> diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig\n" @@ -166,4 +157,4 @@ "\n" Tony -f4919834877a0b31af15475720940c8822f5089635f3bd84998097b32c1a76cc +ee6b6a86989c40340e0def6fd9f80edf51b8f48c9f3eda507a91b170e043aa6b
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.