diff for duplicates of <546CBC6B.2040408@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 66bf9d2..74cac72 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ On 30/09/2014 18:19, Boris Brezillon : > Add ISI (Image Sensor Interface) DT node. > -> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> +> Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> I take this one for at91-3.19-dt2 @@ -40,14 +40,14 @@ Thanks, best regards. > + }; > + }; > + -> pioA: gpio at fffff200 { +> pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff200 0x200>; > @@ -1029,6 +1050,17 @@ > }; > }; > -> + isi at fffb4000 { +> + isi@fffb4000 { > + compatible = "atmel,at91sam9g45-isi"; > + reg = <0xfffb4000 0x4000>; > + interrupts = <26 IRQ_TYPE_LEVEL_HIGH 5>; @@ -58,7 +58,7 @@ Thanks, best regards. > + status = "disabled"; > + }; > + -> pwm0: pwm at fffb8000 { +> pwm0: pwm@fffb8000 { > compatible = "atmel,at91sam9rl-pwm"; > reg = <0xfffb8000 0x300>; > @@ -66,3 +66,7 @@ Thanks, best regards. -- 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 c9fa03f..5c8c650 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,30 @@ "ref\01412093987-30241-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01412093987-30241-7-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 6/6] ARM: at91/dt: add ISI node\0" + "ref\01412093987-30241-7-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" + "From\0Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH 6/6] ARM: at91/dt: add ISI node\0" "Date\0Wed, 19 Nov 2014 16:51:07 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + Jean-Christophe Plagniol-Villard <plagnioj-sclMFOaUSTBWk0Htik3J/w@public.gmane.org> + Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + Andrew Victor <linux-PelNFVqkFnVyf+4FbqDuWQ@public.gmane.org> + Peter Korsgaard <jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org> + Matt Mackall <mpm-VDJrAJ4Gl5ZBDgjK7y7TUQ@public.gmane.org> + " Herbert Xu <herbert-lOAM2aK0SrRLBo1qDEOMRrpzq4S04n8Q@public.gmane.org>\0" + "Cc\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On 30/09/2014 18:19, Boris Brezillon :\n" "> Add ISI (Image Sensor Interface) DT node.\n" "> \n" - "> Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>\n" + "> Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" "\n" "I take this one for at91-3.19-dt2\n" "\n" @@ -48,14 +63,14 @@ "> +\t\t\t\t\t};\n" "> +\t\t\t\t};\n" "> +\n" - "> \t\t\t\tpioA: gpio at fffff200 {\n" + "> \t\t\t\tpioA: gpio@fffff200 {\n" "> \t\t\t\t\tcompatible = \"atmel,at91rm9200-gpio\";\n" "> \t\t\t\t\treg = <0xfffff200 0x200>;\n" "> @@ -1029,6 +1050,17 @@\n" "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tisi at fffb4000 {\n" + "> +\t\t\tisi@fffb4000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-isi\";\n" "> +\t\t\t\treg = <0xfffb4000 0x4000>;\n" "> +\t\t\t\tinterrupts = <26 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -66,13 +81,17 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpwm0: pwm at fffb8000 {\n" + "> \t\t\tpwm0: pwm@fffb8000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9rl-pwm\";\n" "> \t\t\t\treg = <0xfffb8000 0x300>;\n" "> \n" "\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 -99099ee74bdde890e3421c2beb19b5b794824baa911283631ae4b0b282f14b4f +3d6c95afe4c3fbab17e5c7f850469b5d0ce6a1d1b112cac74c7f24b57b60a8c1
diff --git a/a/1.txt b/N2/1.txt index 66bf9d2..fdef052 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -40,14 +40,14 @@ Thanks, best regards. > + }; > + }; > + -> pioA: gpio at fffff200 { +> pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff200 0x200>; > @@ -1029,6 +1050,17 @@ > }; > }; > -> + isi at fffb4000 { +> + isi@fffb4000 { > + compatible = "atmel,at91sam9g45-isi"; > + reg = <0xfffb4000 0x4000>; > + interrupts = <26 IRQ_TYPE_LEVEL_HIGH 5>; @@ -58,7 +58,7 @@ Thanks, best regards. > + status = "disabled"; > + }; > + -> pwm0: pwm at fffb8000 { +> pwm0: pwm@fffb8000 { > compatible = "atmel,at91sam9rl-pwm"; > reg = <0xfffb8000 0x300>; > diff --git a/a/content_digest b/N2/content_digest index c9fa03f..5dc0067 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,23 @@ "ref\01412093987-30241-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01412093987-30241-7-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 6/6] ARM: at91/dt: add ISI node\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 6/6] ARM: at91/dt: add ISI node\0" "Date\0Wed, 19 Nov 2014 16:51:07 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris Brezillon <boris.brezillon@free-electrons.com>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Alexandre Belloni <alexandre.belloni@free-electrons.com> + Andrew Victor <linux@maxim.org.za> + Peter Korsgaard <jacmet@sunsite.dk> + Matt Mackall <mpm@selenic.com> + " Herbert Xu <herbert@gondor.apana.org.au>\0" + "Cc\0<linux-arm-kernel@lists.infradead.org>" + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + <devicetree@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 30/09/2014 18:19, Boris Brezillon :\n" @@ -48,14 +62,14 @@ "> +\t\t\t\t\t};\n" "> +\t\t\t\t};\n" "> +\n" - "> \t\t\t\tpioA: gpio at fffff200 {\n" + "> \t\t\t\tpioA: gpio@fffff200 {\n" "> \t\t\t\t\tcompatible = \"atmel,at91rm9200-gpio\";\n" "> \t\t\t\t\treg = <0xfffff200 0x200>;\n" "> @@ -1029,6 +1050,17 @@\n" "> \t\t\t\t};\n" "> \t\t\t};\n" "> \n" - "> +\t\t\tisi at fffb4000 {\n" + "> +\t\t\tisi@fffb4000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-isi\";\n" "> +\t\t\t\treg = <0xfffb4000 0x4000>;\n" "> +\t\t\t\tinterrupts = <26 IRQ_TYPE_LEVEL_HIGH 5>;\n" @@ -66,7 +80,7 @@ "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tpwm0: pwm at fffb8000 {\n" + "> \t\t\tpwm0: pwm@fffb8000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9rl-pwm\";\n" "> \t\t\t\treg = <0xfffb8000 0x300>;\n" "> \n" @@ -75,4 +89,4 @@ "-- \n" Nicolas Ferre -99099ee74bdde890e3421c2beb19b5b794824baa911283631ae4b0b282f14b4f +eb0e6bda0f392d6cb776b04ae93d9efc5fb891ea1654e164da17287f33e9b248
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.