diff for duplicates of <5406B098.6020500@interact.nl> diff --git a/a/1.txt b/N1/1.txt index 2dbac09..2e250e7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ b/arch/arm/boot/dts/at91sam9g45.dtsi >> status = "disabled"; >> }; >> - >> + rtc at fffffdb0 { + >> + rtc@fffffdb0 { >> + compatible = "atmel,at91rm9200-rtc"; >> + reg = <0xfffffdb0 0x30>; > @@ -52,7 +52,7 @@ Atmel. >> + status = "disabled"; >> + }; >> + - >> spi0: spi at fffa4000 { + >> spi0: spi@fffa4000 { >> #address-cells = <1>; >> #size-cells = <0>; >> diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts @@ -62,10 +62,10 @@ b/arch/arm/boot/dts/at91sam9m10g45ek.dts >> +++ 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. @@ -75,7 +75,7 @@ Understood. > >> }; >> - >> mmc0: mmc at fff80000 { + >> mmc0: mmc@fff80000 { > > > Best Regards, diff --git a/a/content_digest b/N1/content_digest index d307323..87295db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01409655132-17735-1-git-send-email-evanluijk@interact.nl\0" "ref\020140902183356.7bcfdf84@bbrezillon\0" - "From\0evanluijk@interact.nl (Erik van Luijk)\0" - "Subject\0[PATCH] ARM: at91/dt: at91sam9m10g45ek add rtc node\0" + "From\0Erik van Luijk <evanluijk@interact.nl>\0" + "Subject\0Re: [PATCH] ARM: at91/dt: at91sam9m10g45ek add rtc node\0" "Date\0Wed, 03 Sep 2014 08:09:28 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Boris BREZILLON <boris.brezillon@free-electrons.com>" + " Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0Jean-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" "\n" @@ -35,7 +40,7 @@ " >> status = \"disabled\";\n" " >> };\n" " >>\n" - " >> + rtc at fffffdb0 {\n" + " >> + rtc@fffffdb0 {\n" " >> + compatible = \"atmel,at91rm9200-rtc\";\n" " >> + reg = <0xfffffdb0 0x30>;\n" " >\n" @@ -60,7 +65,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" @@ -70,10 +75,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" @@ -83,7 +88,7 @@ ">\n" " >> };\n" " >>\n" - " >> mmc0: mmc at fff80000 {\n" + " >> mmc0: mmc@fff80000 {\n" " >\n" " >\n" " > Best Regards,\n" @@ -95,4 +100,4 @@ "\n" Erik -9f25c92ef56408c310d93ddb5c52d812be2124fed706c0d3e77f9c61eb6d54d6 +54ba965bbcab3552e6cb4a48581346da859f9593c83987433d0bd9906314424a
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.