diff for duplicates of <52247A2D.9090400@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 5a399e6..86c7218 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,7 +19,7 @@ On 22/08/2013 16:19, Gregory CLEMENT wrote: > registers are bigger for Armada XP and the new compatible string is > used. > -> Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> > --- > arch/arm/boot/dts/armada-370-xp.dtsi | 2 -- > arch/arm/boot/dts/armada-370.dtsi | 8 ++++++++ @@ -32,7 +32,7 @@ On 22/08/2013 16:19, Gregory CLEMENT wrote: > +++ b/arch/arm/boot/dts/armada-370-xp.dtsi > @@ -121,7 +121,6 @@ > -> i2c0: i2c@11000 { +> i2c0: i2c at 11000 { > compatible = "marvell,mv64xxx-i2c"; > - reg = <0x11000 0x20>; > #address-cells = <1>; @@ -40,7 +40,7 @@ On 22/08/2013 16:19, Gregory CLEMENT wrote: > interrupts = <31>; > @@ -132,7 +131,6 @@ > -> i2c1: i2c@11100 { +> i2c1: i2c at 11100 { > compatible = "marvell,mv64xxx-i2c"; > - reg = <0x11100 0x20>; > #address-cells = <1>; @@ -54,15 +54,15 @@ On 22/08/2013 16:19, Gregory CLEMENT wrote: > }; > }; > -> + i2c0: i2c@11000 { +> + i2c0: i2c at 11000 { > + reg = <0x11000 0x20>; > + }; > + -> + i2c1: i2c@11100 { +> + i2c1: i2c at 11100 { > + reg = <0x11100 0x20>; > + }; > + -> usb@50000 { +> usb at 50000 { > clocks = <&coreclk 0>; > }; > diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi @@ -73,17 +73,17 @@ On 22/08/2013 16:19, Gregory CLEMENT wrote: > }; > }; > -> + i2c0: i2c@11000 { +> + i2c0: i2c at 11000 { > + compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; > + reg = <0x11000 0x100>; > + }; > + -> + i2c1: i2c@11100 { +> + i2c1: i2c at 11100 { > + compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; > + reg = <0x11100 0x100>; > + }; > + -> usb@50000 { +> usb at 50000 { > clocks = <&gateclk 18>; > }; > diff --git a/a/content_digest b/N1/content_digest index 57a89cf..7ea2b5b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,33 +1,9 @@ "ref\01377181169-17483-1-git-send-email-gregory.clement@free-electrons.com\0" "ref\01377181169-17483-2-git-send-email-gregory.clement@free-electrons.com\0" - "ref\01377181169-17483-2-git-send-email-gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" - "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Subject\0Re: [PATCH v6 4/4] ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c\0" + "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" + "Subject\0[PATCH v6 4/4] ARM: dts: mvebu: Update with the new compatible string for mv64xxx-i2c\0" "Date\0Mon, 02 Sep 2013 13:44:45 +0200\0" - "To\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>\0" - "Cc\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" - Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> - Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> - Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> - Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - Nicolas Pitre <nico-vtqb6HGKxmzR7s880joybQ@public.gmane.org> - Lior Amsalem <alior-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Maen Suleiman <maen-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Tawfik Bayouk <tawfik-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Shadi Ammouri <shadi-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Eran Ben-Avi <benavi-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Yehuda Yitschak <yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Nadav Haklai <nadavh-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> - Ike Pan <ike.pan-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> - Chris Van Hoof <vanhoof-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> - Dan Frazier <dann.frazier-Z7WLFzj8eWMS+FvcfC7Uqw@public.gmane.org> - Leif Lindholm <leif.lindholm-5wv7dgnIgG8@public.gmane.org> - " Jon Masters <jcm@redhat.c>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Jason,\n" @@ -51,7 +27,7 @@ "> registers are bigger for Armada XP and the new compatible string is\n" "> used.\n" "> \n" - "> Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + "> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/armada-370-xp.dtsi | 2 --\n" "> arch/arm/boot/dts/armada-370.dtsi | 8 ++++++++\n" @@ -64,7 +40,7 @@ "> +++ b/arch/arm/boot/dts/armada-370-xp.dtsi\n" "> @@ -121,7 +121,6 @@\n" "> \n" - "> \t\t\ti2c0: i2c@11000 {\n" + "> \t\t\ti2c0: i2c at 11000 {\n" "> \t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> -\t\t\t\treg = <0x11000 0x20>;\n" "> \t\t\t\t#address-cells = <1>;\n" @@ -72,7 +48,7 @@ "> \t\t\t\tinterrupts = <31>;\n" "> @@ -132,7 +131,6 @@\n" "> \n" - "> \t\t\ti2c1: i2c@11100 {\n" + "> \t\t\ti2c1: i2c at 11100 {\n" "> \t\t\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" "> -\t\t\t\treg = <0x11100 0x20>;\n" "> \t\t\t\t#address-cells = <1>;\n" @@ -86,15 +62,15 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ti2c0: i2c@11000 {\n" + "> +\t\t\ti2c0: i2c at 11000 {\n" "> +\t\t\t\treg = <0x11000 0x20>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@11100 {\n" + "> +\t\t\ti2c1: i2c at 11100 {\n" "> +\t\t\t\treg = <0x11100 0x20>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tusb@50000 {\n" + "> \t\t\tusb at 50000 {\n" "> \t\t\t\tclocks = <&coreclk 0>;\n" "> \t\t\t};\n" "> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi\n" @@ -105,17 +81,17 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ti2c0: i2c@11000 {\n" + "> +\t\t\ti2c0: i2c at 11000 {\n" "> +\t\t\t\tcompatible = \"marvell,mv78230-i2c\", \"marvell,mv64xxx-i2c\";\n" "> +\t\t\t\treg = <0x11000 0x100>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@11100 {\n" + "> +\t\t\ti2c1: i2c at 11100 {\n" "> +\t\t\t\tcompatible = \"marvell,mv78230-i2c\", \"marvell,mv64xxx-i2c\";\n" "> +\t\t\t\treg = <0x11100 0x100>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tusb@50000 {\n" + "> \t\t\tusb at 50000 {\n" "> \t\t\t\tclocks = <&gateclk 18>;\n" "> \t\t\t};\n" "> \n" @@ -127,4 +103,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -5795683e7c9a9b2c1bf02dacd34513dd576f8b10076d6349f5c6b258a76a40ad +adbc364768eae4e775b52101f7489d5610bbbb743ae8de5a75674db933ba1596
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.