diff for duplicates of <5033B3AB.8060507@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 431e5d3..b26fb70 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,13 +1,13 @@ -On 08/21/2012 04:32 PM, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org : -> From: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +On 08/21/2012 04:32 PM, ludovic.desroches at atmel.com : +> From: Ludovic Desroches <ludovic.desroches@atmel.com> > > Use the atmel twi instead of gpio for i2c stuff. > -> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> Seems good. Maybe we will have to test wm8731 a little bit more. -Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> +Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> > --- > arch/arm/boot/dts/at91sam9263ek.dts | 20 ++++++++++---------- @@ -26,10 +26,10 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > status = "okay"; > }; > + -> + i2c0: i2c@fff88000 { +> + i2c0: i2c at fff88000 { > + status = "okay"; > + -> + 24c512@50 { +> + 24c512 at 50 { > + compatible = "24c512"; > + reg = <0x50>; > + pagesize = <128>; @@ -37,16 +37,16 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > @@ -143,14 +153,4 @@ > gpio-key,wakeup; > }; > }; > - -> - i2c@0 { +> - i2c at 0 { > - status = "okay"; > - -> - 24c512@50 { +> - 24c512 at 50 { > - compatible = "24c512"; > - reg = <0x50>; > - pagesize = <128>; @@ -62,35 +62,35 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > status = "okay"; > }; > + -> + i2c0: i2c@fffac000 { +> + i2c0: i2c at fffac000 { > + status = "okay"; > + -> + 24c512@50 { +> + 24c512 at 50 { > + compatible = "24c512"; > + reg = <0x50>; > + }; > + -> + wm8731@1b { +> + wm8731 at 1b { > + compatible = "wm8731"; > + reg = <0x1b>; > + }; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > @@ -106,20 +120,6 @@ > }; > }; > -> - i2c@0 { +> - i2c at 0 { > - status = "okay"; > - -> - 24c512@50 { +> - 24c512 at 50 { > - compatible = "24c512"; > - reg = <0x50>; > - }; > - -> - wm8731@1b { +> - wm8731 at 1b { > - compatible = "wm8731"; > - reg = <0x1b>; > - }; @@ -108,20 +108,20 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > status = "okay"; > }; > + -> + i2c0: i2c@f8010000 { +> + i2c0: i2c at f8010000 { > + status = "okay"; > + }; > + -> + i2c1: i2c@f8014000 { +> + i2c1: i2c at f8014000 { > + status = "okay"; > + }; > + -> + i2c2: i2c@f8018000 { +> + i2c2: i2c at f8018000 { > + status = "okay"; > + }; > }; > -> usb0: ohci@00600000 { +> usb0: ohci at 00600000 { > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts > index a3633bd..4f94f23 100644 > --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -131,41 +131,41 @@ Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > status = "okay"; > }; > + -> + i2c0: i2c@fff84000 { +> + i2c0: i2c at fff84000 { > + status = "okay"; > + -> + 24c512@50 { +> + 24c512 at 50 { > + compatible = "24c512"; > + reg = <0x50>; > + pagesize = <128>; > + }; > + }; > + -> + i2c1: i2c@fff88000 { +> + i2c1: i2c at fff88000 { > + status = "okay"; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts > index f4e43e3..912b2c2 100644 > --- a/arch/arm/boot/dts/at91sam9n12ek.dts > +++ b/arch/arm/boot/dts/at91sam9n12ek.dts > @@ -37,6 +37,14 @@ -> dbgu: serial@fffff200 { +> dbgu: serial at fffff200 { > status = "okay"; > }; > + -> + i2c0: i2c@f8010000 { +> + i2c0: i2c at f8010000 { > + status = "okay"; > + }; > + -> + i2c1: i2c@f8014000 { +> + i2c1: i2c at f8014000 { > + status = "okay"; > + }; > }; > -> nand0: nand@40000000 { +> nand0: nand at 40000000 { > diff --git a/a/content_digest b/N1/content_digest index 975ec83..737489c 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\01345559520-14074-1-git-send-email-ludovic.desroches@atmel.com\0" - "ref\01345559520-14074-1-git-send-email-ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" - "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH 5/5] ARM: dts: add twi nodes for atmel boards\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH 5/5] ARM: dts: add twi nodes for atmel boards\0" "Date\0Tue, 21 Aug 2012 18:13:31 +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:32 PM, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org :\n" - "> From: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" + "On 08/21/2012 04:32 PM, ludovic.desroches at atmel.com :\n" + "> From: Ludovic Desroches <ludovic.desroches@atmel.com>\n" "> \n" "> Use the atmel twi instead of gpio for i2c stuff.\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" "Seems good. Maybe we will have to test wm8731 a little bit more.\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/at91sam9263ek.dts | 20 ++++++++++----------\n" @@ -39,10 +34,10 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@fff88000 {\n" + "> +\t\t\ti2c0: i2c at fff88000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\t24c512@50 {\n" + "> +\t\t\t\t24c512 at 50 {\n" "> +\t\t\t\t\tcompatible = \"24c512\";\n" "> +\t\t\t\t\treg = <0x50>;\n" "> +\t\t\t\t\tpagesize = <128>;\n" @@ -50,16 +45,16 @@ "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> @@ -143,14 +153,4 @@\n" "> \t\t\tgpio-key,wakeup;\n" "> \t\t};\n" "> \t};\n" "> -\n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tstatus = \"okay\";\n" "> -\n" - "> -\t\t24c512@50 {\n" + "> -\t\t24c512 at 50 {\n" "> -\t\t\tcompatible = \"24c512\";\n" "> -\t\t\treg = <0x50>;\n" "> -\t\t\tpagesize = <128>;\n" @@ -75,35 +70,35 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@fffac000 {\n" + "> +\t\t\ti2c0: i2c at fffac000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\t24c512@50 {\n" + "> +\t\t\t\t24c512 at 50 {\n" "> +\t\t\t\t\tcompatible = \"24c512\";\n" "> +\t\t\t\t\treg = <0x50>;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\twm8731@1b {\n" + "> +\t\t\t\twm8731 at 1b {\n" "> +\t\t\t\t\tcompatible = \"wm8731\";\n" "> +\t\t\t\t\treg = <0x1b>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> @@ -106,20 +120,6 @@\n" "> \t\t};\n" "> \t};\n" "> \n" - "> -\ti2c@0 {\n" + "> -\ti2c at 0 {\n" "> -\t\tstatus = \"okay\";\n" "> -\n" - "> -\t\t24c512@50 {\n" + "> -\t\t24c512 at 50 {\n" "> -\t\t\tcompatible = \"24c512\";\n" "> -\t\t\treg = <0x50>;\n" "> -\t\t};\n" "> -\n" - "> -\t\twm8731@1b {\n" + "> -\t\twm8731 at 1b {\n" "> -\t\t\tcompatible = \"wm8731\";\n" "> -\t\t\treg = <0x1b>;\n" "> -\t\t};\n" @@ -121,20 +116,20 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@f8010000 {\n" + "> +\t\t\ti2c0: i2c at f8010000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@f8014000 {\n" + "> +\t\t\ti2c1: i2c at f8014000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c2: i2c@f8018000 {\n" + "> +\t\t\ti2c2: i2c at f8018000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tusb0: ohci@00600000 {\n" + "> \t\tusb0: ohci at 00600000 {\n" "> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> index a3633bd..4f94f23 100644\n" "> --- a/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" @@ -144,45 +139,45 @@ "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@fff84000 {\n" + "> +\t\t\ti2c0: i2c at fff84000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\n" - "> +\t\t\t\t24c512@50 {\n" + "> +\t\t\t\t24c512 at 50 {\n" "> +\t\t\t\t\tcompatible = \"24c512\";\n" "> +\t\t\t\t\treg = <0x50>;\n" "> +\t\t\t\t\tpagesize = <128>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\t\t\t\n" - "> +\t\t\ti2c1: i2c@fff88000 {\n" + "> +\t\t\ti2c1: i2c at fff88000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts\n" "> index f4e43e3..912b2c2 100644\n" "> --- a/arch/arm/boot/dts/at91sam9n12ek.dts\n" "> +++ b/arch/arm/boot/dts/at91sam9n12ek.dts\n" "> @@ -37,6 +37,14 @@\n" - "> \t\t\tdbgu: serial@fffff200 {\n" + "> \t\t\tdbgu: serial at fffff200 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> +\n" - "> +\t\t\ti2c0: i2c@f8010000 {\n" + "> +\t\t\ti2c0: i2c at f8010000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ti2c1: i2c@f8014000 {\n" + "> +\t\t\ti2c1: i2c at f8014000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> \t\t};\n" "> \n" - "> \t\tnand0: nand@40000000 {\n" + "> \t\tnand0: nand at 40000000 {\n" "> \n" "\n" "\n" "-- \n" Nicolas Ferre -2b2e06459927177ddc27a9706b0cdbf49fa1b2f6f63a2489340a481659435708 +dcb01531335da9df31ce572d21e06b7228f20ff2ad67afe3725e8d5f987574b9
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.