diff for duplicates of <541B05B1.6020302@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 3f8a0b8..0593994 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -21,14 +21,14 @@ thanks a lot for your help. > status = "disabled"; > }; > -> + rtc at fffffdb0 { +> + rtc@fffffdb0 { > + compatible = "atmel,at91rm9200-rtc"; > + reg = <0xfffffdb0 0x30>; > + interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; > + status = "disabled"; > + }; > + -> spi0: spi at fffa4000 { +> spi0: spi@fffa4000 { > #address-cells = <1>; > #size-cells = <0>; > diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -37,7 +37,7 @@ thanks a lot for your help. > +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > @@ -70,6 +70,9 @@ > -> watchdog at fffffd40 { +> watchdog@fffffd40 { > status = "okay"; BTW, there was an issue here: "};" missing.. @@ -45,11 +45,11 @@ BTW, there was an issue here: "};" missing.. I corrected it. > + -> + rtc at fffffdb0 { +> + rtc@fffffdb0 { > + status = "okay"; > }; > -> mmc0: mmc at fff80000 { +> mmc0: mmc@fff80000 { > diff --git a/a/content_digest b/N1/content_digest index 23af91d..97b05d8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,12 @@ "ref\01409655132-17735-1-git-send-email-evanluijk@interact.nl\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH] ARM: at91/dt: at91sam9m10g45ek add rtc node\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: at91sam9m10g45ek add rtc node\0" "Date\0Thu, 18 Sep 2014 18:17:53 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Erik van Luijk <evanluijk@interact.nl>" + " Boris BREZILLON <boris.brezillon@free-electrons.com>\0" + "Cc\0<linux-arm-kernel@lists.infradead.org>" + <linux-kernel@vger.kernel.org> + " Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>\0" "\00:1\0" "b\0" "On 02/09/2014 12:52, Erik van Luijk :\n" @@ -28,14 +32,14 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> +\t\t\trtc at fffffdb0 {\n" + "> +\t\t\trtc@fffffdb0 {\n" "> +\t\t\t\tcompatible = \"atmel,at91rm9200-rtc\";\n" "> +\t\t\t\treg = <0xfffffdb0 0x30>;\n" "> +\t\t\t\tinterrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> \t\t\tspi0: spi at fffa4000 {\n" + "> \t\t\tspi0: spi@fffa4000 {\n" "> \t\t\t\t#address-cells = <1>;\n" "> \t\t\t\t#size-cells = <0>;\n" "> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" @@ -44,7 +48,7 @@ "> +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> @@ -70,6 +70,9 @@\n" "> \n" - "> \t\t\twatchdog at fffffd40 {\n" + "> \t\t\twatchdog@fffffd40 {\n" "> \t\t\t\tstatus = \"okay\";\n" "\n" "BTW, there was an issue here: \"};\" missing..\n" @@ -52,15 +56,15 @@ "I corrected it.\n" "\n" "> +\n" - "> +\t\t\trtc at fffffdb0 {\n" + "> +\t\t\trtc@fffffdb0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> \t\t\t};\n" "> \n" - "> \t\t\tmmc0: mmc at fff80000 {\n" + "> \t\t\tmmc0: mmc@fff80000 {\n" "> \n" "\n" "\n" "-- \n" Nicolas Ferre -e1e955ea89cf8074d42cd267b2c859dab9b710f7ef4238463316be0d5e689e02 +c450c725f1d54cd50fd434ee99b5f33b76fa3049c51b9fd74e230f8fc1798c88
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.