diff for duplicates of <4F05D2F3.40704@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 274643e..29bc8ff 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ On 01/05/2012 11:25 AM, Nicolas Ferre wrote: -> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> +> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> > > Retreive registers address and IRQ from device tree entry. Fall back > to built-in values if an error occurs. > -> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> -> [nicolas.ferre at atmel.com: change error path and interrupts property handling] -> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com> +> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> +> [nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org: change error path and interrupts property handling] +> Signed-off-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > --- > v3: - use irq_of_parse_and_map() for handling irq numbers specified by DT. > Correction proposed by Jamie Iles. @@ -45,13 +45,13 @@ On 01/05/2012 11:25 AM, Nicolas Ferre wrote: > reg = <0xfffff000 0x200>; > }; > -> + pit: timer at fffffd30 { +> + pit: timer@fffffd30 { > + compatible = "atmel,at91sam9260-pit"; > + reg = <0xfffffd30 0xf>; > + interrupts = <1 4>; > + }; > -> pioA: gpio at fffff400 { +> pioA: gpio@fffff400 { > compatible = "atmel,at91rm9200-gpio"; > diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi > index b977a79..0d21c8e 100644 @@ -61,13 +61,13 @@ On 01/05/2012 11:25 AM, Nicolas Ferre wrote: > reg = <0xfffff000 0x200>; > }; > -> + pit: timer at fffffd30 { +> + pit: timer@fffffd30 { > + compatible = "atmel,at91sam9260-pit"; > + reg = <0xfffffd30 0xf>; > + interrupts = <1 4>; > + }; > + -> dma: dma-controller at ffffec00 { +> dma: dma-controller@ffffec00 { > compatible = "atmel,at91sam9g45-dma"; > reg = <0xffffec00 0x200>; > diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c @@ -169,7 +169,7 @@ something like this: Otherwise, -Acked-by: Rob Herring <rob.herring@calxeda.com> +Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> Rob diff --git a/a/content_digest b/N1/content_digest index e63b91a..fa0f960 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,23 @@ "ref\01325771308-19770-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\01325784348-29481-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0robherring2@gmail.com (Rob Herring)\0" - "Subject\0[PATCH v3] ARM: at91: pit add DT support\0" + "ref\01325784348-29481-1-git-send-email-nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" + "From\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v3] ARM: at91: pit add DT support\0" "Date\0Thu, 05 Jan 2012 10:42:27 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On 01/05/2012 11:25 AM, Nicolas Ferre wrote:\n" - "> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\n" + "> From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>\n" "> \n" "> Retreive registers address and IRQ from device tree entry. Fall back\n" "> to built-in values if an error occurs.\n" "> \n" - "> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\n" - "> [nicolas.ferre at atmel.com: change error path and interrupts property handling]\n" - "> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" + "> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org>\n" + "> [nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org: change error path and interrupts property handling]\n" + "> Signed-off-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "> ---\n" "> v3: - use irq_of_parse_and_map() for handling irq numbers specified by DT.\n" "> Correction proposed by Jamie Iles.\n" @@ -53,13 +56,13 @@ "> \t\t\t\treg = <0xfffff000 0x200>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tpit: timer at fffffd30 {\n" + "> +\t\t\tpit: timer@fffffd30 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> +\t\t\t\treg = <0xfffffd30 0xf>;\n" "> +\t\t\t\tinterrupts = <1 4>;\n" "> +\t\t\t};\n" "> \n" - "> \t\t\tpioA: gpio at fffff400 {\n" + "> \t\t\tpioA: gpio@fffff400 {\n" "> \t\t\t\tcompatible = \"atmel,at91rm9200-gpio\";\n" "> diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi\n" "> index b977a79..0d21c8e 100644\n" @@ -69,13 +72,13 @@ "> \t\t\t\treg = <0xfffff000 0x200>;\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tpit: timer at fffffd30 {\n" + "> +\t\t\tpit: timer@fffffd30 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-pit\";\n" "> +\t\t\t\treg = <0xfffffd30 0xf>;\n" "> +\t\t\t\tinterrupts = <1 4>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tdma: dma-controller at ffffec00 {\n" + "> \t\t\tdma: dma-controller@ffffec00 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9g45-dma\";\n" "> \t\t\t\treg = <0xffffec00 0x200>;\n" "> diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/arch/arm/mach-at91/at91sam926x_time.c\n" @@ -177,7 +180,7 @@ "\n" "Otherwise,\n" "\n" - "Acked-by: Rob Herring <rob.herring@calxeda.com>\n" + "Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\n" "\n" "Rob\n" "\n" @@ -185,4 +188,4 @@ "> \n" "> \tif (!pit_base_addr)" -92389d70f814f45aef9c53e21ef26b3d84a9936fed1d00241f8acb34c8d66eab +319e204da3d9b98688b4eee0ed088cc8478985a2e1d978b759d78bca890522e5
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.