diff for duplicates of <20140902183356.7bcfdf84@bbrezillon> diff --git a/a/1.txt b/N1/1.txt index 4c3eed8..df05794 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com> > status = "disabled"; > }; > -> + rtc at fffffdb0 { +> + rtc@fffffdb0 { > + compatible = "atmel,at91rm9200-rtc"; > + reg = <0xfffffdb0 0x30>; @@ -35,7 +35,7 @@ consistent with the datasheet. > + 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 @@ -44,17 +44,17 @@ consistent with the datasheet. > +++ 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. > }; > -> mmc0: mmc at fff80000 { +> mmc0: mmc@fff80000 { Best Regards, diff --git a/a/content_digest b/N1/content_digest index e3879ed..77363dc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,13 @@ "ref\01409655132-17735-1-git-send-email-evanluijk@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\0Tue, 2 Sep 2014 18:33:56 +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" "Hi Erik,\n" @@ -29,7 +34,7 @@ "> \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" "\n" @@ -42,7 +47,7 @@ "> +\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" @@ -51,17 +56,17 @@ "> +++ 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" - "> +\t\t\trtc at fffffdb0 {\n" + "> +\t\t\trtc@fffffdb0 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "\n" "Try to keep SoC and board changes in distinct commits.\n" "\n" "> \t\t\t};\n" "> \n" - "> \t\t\tmmc0: mmc at fff80000 {\n" + "> \t\t\tmmc0: mmc@fff80000 {\n" "\n" "\n" "Best Regards,\n" @@ -73,4 +78,4 @@ "Embedded Linux and Kernel engineering\n" http://free-electrons.com -b9bddd6e3e101af6471f567f6d4b0eede711c56949c9c2dc03370214b8bc59ae +46857f554e439537a9a030a82a66c6a6acfff4e0b944e0a420f51949f79b5a16
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.