diff for duplicates of <53206D2A.1090403@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 30c2386..b18f695 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,12 +1,12 @@ -On 26/02/2014 17:29, ludovic.desroches at atmel.com : -> From: Ludovic Desroches <ludovic.desroches@atmel.com> +On 26/02/2014 17:29, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org : +> From: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> > > Touchscreen support for at91_adc has been introduced so we can get rid of > atmel_tsadcc. > -> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> +> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> -Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> +Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> stacked on at91-3.15-dt. @@ -24,7 +24,7 @@ Thanks, > @@ -239,7 +239,7 @@ > }; > -> adc0: adc at f8018000 { +> adc0: adc@f8018000 { > - compatible = "atmel,at91sam9260-adc"; > + compatible = "atmel,at91sam9x5-adc"; > reg = <0xf8018000 0x100>; @@ -34,7 +34,7 @@ Thanks, > }; > }; > -> - tsadcc: tsadcc at f8018000 { +> - tsadcc: tsadcc@f8018000 { > - compatible = "atmel,at91sam9x5-tsadcc"; > - reg = <0xf8018000 0x4000>; > - interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; @@ -46,7 +46,7 @@ Thanks, > - status = "disabled"; > - }; > - -> i2c2: i2c at f801c000 { +> i2c2: i2c@f801c000 { > compatible = "atmel,at91sam9x5-i2c"; > reg = <0xf801c000 0x4000>; > diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi b/arch/arm/boot/dts/sama5d3xdm.dtsi @@ -56,11 +56,11 @@ Thanks, > @@ -23,10 +23,9 @@ > }; > -> adc0: adc at f8018000 { +> adc0: adc@f8018000 { > - status = "disabled"; > - }; > - -> - tsadcc: tsadcc at f8018000 { +> - tsadcc: tsadcc@f8018000 { > + atmel,adc-clock-rate = <1000000>; > + atmel,adc-ts-wires = <4>; > + atmel,adc-ts-pressure-threshold = <10000>; @@ -72,3 +72,7 @@ Thanks, -- Nicolas Ferre +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index d5e271d..7f54e9f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,23 @@ "ref\01393432190-8799-1-git-send-email-ludovic.desroches@atmel.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91: sama5d3: get rid of atmel_tsadcc driver\0" + "ref\01393432190-8799-1-git-send-email-ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: at91: sama5d3: get rid of atmel_tsadcc driver\0" "Date\0Wed, 12 Mar 2014 15:20:26 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org" + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "Cc\0plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org" + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" - "On 26/02/2014 17:29, ludovic.desroches at atmel.com :\n" - "> From: Ludovic Desroches <ludovic.desroches@atmel.com>\n" + "On 26/02/2014 17:29, ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org :\n" + "> From: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "> \n" "> Touchscreen support for at91_adc has been introduced so we can get rid of\n" "> atmel_tsadcc.\n" "> \n" - "> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>\n" + "> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" - "Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>\n" + "Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "\n" "stacked on at91-3.15-dt.\n" "\n" @@ -31,7 +35,7 @@ "> @@ -239,7 +239,7 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tadc0: adc at f8018000 {\n" + "> \t\t\tadc0: adc@f8018000 {\n" "> -\t\t\t\tcompatible = \"atmel,at91sam9260-adc\";\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9x5-adc\";\n" "> \t\t\t\treg = <0xf8018000 0x100>;\n" @@ -41,7 +45,7 @@ "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> -\t\t\ttsadcc: tsadcc at f8018000 {\n" + "> -\t\t\ttsadcc: tsadcc@f8018000 {\n" "> -\t\t\t\tcompatible = \"atmel,at91sam9x5-tsadcc\";\n" "> -\t\t\t\treg = <0xf8018000 0x4000>;\n" "> -\t\t\t\tinterrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -53,7 +57,7 @@ "> -\t\t\t\tstatus = \"disabled\";\n" "> -\t\t\t};\n" "> -\n" - "> \t\t\ti2c2: i2c at f801c000 {\n" + "> \t\t\ti2c2: i2c@f801c000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9x5-i2c\";\n" "> \t\t\t\treg = <0xf801c000 0x4000>;\n" "> diff --git a/arch/arm/boot/dts/sama5d3xdm.dtsi b/arch/arm/boot/dts/sama5d3xdm.dtsi\n" @@ -63,11 +67,11 @@ "> @@ -23,10 +23,9 @@\n" "> \t\t\t};\n" "> \n" - "> \t\t\tadc0: adc at f8018000 {\n" + "> \t\t\tadc0: adc@f8018000 {\n" "> -\t\t\t\tstatus = \"disabled\";\n" "> -\t\t\t};\n" "> -\n" - "> -\t\t\ttsadcc: tsadcc at f8018000 {\n" + "> -\t\t\ttsadcc: tsadcc@f8018000 {\n" "> +\t\t\t\tatmel,adc-clock-rate = <1000000>;\n" "> +\t\t\t\tatmel,adc-ts-wires = <4>;\n" "> +\t\t\t\tatmel,adc-ts-pressure-threshold = <10000>;\n" @@ -78,6 +82,10 @@ "\n" "\n" "-- \n" - Nicolas Ferre + "Nicolas Ferre\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -0904ae939a3c77ed8df61bc7e5703dced418a6a74ac250ff780c5295985a15b8 +75b0bc0d238e4538ec7cf4e67d9be498aa755a058e9b36c50aabd1b728ef80ec
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.