diff for duplicates of <4F072F2D.20806@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 586ad40..a252d66 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,15 +1,15 @@ On 01/06/2012 04:47 PM, Rob Herring : > On 01/06/2012 10:20 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> ->> Reviewed-by: Jamie Iles <jamie@jamieiles.com> ->> Acked-by: Rob Herring <rob.herring@calxeda.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> +>> Reviewed-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org> +>> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> >> --- >> v4: - change of_at91sam926x_pit_init() return value usage logic as >> suggested by Rob Herring @@ -53,13 +53,13 @@ On 01/06/2012 04:47 PM, Rob Herring : >> 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 ebc9617..28a678f 100644 @@ -69,13 +69,13 @@ On 01/06/2012 04:47 PM, Rob Herring : >> 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 diff --git a/a/content_digest b/N1/content_digest index 43256fc..11fc291 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,28 @@ "ref\01325784348-29481-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\01325866830-13259-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\04F071799.3030200@gmail.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH v4] ARM: at91: pit add DT support\0" + "ref\04F071799.3030200-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH v4] ARM: at91: pit add DT support\0" "Date\0Fri, 06 Jan 2012 18:28:13 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + " plagnioj-sclMFOaUSTBWk0Htik3J/w@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/06/2012 04:47 PM, Rob Herring :\n" "> On 01/06/2012 10:20 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" - ">> Reviewed-by: Jamie Iles <jamie@jamieiles.com>\n" - ">> Acked-by: Rob Herring <rob.herring@calxeda.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" + ">> Reviewed-by: Jamie Iles <jamie-wmLquQDDieKakBO8gow8eQ@public.gmane.org>\n" + ">> Acked-by: Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org>\n" ">> ---\n" ">> v4: - change of_at91sam926x_pit_init() return value usage logic as\n" ">> suggested by Rob Herring\n" @@ -62,13 +66,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 ebc9617..28a678f 100644\n" @@ -78,13 +82,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" @@ -206,4 +210,4 @@ "-- \n" Nicolas Ferre -1844a204858e5f3fa2c9ac78051f27dc60abb49acc9de74c6037dfc8facbb766 +17ba2c9e53361f1fd92ddb13c9f080f0d932fe17a8569a31a41f0a201180be3f
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.