diff for duplicates of <546CBE04.1000705@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 6acc551..124f0e8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -26,14 +26,14 @@ Bye, > status = "disabled"; > }; > -> + trng at fffcc000 { +> + trng@fffcc000 { > + compatible = "atmel,at91sam9g45-trng"; > + reg = <0xfffcc000 0x4000>; > + interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>; > + clocks = <&trng_clk>; > + }; > + -> i2c0: i2c at fff84000 { +> i2c0: i2c@fff84000 { > compatible = "atmel,at91sam9g10-i2c"; > reg = <0xfff84000 0x100>; > diff --git a/a/content_digest b/N1/content_digest index d2047af..24557c9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,23 @@ "ref\01412093987-30241-1-git-send-email-boris.brezillon@free-electrons.com\0" "ref\01412093987-30241-6-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 5/6] ARM: at91/dt: add trng node\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 5/6] ARM: at91/dt: add trng node\0" "Date\0Wed, 19 Nov 2014 16:57:56 +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\0linux-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" @@ -34,14 +48,14 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ttrng at fffcc000 {\n" + "> +\t\t\ttrng@fffcc000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-trng\";\n" "> +\t\t\t\treg = <0xfffcc000 0x4000>;\n" "> +\t\t\t\tinterrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;\n" "> +\t\t\t\tclocks = <&trng_clk>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\ti2c0: i2c at fff84000 {\n" + "> \t\t\ti2c0: i2c@fff84000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9g10-i2c\";\n" "> \t\t\t\treg = <0xfff84000 0x100>;\n" "> \n" @@ -50,4 +64,4 @@ "-- \n" Nicolas Ferre -4030662e80f97b33e3b869a862007c2e48e62dd22ef4d262855cc40782144325 +aa7afe8c32ab39a084a404aa3a3ca5b17f5699b327c5ca8f1effe0b6713d20de
diff --git a/a/1.txt b/N2/1.txt index 6acc551..124f0e8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -26,14 +26,14 @@ Bye, > status = "disabled"; > }; > -> + trng at fffcc000 { +> + trng@fffcc000 { > + compatible = "atmel,at91sam9g45-trng"; > + reg = <0xfffcc000 0x4000>; > + interrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>; > + clocks = <&trng_clk>; > + }; > + -> i2c0: i2c at fff84000 { +> i2c0: i2c@fff84000 { > compatible = "atmel,at91sam9g10-i2c"; > reg = <0xfff84000 0x100>; > diff --git a/a/content_digest b/N2/content_digest index d2047af..de5a077 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-6-git-send-email-boris.brezillon@free-electrons.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH 5/6] ARM: at91/dt: add trng node\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH 5/6] ARM: at91/dt: add trng node\0" "Date\0Wed, 19 Nov 2014 16:57:56 +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" @@ -34,14 +48,14 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\ttrng at fffcc000 {\n" + "> +\t\t\ttrng@fffcc000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-trng\";\n" "> +\t\t\t\treg = <0xfffcc000 0x4000>;\n" "> +\t\t\t\tinterrupts = <6 IRQ_TYPE_LEVEL_HIGH 0>;\n" "> +\t\t\t\tclocks = <&trng_clk>;\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\ti2c0: i2c at fff84000 {\n" + "> \t\t\ti2c0: i2c@fff84000 {\n" "> \t\t\t\tcompatible = \"atmel,at91sam9g10-i2c\";\n" "> \t\t\t\treg = <0xfff84000 0x100>;\n" "> \n" @@ -50,4 +64,4 @@ "-- \n" Nicolas Ferre -4030662e80f97b33e3b869a862007c2e48e62dd22ef4d262855cc40782144325 +f714389bb6d33cedaff9132946356a9d6227f018b9f8d7f6b89561a2fa94cf00
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.