diff for duplicates of <1437394575.10831.18.camel@transmode.se> diff --git a/a/1.txt b/N1/1.txt index f0606e4..7e02809 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,37 +1,34 @@ On Wed, 2015-04-29 at 12:29 +0300, Igal.Liberman wrote: > From: Igal Liberman <Igal.Liberman@freescale.com> ->=20 +> > This patch adds the Ethernet MAC driver support. ->=20 +> > Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com> > --- > drivers/net/ethernet/freescale/fman/inc/mac.h | 125 +++++ > drivers/net/ethernet/freescale/fman/mac/Makefile | 3 +- -> drivers/net/ethernet/freescale/fman/mac/mac-api.c | 605 +++++++++++++++= -++++++ -> drivers/net/ethernet/freescale/fman/mac/mac.c | 527 +++++++++++++++= -+++ +> drivers/net/ethernet/freescale/fman/mac/mac-api.c | 605 +++++++++++++++++++++ +> drivers/net/ethernet/freescale/fman/mac/mac.c | 527 ++++++++++++++++++ > 4 files changed, 1259 insertions(+), 1 deletion(-) > create mode 100644 drivers/net/ethernet/freescale/fman/inc/mac.h > create mode 100644 drivers/net/ethernet/freescale/fman/mac/mac-api.c > create mode 100644 drivers/net/ethernet/freescale/fman/mac/mac.c ->=20 -> diff --git a/drivers/net/ethernet/freescale/fman/inc/mac.h b/drivers/net/= -ethernet/freescale/fman/inc/mac.h +> +> diff --git a/drivers/net/ethernet/freescale/fman/inc/mac.h b/drivers/net/ethernet/freescale/fman/inc/mac.h > new file mode 100644 > index 0000000..2d27331 > --- /dev/null > +++ b/drivers/net/ethernet/freescale/fman/inc/mac.h ..... > + /* Get the rest of the PHY information */ -> + mac_dev->phy_node =3D of_parse_phandle(mac_node, "phy-handle", 0); +> + mac_dev->phy_node = of_parse_phandle(mac_node, "phy-handle", 0); > + if (!mac_dev->phy_node) { > + int sz; -> + const u32 *phy_id =3D of_get_property(mac_node, "fixed-link", +> + const u32 *phy_id = of_get_property(mac_node, "fixed-link", > + &sz); > + if (!phy_id || sz < sizeof(*phy_id)) { > + dev_err(dev, "No PHY (or fixed link) found\n"); -> + _errno =3D -EINVAL; +> + _errno = -EINVAL; > + goto _return_dev_set_drvdata; > + } > + @@ -41,8 +38,7 @@ ethernet/freescale/fman/inc/mac.h The above for fixed PHY does not work for me, changing it to does: -diff --git a/drivers/net/ethernet/freescale/fman/mac/mac.c b/drivers/net/et= -hernet/freescale/fman/mac/mac.c +diff --git a/drivers/net/ethernet/freescale/fman/mac/mac.c b/drivers/net/ethernet/freescale/fman/mac/mac.c index 4eb8f7c..a8be96a 100644 --- a/drivers/net/ethernet/freescale/fman/mac/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac/mac.c @@ -54,19 +50,16 @@ index 4eb8f7c..a8be96a 100644 #include <linux/of_net.h> #include <linux/device.h> #include <linux/phy.h> -@@ -399,7 +400,7 @@ static int __cold mac_probe(struct platform_device *_of= -_dev) -=20 +@@ -399,7 +400,7 @@ static int __cold mac_probe(struct platform_device *_of_dev) + /* Get the rest of the PHY information */ - mac_dev->phy_node =3D of_parse_phandle(mac_node, "phy-handle", 0); + mac_dev->phy_node = of_parse_phandle(mac_node, "phy-handle", 0); - if (!mac_dev->phy_node) { + if (0 && !mac_dev->phy_node) { int sz; - const u32 *phy_id =3D of_get_property(mac_node, "fixed-link= -", + const u32 *phy_id = of_get_property(mac_node, "fixed-link", &sz); -@@ -412,6 +413,16 @@ static int __cold mac_probe(struct platform_device *_o= -f_dev) +@@ -412,6 +413,16 @@ static int __cold mac_probe(struct platform_device *_of_dev) sprintf(mac_dev->fixed_bus_id, PHY_ID_FMT, "fixed-0", phy_id[0]); } @@ -75,8 +68,8 @@ f_dev) + * In the case of a fixed PHY, the DT node associated + * to the PHY is the Ethernet MAC DT node. + */ -+ _errno =3D of_phy_register_fixed_link(mac_node); ++ _errno = of_phy_register_fixed_link(mac_node); + if (_errno) + return _errno; -+ mac_dev->phy_node =3D of_node_get(mac_node); -+ }= ++ mac_dev->phy_node = of_node_get(mac_node); ++ } diff --git a/a/content_digest b/N1/content_digest index 9dfff72..ff7b9be 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -11,38 +11,35 @@ "b\0" "On Wed, 2015-04-29 at 12:29 +0300, Igal.Liberman wrote:\n" "> From: Igal Liberman <Igal.Liberman@freescale.com>\n" - ">=20\n" + "> \n" "> This patch adds the Ethernet MAC driver support.\n" - ">=20\n" + "> \n" "> Signed-off-by: Igal Liberman <Igal.Liberman@freescale.com>\n" "> ---\n" "> drivers/net/ethernet/freescale/fman/inc/mac.h | 125 +++++\n" "> drivers/net/ethernet/freescale/fman/mac/Makefile | 3 +-\n" - "> drivers/net/ethernet/freescale/fman/mac/mac-api.c | 605 +++++++++++++++=\n" - "++++++\n" - "> drivers/net/ethernet/freescale/fman/mac/mac.c | 527 +++++++++++++++=\n" - "+++\n" + "> drivers/net/ethernet/freescale/fman/mac/mac-api.c | 605 +++++++++++++++++++++\n" + "> drivers/net/ethernet/freescale/fman/mac/mac.c | 527 ++++++++++++++++++\n" "> 4 files changed, 1259 insertions(+), 1 deletion(-)\n" "> create mode 100644 drivers/net/ethernet/freescale/fman/inc/mac.h\n" "> create mode 100644 drivers/net/ethernet/freescale/fman/mac/mac-api.c\n" "> create mode 100644 drivers/net/ethernet/freescale/fman/mac/mac.c\n" - ">=20\n" - "> diff --git a/drivers/net/ethernet/freescale/fman/inc/mac.h b/drivers/net/=\n" - "ethernet/freescale/fman/inc/mac.h\n" + "> \n" + "> diff --git a/drivers/net/ethernet/freescale/fman/inc/mac.h b/drivers/net/ethernet/freescale/fman/inc/mac.h\n" "> new file mode 100644\n" "> index 0000000..2d27331\n" "> --- /dev/null\n" "> +++ b/drivers/net/ethernet/freescale/fman/inc/mac.h\n" ".....\n" "> +\t/* Get the rest of the PHY information */\n" - "> +\tmac_dev->phy_node =3D of_parse_phandle(mac_node, \"phy-handle\", 0);\n" + "> +\tmac_dev->phy_node = of_parse_phandle(mac_node, \"phy-handle\", 0);\n" "> +\tif (!mac_dev->phy_node) {\n" "> +\t\tint sz;\n" - "> +\t\tconst u32 *phy_id =3D of_get_property(mac_node, \"fixed-link\",\n" + "> +\t\tconst u32 *phy_id = of_get_property(mac_node, \"fixed-link\",\n" "> +\t\t\t\t\t\t\t&sz);\n" "> +\t\tif (!phy_id || sz < sizeof(*phy_id)) {\n" "> +\t\t\tdev_err(dev, \"No PHY (or fixed link) found\\n\");\n" - "> +\t\t\t_errno =3D -EINVAL;\n" + "> +\t\t\t_errno = -EINVAL;\n" "> +\t\t\tgoto _return_dev_set_drvdata;\n" "> +\t\t}\n" "> +\n" @@ -52,8 +49,7 @@ "\n" "The above for fixed PHY does not work for me, changing it to does:\n" "\n" - "diff --git a/drivers/net/ethernet/freescale/fman/mac/mac.c b/drivers/net/et=\n" - "hernet/freescale/fman/mac/mac.c\n" + "diff --git a/drivers/net/ethernet/freescale/fman/mac/mac.c b/drivers/net/ethernet/freescale/fman/mac/mac.c\n" "index 4eb8f7c..a8be96a 100644\n" "--- a/drivers/net/ethernet/freescale/fman/mac/mac.c\n" "+++ b/drivers/net/ethernet/freescale/fman/mac/mac.c\n" @@ -65,19 +61,16 @@ " #include <linux/of_net.h>\n" " #include <linux/device.h>\n" " #include <linux/phy.h>\n" - "@@ -399,7 +400,7 @@ static int __cold mac_probe(struct platform_device *_of=\n" - "_dev)\n" - "=20\n" + "@@ -399,7 +400,7 @@ static int __cold mac_probe(struct platform_device *_of_dev)\n" + " \n" " /* Get the rest of the PHY information */\n" - " mac_dev->phy_node =3D of_parse_phandle(mac_node, \"phy-handle\", 0);\n" + " mac_dev->phy_node = of_parse_phandle(mac_node, \"phy-handle\", 0);\n" "- if (!mac_dev->phy_node) {\n" "+ if (0 && !mac_dev->phy_node) {\n" " int sz;\n" - " const u32 *phy_id =3D of_get_property(mac_node, \"fixed-link=\n" - "\",\n" + " const u32 *phy_id = of_get_property(mac_node, \"fixed-link\",\n" " &sz);\n" - "@@ -412,6 +413,16 @@ static int __cold mac_probe(struct platform_device *_o=\n" - "f_dev)\n" + "@@ -412,6 +413,16 @@ static int __cold mac_probe(struct platform_device *_of_dev)\n" " sprintf(mac_dev->fixed_bus_id, PHY_ID_FMT, \"fixed-0\",\n" " phy_id[0]);\n" " }\n" @@ -86,10 +79,10 @@ "+ * In the case of a fixed PHY, the DT node associated\n" "+ * to the PHY is the Ethernet MAC DT node.\n" "+ */\n" - "+ _errno =3D of_phy_register_fixed_link(mac_node);\n" + "+ _errno = of_phy_register_fixed_link(mac_node);\n" "+ if (_errno)\n" "+ return _errno;\n" - "+ mac_dev->phy_node =3D of_node_get(mac_node);\n" - + }= + "+ mac_dev->phy_node = of_node_get(mac_node);\n" + + } -565c2e1dccc2b91af9a30eca2a9e1c982dffa064e15b75b962d0f31ab2ba7a70 +c93f9b7b35e0fcf35898d9fed40dce1d175daac1301ed06bd7ec40fcf3075f12
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.