diff for duplicates of <5204B3E3.5010106@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index 36cb6c0..9669d65 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,7 @@ mailing list, they have enough traffic I think. >> >> The Device Tree binding documentation is updated accordingly. >> ->> Signed-off-by: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> >> --- >> Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 13 ++++++++++++- >> arch/arm/boot/dts/armada-370-xp.dtsi | 2 -- @@ -49,7 +49,7 @@ mailing list, they have enough traffic I think. >> + >> +For a controller which support the I2C Transaction Generator: >> + ->> + i2c@11000 { +>> + i2c at 11000 { >> + compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; >> + reg = <0x11000 0x100>; >> + compatible = "marvell,mv64xxx-i2c"; @@ -62,7 +62,7 @@ mailing list, they have enough traffic I think. >> +++ 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>; @@ -70,7 +70,7 @@ mailing list, they have enough traffic I think. >> interrupts = <31>; >> @@ -132,7 +131,6 @@ >> ->> i2c1: i2c@11100 { +>> i2c1: i2c at 11100 { >> compatible = "marvell,mv64xxx-i2c"; >> - reg = <0x11100 0x20>; >> #address-cells = <1>; @@ -84,15 +84,15 @@ mailing list, they have enough traffic I think. >> }; >> }; >> ->> + 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 @@ -103,17 +103,17 @@ mailing list, they have enough traffic I think. >> }; >> }; >> ->> + 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 1d4d4ff..fd532ab 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,31 +1,10 @@ "ref\01376039158-1896-1-git-send-email-gregory.clement@free-electrons.com\0" "ref\01376039158-1896-4-git-send-email-gregory.clement@free-electrons.com\0" "ref\020130809091336.GA2848@localhost\0" - "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Subject\0Re: [PATCH v5 3/3] ARM: dts: mvebu: Introduce a new compatible string for mv64xxx-i2c\0" + "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" + "Subject\0[PATCH v5 3/3] ARM: dts: mvebu: Introduce a new compatible string for mv64xxx-i2c\0" "Date\0Fri, 09 Aug 2013 11:18:27 +0200\0" - "To\0Ezequiel Garcia <ezequiel.garcia-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Cc\0Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>" - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> - Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> - Thomas Petazzoni <thomas.petazzoni-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-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - " David Marlin <dmarlin-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 09/08/2013 11:13, Ezequiel Garcia wrote:\n" @@ -50,7 +29,7 @@ ">>\n" ">> The Device Tree binding documentation is updated accordingly.\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" ">> Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 13 ++++++++++++-\n" ">> arch/arm/boot/dts/armada-370-xp.dtsi | 2 --\n" @@ -79,7 +58,7 @@ ">> +\n" ">> +For a controller which support the I2C Transaction Generator:\n" ">> +\n" - ">> +\ti2c@11000 {\n" + ">> +\ti2c at 11000 {\n" ">> +\t\tcompatible = \"marvell,mv78230-i2c\", \"marvell,mv64xxx-i2c\";\n" ">> +\t\treg = <0x11000 0x100>;\n" ">> +\t\tcompatible = \"marvell,mv64xxx-i2c\";\n" @@ -92,7 +71,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" @@ -100,7 +79,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" @@ -114,15 +93,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" @@ -133,17 +112,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" @@ -158,4 +137,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -a1a478298119f3a8cbc59dbc10ebb7395672719c76ad1ab4813520b870e2b349 +355482c46399cdb795a695857984efeaf1f1f451983e1340413413c4e619472f
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.