diff for duplicates of <5033B310.2020904@atmel.com> diff --git a/a/1.txt b/N1/1.txt index b4c8935..d12542c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,13 @@ -On 08/21/2012 04:29 PM, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org : -> From: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +On 08/21/2012 04:29 PM, ludovic.desroches at atmel.com : +> From: Ludovic Desroches <ludovic.desroches@atmel.com> > > Add twi nodes for atmel SOCs and remove i2c-gpio ones. > -> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Yes, we will move to it once people test it a little bit... -Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > arch/arm/boot/dts/at91sam9260.dtsi | 23 ++++++------- @@ -28,12 +28,12 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + i2c0 = &i2c0; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -198,6 +199,15 @@ > status = "disabled"; > }; > -> + i2c0: i2c@fffac000 { +> + i2c0: i2c at fffac000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xfffac000 0x100>; > + interrupts = <11 4>; @@ -42,7 +42,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> adc0: adc@fffe0000 { +> adc0: adc at fffe0000 { > compatible = "atmel,at91sam9260-adc"; > reg = <0xfffe0000 0x100>; > @@ -257,17 +267,4 @@ @@ -50,7 +50,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > }; > }; > - -> - i2c@0 { +> - i2c at 0 { > - compatible = "i2c-gpio"; > - gpios = <&pioA 23 0 /* sda */ > - &pioA 24 0 /* scl */ @@ -74,13 +74,13 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + i2c0 = &i2c0; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -179,6 +180,15 @@ > interrupts = <24 4>; > status = "disabled"; > }; > + -> + i2c0: i2c@fff88000 { +> + i2c0: i2c at fff88000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xfff88000 0x100>; > + interrupts = <13 4>; @@ -90,13 +90,13 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > @@ -204,17 +214,4 @@ > status = "disabled"; > }; > }; > - -> - i2c@0 { +> - i2c at 0 { > - compatible = "i2c-gpio"; > - gpios = <&pioB 4 0 /* sda */ > - &pioB 5 0 /* scl */ @@ -121,12 +121,12 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + i2c1 = &i2c1; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -200,6 +202,24 @@ > status = "disabled"; > }; > -> + i2c0: i2c@fff84000 { +> + i2c0: i2c at fff84000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xfff84000 0x100>; > + interrupts = <12 4>; @@ -135,7 +135,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> + i2c1: i2c@fff88000 { +> + i2c1: i2c at fff88000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xfff88000 0x100>; > + interrupts = <13 4>; @@ -144,7 +144,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> adc0: adc@fffb0000 { +> adc0: adc at fffb0000 { > compatible = "atmel,at91sam9260-adc"; > reg = <0xfffb0000 0x100>; > @@ -268,17 +288,4 @@ @@ -152,7 +152,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > }; > }; > - -> - i2c@0 { +> - i2c at 0 { > - compatible = "i2c-gpio"; > - gpios = <&pioA 20 0 /* sda */ > - &pioA 21 0 /* scl */ @@ -177,13 +177,13 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + i2c1 = &i2c1; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -178,6 +180,24 @@ > atmel,use-dma-tx; > status = "disabled"; > }; > + -> + i2c0: i2c@f8010000 { +> + i2c0: i2c at f8010000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xf8010000 0x100>; > + interrupts = <9 4>; @@ -192,7 +192,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> + i2c1: i2c@f8014000 { +> + i2c1: i2c at f8014000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xf8014000 0x100>; > + interrupts = <10 4>; @@ -202,13 +202,13 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > @@ -205,17 +225,4 @@ > status = "disabled"; > }; > }; > - -> - i2c@0 { +> - i2c at 0 { > - compatible = "i2c-gpio"; > - gpios = <&pioA 30 0 /* sda */ > - &pioA 31 0 /* scl */ @@ -234,12 +234,12 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + i2c2 = &i2c2; > }; > cpus { -> cpu@0 { +> cpu at 0 { > @@ -191,6 +194,33 @@ > status = "disabled"; > }; > -> + i2c0: i2c@f8010000 { +> + i2c0: i2c at f8010000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xf8010000 0x100>; > + interrupts = <9 4>; @@ -248,7 +248,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> + i2c1: i2c@f8014000 { +> + i2c1: i2c at f8014000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xf8014000 0x100>; > + interrupts = <10 4>; @@ -257,7 +257,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> + i2c2: i2c@f8018000 { +> + i2c2: i2c at f8018000 { > + compatible = "atmel,at91sam9260-i2c"; > + reg = <0xf8018000 0x100>; > + interrupts = <11 4>; @@ -266,7 +266,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + status = "disabled"; > + }; > + -> adc0: adc@f804c000 { +> adc0: adc at f804c000 { > compatible = "atmel,at91sam9260-adc"; > reg = <0xf804c000 0x100>; > @@ -259,43 +289,4 @@ @@ -274,7 +274,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > }; > }; > - -> - i2c@0 { +> - i2c at 0 { > - compatible = "i2c-gpio"; > - gpios = <&pioA 30 0 /* sda */ > - &pioA 31 0 /* scl */ @@ -287,7 +287,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > - status = "disabled"; > - }; > - -> - i2c@1 { +> - i2c at 1 { > - compatible = "i2c-gpio"; > - gpios = <&pioC 0 0 /* sda */ > - &pioC 1 0 /* scl */ @@ -300,7 +300,7 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > - status = "disabled"; > - }; > - -> - i2c@2 { +> - i2c at 2 { > - compatible = "i2c-gpio"; > - gpios = <&pioB 4 0 /* sda */ > - &pioB 5 0 /* scl */ diff --git a/a/content_digest b/N1/content_digest index e27df02..965e360 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,26 +1,21 @@ "ref\01345559345-13988-1-git-send-email-ludovic.desroches@atmel.com\0" "ref\01345559345-13988-5-git-send-email-ludovic.desroches@atmel.com\0" - "ref\01345559345-13988-5-git-send-email-ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" - "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH 4/5] ARM: dts: add twi nodes for atmel SOCs\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH 4/5] ARM: dts: add twi nodes for atmel SOCs\0" "Date\0Tue, 21 Aug 2012 18:10:56 +0200\0" - "To\0ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" - "Cc\0n.voss-+umVssTZoCsb1SvskN2V4Q@public.gmane.org" - linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - " plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 08/21/2012 04:29 PM, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org :\n" - "> From: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "On 08/21/2012 04:29 PM, ludovic.desroches at atmel.com :\n" + "> From: Ludovic Desroches <ludovic.desroches@atmel.com>\n" "> \n" "> Add twi nodes for atmel SOCs and remove i2c-gpio ones.\n" "> \n" - "> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>\n" "\n" "Yes, we will move to it once people test it a little bit...\n" "\n" - "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" "\n" "> ---\n" "> arch/arm/boot/dts/at91sam9260.dtsi | 23 ++++++-------\n" @@ -41,12 +36,12 @@ "> +\t\ti2c0 = &i2c0;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -198,6 +199,15 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ti2c0: i2c@fffac000 {\n" + "> +\t\t\ti2c0: i2c at fffac000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xfffac000 0x100>;\n" "> +\t\t\t\tinterrupts = <11 4>;\n" @@ -55,7 +50,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc@fffe0000 {\n" + "> \t\t\tadc0: adc at fffe0000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-adc\";\n" "> \t\t\t\treg = <0xfffe0000 0x100>;\n" "> @@ -257,17 +267,4 @@\n" @@ -63,7 +58,7 @@ "> \t\t};\n" "> \t};\n" "> -\n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioA 23 0 /* sda */\n" "> -\t\t\t &pioA 24 0 /* scl */\n" @@ -87,13 +82,13 @@ "> +\t\ti2c0 = &i2c0;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -179,6 +180,15 @@\n" "> \t\t\t\tinterrupts = <24 4>;\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@fff88000 {\n" + "> +\t\t\ti2c0: i2c at fff88000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xfff88000 0x100>;\n" "> +\t\t\t\tinterrupts = <13 4>;\n" @@ -103,13 +98,13 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> @@ -204,17 +214,4 @@\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \t};\n" "> -\n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioB 4 0 /* sda */\n" "> -\t\t\t &pioB 5 0 /* scl */\n" @@ -134,12 +129,12 @@ "> +\t\ti2c1 = &i2c1;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -200,6 +202,24 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ti2c0: i2c@fff84000 {\n" + "> +\t\t\ti2c0: i2c at fff84000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xfff84000 0x100>;\n" "> +\t\t\t\tinterrupts = <12 4>;\n" @@ -148,7 +143,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@fff88000 {\n" + "> +\t\t\ti2c1: i2c at fff88000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xfff88000 0x100>;\n" "> +\t\t\t\tinterrupts = <13 4>;\n" @@ -157,7 +152,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc@fffb0000 {\n" + "> \t\t\tadc0: adc at fffb0000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-adc\";\n" "> \t\t\t\treg = <0xfffb0000 0x100>;\n" "> @@ -268,17 +288,4 @@\n" @@ -165,7 +160,7 @@ "> \t\t};\n" "> \t};\n" "> -\n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioA 20 0 /* sda */\n" "> -\t\t\t &pioA 21 0 /* scl */\n" @@ -190,13 +185,13 @@ "> +\t\ti2c1 = &i2c1;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -178,6 +180,24 @@\n" "> \t\t\t\tatmel,use-dma-tx;\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@f8010000 {\n" + "> +\t\t\ti2c0: i2c at f8010000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xf8010000 0x100>;\n" "> +\t\t\t\tinterrupts = <9 4>;\n" @@ -205,7 +200,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@f8014000 {\n" + "> +\t\t\ti2c1: i2c at f8014000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xf8014000 0x100>;\n" "> +\t\t\t\tinterrupts = <10 4>;\n" @@ -215,13 +210,13 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> @@ -205,17 +225,4 @@\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \t};\n" "> -\n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioA 30 0 /* sda */\n" "> -\t\t\t &pioA 31 0 /* scl */\n" @@ -247,12 +242,12 @@ "> +\t\ti2c2 = &i2c2;\n" "> \t};\n" "> \tcpus {\n" - "> \t\tcpu@0 {\n" + "> \t\tcpu at 0 {\n" "> @@ -191,6 +194,33 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ti2c0: i2c@f8010000 {\n" + "> +\t\t\ti2c0: i2c at f8010000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xf8010000 0x100>;\n" "> +\t\t\t\tinterrupts = <9 4>;\n" @@ -261,7 +256,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@f8014000 {\n" + "> +\t\t\ti2c1: i2c at f8014000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xf8014000 0x100>;\n" "> +\t\t\t\tinterrupts = <10 4>;\n" @@ -270,7 +265,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c2: i2c@f8018000 {\n" + "> +\t\t\ti2c2: i2c at f8018000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-i2c\";\n" "> +\t\t\t\treg = <0xf8018000 0x100>;\n" "> +\t\t\t\tinterrupts = <11 4>;\n" @@ -279,7 +274,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tadc0: adc@f804c000 {\n" + "> \t\t\tadc0: adc at f804c000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9260-adc\";\n" "> \t\t\t\treg = <0xf804c000 0x100>;\n" "> @@ -259,43 +289,4 @@\n" @@ -287,7 +282,7 @@ "> \t\t};\n" "> \t};\n" "> -\n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioA 30 0 /* sda */\n" "> -\t\t\t &pioA 31 0 /* scl */\n" @@ -300,7 +295,7 @@ "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> -\ti2c@1 {\n" + "> -\ti2c at 1 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioC 0 0 /* sda */\n" "> -\t\t\t &pioC 1 0 /* scl */\n" @@ -313,7 +308,7 @@ "> -\t\tstatus = \"disabled\";\n" "> -\t};\n" "> -\n" - "> -\ti2c@2 {\n" + "> -\ti2c at 2 {\n" "> -\t\tcompatible = \"i2c-gpio\";\n" "> -\t\tgpios = <&pioB 4 0 /* sda */\n" "> -\t\t\t &pioB 5 0 /* scl */\n" @@ -332,4 +327,4 @@ "-- \n" Nicolas Ferre -d38b2cb45467835ee4b04075b0367a1d89639bbf6ed9442ce1680000212b8986 +f1caacd4adbe9c7329667cda835c49974694b50103830bd8f5ccea844defba78
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.