diff for duplicates of <20140213194431.GF17650@pengutronix.de> diff --git a/a/1.txt b/N1/1.txt index c6cf7b9..88ef150 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On Wed, Dec 18, 2013 at 05:47:19PM +0100, Markus Pargmann wrote: > This driver is not used, unless it is defined in DT and referenced by a > cpsw slave with a phandle. > -> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> > --- > .../devicetree/bindings/net/cpsw-ctrl-macid.txt | 31 +++++ > drivers/net/ethernet/ti/Kconfig | 8 ++ @@ -39,7 +39,7 @@ On Wed, Dec 18, 2013 at 05:47:19PM +0100, Markus Pargmann wrote: > + > +Examples: > + -> + cpsw_ctrl_macid: cpsw-ctrl-macid@44e10630 { +> + cpsw_ctrl_macid: cpsw-ctrl-macid at 44e10630 { > + compatible = "ti,am3352-cpsw-ctrl-macid"; > + #ti,mac-address-ctrl-cells = <1>; > + reg = <0x44e10630 0x16>; @@ -50,11 +50,11 @@ s/0x16/0x10/ > + > +Used in cpsw slave nodes like this: > + -> + cpsw_emac0: slave@4a100200 { +> + cpsw_emac0: slave at 4a100200 { > + ti,mac-address-ctrl = <&cpsw_ctrl_macid 0>; > + }; > + -> + cpsw_emac1: slave@4a100300 { +> + cpsw_emac1: slave at 4a100300 { > + ti,mac-address-ctrl = <&cpsw_ctrl_macid 1>; > + }; > diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig @@ -110,7 +110,7 @@ optional). > @@ -0,0 +1,138 @@ > +/* CPSW Control Module MACID driver > + * -> + * Copyright (C) 2013 Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> +> + * Copyright (C) 2013 Markus Pargmann <mpa@pengutronix.de> > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License @@ -244,7 +244,7 @@ optional). > +}; > + > +module_platform_driver(cpsw_ctrl_macid_driver); -> +MODULE_AUTHOR("Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>"); +> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>"); > +MODULE_LICENSE("GPL v2"); > -- > 1.8.5.1 @@ -252,9 +252,5 @@ optional). > -- -Pengutronix e.K. | Uwe Kleine-König | +Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ | --- -To unsubscribe from this list: send the line "unsubscribe devicetree" in -the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 5789079..aec0d9a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,16 +1,9 @@ "ref\01387385242-1161-1-git-send-email-mpa@pengutronix.de\0" "ref\01387385242-1161-4-git-send-email-mpa@pengutronix.de\0" - "ref\01387385242-1161-4-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" - "From\0Uwe Kleine-K\303\266nig <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" - "Subject\0Re: [PATCH 3/6] net: cpsw: Add control-module macid driver\0" + "From\0u.kleine-koenig@pengutronix.de (Uwe Kleine-K\303\266nig)\0" + "Subject\0[PATCH 3/6] net: cpsw: Add control-module macid driver\0" "Date\0Thu, 13 Feb 2014 20:44:31 +0100\0" - "To\0Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0" - "Cc\0David S. Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>" - " Beno\303\256t Cousson <bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>" - linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Wed, Dec 18, 2013 at 05:47:19PM +0100, Markus Pargmann wrote:\n" @@ -21,7 +14,7 @@ "> This driver is not used, unless it is defined in DT and referenced by a\n" "> cpsw slave with a phandle.\n" "> \n" - "> Signed-off-by: Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>\n" "> ---\n" "> .../devicetree/bindings/net/cpsw-ctrl-macid.txt | 31 +++++\n" "> drivers/net/ethernet/ti/Kconfig | 8 ++\n" @@ -54,7 +47,7 @@ "> +\n" "> +Examples:\n" "> +\n" - "> +\tcpsw_ctrl_macid: cpsw-ctrl-macid@44e10630 {\n" + "> +\tcpsw_ctrl_macid: cpsw-ctrl-macid at 44e10630 {\n" "> +\t\tcompatible = \"ti,am3352-cpsw-ctrl-macid\";\n" "> +\t\t#ti,mac-address-ctrl-cells = <1>;\n" "> +\t\treg = <0x44e10630 0x16>;\n" @@ -65,11 +58,11 @@ "> +\n" "> +Used in cpsw slave nodes like this:\n" "> +\n" - "> +\tcpsw_emac0: slave@4a100200 {\n" + "> +\tcpsw_emac0: slave at 4a100200 {\n" "> +\t\tti,mac-address-ctrl = <&cpsw_ctrl_macid 0>;\n" "> +\t};\n" "> +\n" - "> +\tcpsw_emac1: slave@4a100300 {\n" + "> +\tcpsw_emac1: slave at 4a100300 {\n" "> +\t\tti,mac-address-ctrl = <&cpsw_ctrl_macid 1>;\n" "> +\t};\n" "> diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig\n" @@ -125,7 +118,7 @@ "> @@ -0,0 +1,138 @@\n" "> +/* CPSW Control Module MACID driver\n" "> + *\n" - "> + * Copyright (C) 2013 Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n" + "> + * Copyright (C) 2013 Markus Pargmann <mpa@pengutronix.de>\n" "> + *\n" "> + * This program is free software; you can redistribute it and/or\n" "> + * modify it under the terms of the GNU General Public License\n" @@ -259,7 +252,7 @@ "> +};\n" "> +\n" "> +module_platform_driver(cpsw_ctrl_macid_driver);\n" - "> +MODULE_AUTHOR(\"Markus Pargmann <mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\");\n" + "> +MODULE_AUTHOR(\"Markus Pargmann <mpa@pengutronix.de>\");\n" "> +MODULE_LICENSE(\"GPL v2\");\n" "> -- \n" "> 1.8.5.1\n" @@ -267,11 +260,7 @@ "> \n" "\n" "-- \n" - "Pengutronix e.K. | Uwe Kleine-K\303\266nig |\n" - "Industrial Linux Solutions | http://www.pengutronix.de/ |\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + "Pengutronix e.K. | Uwe Kleine-K?nig |\n" + Industrial Linux Solutions | http://www.pengutronix.de/ | -10beeef9033658d6d55aa5992ce66e3ef0f6b6852306062ab51cb10ac0711cbe +e2b60d4228220d523a9d1da1d2e72a29171227a459e97a324b68c025c27c9784
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.