diff for duplicates of <569A2BB6.4070602@kernel.org> diff --git a/a/1.txt b/N1/1.txt index f782a5f..e92909e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -32,12 +32,12 @@ Jonathan > - }; > }; > -> ns_sram: sram@00200000 { +> ns_sram: sram at 00200000 { > @@ -1085,6 +1079,18 @@ > status = "disabled"; > }; > -> + adc: adc@fc030000 { +> + adc: adc at fc030000 { > + compatible = "atmel,sama5d2-adc"; > + reg = <0xfc030000 0x100>; > + interrupts = <40 IRQ_TYPE_LEVEL_HIGH 7>; @@ -49,7 +49,7 @@ Jonathan > + status = "disabled"; > + }; > + -> pioA: pinctrl@fc038000 { +> pioA: pinctrl at fc038000 { > compatible = "atmel,sama5d2-pinctrl"; > reg = <0xfc038000 0x600>; > diff --git a/a/content_digest b/N1/content_digest index 1e7f8eb..cace466 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,9 @@ "ref\01452785897-16270-1-git-send-email-ludovic.desroches@atmel.com\0" "ref\01452785897-16270-4-git-send-email-ludovic.desroches@atmel.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" - "Subject\0Re: [PATCH v3 3/5] ARM: at91/dt: sama5d2: add adc device\0" + "From\0jic23@kernel.org (Jonathan Cameron)\0" + "Subject\0[PATCH v3 3/5] ARM: at91/dt: sama5d2: add adc device\0" "Date\0Sat, 16 Jan 2016 11:38:30 +0000\0" - "To\0Ludovic Desroches <ludovic.desroches@atmel.com>" - nicolas.ferre@atmel.com - " alexandre.belloni@free-electrons.com\0" - "Cc\0devicetree@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-iio@vger.kernel.org - plagnioj@jcrosoft.com - linux-arm-kernel@lists.infradead.org - pmeerw@pmeerw.net - " robh@kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 14/01/16 15:38, Ludovic Desroches wrote:\n" @@ -49,12 +40,12 @@ "> -\t\t};\n" "> \t};\n" "> \n" - "> \tns_sram: sram@00200000 {\n" + "> \tns_sram: sram at 00200000 {\n" "> @@ -1085,6 +1079,18 @@\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tadc: adc@fc030000 {\n" + "> +\t\t\tadc: adc at fc030000 {\n" "> +\t\t\t\tcompatible = \"atmel,sama5d2-adc\";\n" "> +\t\t\t\treg = <0xfc030000 0x100>;\n" "> +\t\t\t\tinterrupts = <40 IRQ_TYPE_LEVEL_HIGH 7>;\n" @@ -66,9 +57,9 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpioA: pinctrl@fc038000 {\n" + "> \t\t\tpioA: pinctrl at fc038000 {\n" "> \t\t\t\tcompatible = \"atmel,sama5d2-pinctrl\";\n" "> \t\t\t\treg = <0xfc038000 0x600>;\n" > -bef9004afa473b1d87270f97aee54daa4ebd4732a0a143aba8f5d68a009b4962 +6f37a5b32ba9bc847d0ae45f1b33c608a13268d556436a6a7981632c4810c22d
diff --git a/a/1.txt b/N2/1.txt index f782a5f..b08c16e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,7 +2,7 @@ On 14/01/16 15:38, Ludovic Desroches wrote: > Add the ADC device, and remove the adc_op_clk which is useless since the > adc sampling frequency is configured with sysfs. > -> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com> +> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org> I've now applied the driver to the togreg branch of iio.git. Should get a pull request out to Greg in about 2 weeks time and it'll probably be in linux-next a week after that. I'm assuming all the device diff --git a/a/content_digest b/N2/content_digest index 1e7f8eb..a172e41 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,25 +1,26 @@ "ref\01452785897-16270-1-git-send-email-ludovic.desroches@atmel.com\0" "ref\01452785897-16270-4-git-send-email-ludovic.desroches@atmel.com\0" - "From\0Jonathan Cameron <jic23@kernel.org>\0" + "ref\01452785897-16270-4-git-send-email-ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org\0" + "From\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH v3 3/5] ARM: at91/dt: sama5d2: add adc device\0" "Date\0Sat, 16 Jan 2016 11:38:30 +0000\0" - "To\0Ludovic Desroches <ludovic.desroches@atmel.com>" - nicolas.ferre@atmel.com - " alexandre.belloni@free-electrons.com\0" - "Cc\0devicetree@vger.kernel.org" - linux-kernel@vger.kernel.org - linux-iio@vger.kernel.org - plagnioj@jcrosoft.com - linux-arm-kernel@lists.infradead.org - pmeerw@pmeerw.net - " robh@kernel.org\0" + "To\0Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>" + nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org + " alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "Cc\0devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org + " robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" "\00:1\0" "b\0" "On 14/01/16 15:38, Ludovic Desroches wrote:\n" "> Add the ADC device, and remove the adc_op_clk which is useless since the\n" "> adc sampling frequency is configured with sysfs.\n" "> \n" - "> Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>\n" + "> Signed-off-by: Ludovic Desroches <ludovic.desroches-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\n" "I've now applied the driver to the togreg branch of iio.git.\n" "Should get a pull request out to Greg in about 2 weeks time and it'll\n" "probably be in linux-next a week after that. I'm assuming all the device\n" @@ -71,4 +72,4 @@ "> \t\t\t\treg = <0xfc038000 0x600>;\n" > -bef9004afa473b1d87270f97aee54daa4ebd4732a0a143aba8f5d68a009b4962 +43fb03fc5a448e0662a1898f32f151ea3760efb92beeb347e293d0f9d1591be7
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.