diff for duplicates of <20140903090916.4a624739@bbrezillon> diff --git a/a/1.txt b/N1/1.txt index cf57f3a..87d5714 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,7 @@ Erik van Luijk <evanluijk@interact.nl> wrote: > >> status = "disabled"; > >> }; > >> -> >> + rtc at fffffdb0 { +> >> + rtc@fffffdb0 { > >> + compatible = "atmel,at91rm9200-rtc"; > >> + reg = <0xfffffdb0 0x30>; > > @@ -59,7 +59,7 @@ Given this input, you should keep your definition ;-). > >> + status = "disabled"; > >> + }; > >> + -> >> spi0: spi at fffa4000 { +> >> spi0: spi@fffa4000 { > >> #address-cells = <1>; > >> #size-cells = <0>; > >> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -69,10 +69,10 @@ Given this input, you should keep your definition ;-). > >> +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts > >> @@ -70,6 +70,9 @@ > >> -> >> watchdog at fffffd40 { +> >> watchdog@fffffd40 { > >> status = "okay"; > >> + -> >> + rtc at fffffdb0 { +> >> + rtc@fffffdb0 { > >> + status = "okay"; > > > > Try to keep SoC and board changes in distinct commits. @@ -82,7 +82,7 @@ Given this input, you should keep your definition ;-). > > > >> }; > >> -> >> mmc0: mmc at fff80000 { +> >> mmc0: mmc@fff80000 { > > > > > > Best Regards, diff --git a/a/content_digest b/N1/content_digest index a50eeed..006d041 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,15 @@ "ref\01409655132-17735-1-git-send-email-evanluijk@interact.nl\0" "ref\020140902183356.7bcfdf84@bbrezillon\0" "ref\05406B098.6020500@interact.nl\0" - "From\0boris.brezillon@free-electrons.com (Boris BREZILLON)\0" - "Subject\0[PATCH] ARM: at91/dt: at91sam9m10g45ek add rtc node\0" + "From\0Boris BREZILLON <boris.brezillon@free-electrons.com>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: at91sam9m10g45ek add rtc node\0" "Date\0Wed, 3 Sep 2014 09:09:16 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Erik van Luijk <evanluijk@interact.nl>\0" + "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" "\00:1\0" "b\0" "On Wed, 03 Sep 2014 08:09:28 +0200\n" @@ -39,7 +44,7 @@ "> >> status = \"disabled\";\n" "> >> };\n" "> >>\n" - "> >> + rtc at fffffdb0 {\n" + "> >> + rtc@fffffdb0 {\n" "> >> + compatible = \"atmel,at91rm9200-rtc\";\n" "> >> + reg = <0xfffffdb0 0x30>;\n" "> >\n" @@ -68,7 +73,7 @@ "> >> + status = \"disabled\";\n" "> >> + };\n" "> >> +\n" - "> >> spi0: spi at fffa4000 {\n" + "> >> spi0: spi@fffa4000 {\n" "> >> #address-cells = <1>;\n" "> >> #size-cells = <0>;\n" "> >> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts \n" @@ -78,10 +83,10 @@ "> >> +++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts\n" "> >> @@ -70,6 +70,9 @@\n" "> >>\n" - "> >> watchdog at fffffd40 {\n" + "> >> watchdog@fffffd40 {\n" "> >> status = \"okay\";\n" "> >> +\n" - "> >> + rtc at fffffdb0 {\n" + "> >> + rtc@fffffdb0 {\n" "> >> + status = \"okay\";\n" "> >\n" "> > Try to keep SoC and board changes in distinct commits.\n" @@ -91,7 +96,7 @@ "> >\n" "> >> };\n" "> >>\n" - "> >> mmc0: mmc at fff80000 {\n" + "> >> mmc0: mmc@fff80000 {\n" "> >\n" "> >\n" "> > Best Regards,\n" @@ -110,4 +115,4 @@ "Embedded Linux and Kernel engineering\n" http://free-electrons.com -f82bf031a0eee920cc92a9a0243c0d8535fe6cafccd199b1e5ec3cbef517edd0 +c7f92ff2b31323ff11435123ffd4ce8f50a9611bc71bebd3b5c19497309bd200
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.