diff for duplicates of <201106161620.37205.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index f5ca10d..ca5f601 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,25 +8,25 @@ Hi Grant, Two small questions about the device tree contents: -> + i2c at 10002000 { +> + i2c@10002000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "arm,versatile-i2c"; > + reg = <0x10002000 0x1000>; > + -> + rtc at 68 { +> + rtc@68 { > + compatible = "dallas,ds1338"; > + reg = <0x68>; > + }; > + }; > + -> + net at 10010000 { +> + net@10010000 { > + compatible = "smsc,lan91c111"; > + reg = <0x10010000 0x10000>; > + interrupts = <25>; > + }; > + -> + lcd at 10008000 { +> + lcd@10008000 { > + compatible = "arm,versatile-lcd"; > + reg = <0x10008000 0x1000>; > + }; @@ -41,7 +41,7 @@ in the FPGA, which would also match the address layout. > + #size-cells = <1>; > + ranges; > + -> + vic: intc at 10140000 { +> + vic: intc@10140000 { > + compatible = "arm,versatile-vic", "arm,vic"; > + interrupt-controller; > + #interrupt-cells = <1>; diff --git a/a/content_digest b/N1/content_digest index 718d038..bb64a3f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\020110616042653.29371.2052.stgit@ponder\0" "ref\020110616044311.29371.49018.stgit@ponder\0" - "From\0arnd@arndb.de (Arnd Bergmann)\0" - "Subject\0[RFC PATCH 11/11] arm/versatile: Add device tree support\0" + "From\0Arnd Bergmann <arnd@arndb.de>\0" + "Subject\0Re: [RFC PATCH 11/11] arm/versatile: Add device tree support\0" "Date\0Thu, 16 Jun 2011 16:20:37 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Grant Likely <grant.likely@secretlab.ca>\0" + "Cc\0Nicolas Pitre <nicolas.pitre@linaro.org>" + Russell King <linux@arm.linux.org.uk> + devicetree-discuss@lists.ozlabs.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thursday 16 June 2011, Grant Likely wrote:\n" @@ -16,25 +21,25 @@ "\n" "Two small questions about the device tree contents:\n" "\n" - "> + i2c at 10002000 {\n" + "> + i2c@10002000 {\n" "> + #address-cells = <1>;\n" "> + #size-cells = <0>;\n" "> + compatible = \"arm,versatile-i2c\";\n" "> + reg = <0x10002000 0x1000>;\n" "> +\n" - "> + rtc at 68 {\n" + "> + rtc@68 {\n" "> + compatible = \"dallas,ds1338\";\n" "> + reg = <0x68>;\n" "> + };\n" "> + };\n" "> +\n" - "> + net at 10010000 {\n" + "> + net@10010000 {\n" "> + compatible = \"smsc,lan91c111\";\n" "> + reg = <0x10010000 0x10000>;\n" "> + interrupts = <25>;\n" "> + };\n" "> +\n" - "> + lcd at 10008000 {\n" + "> + lcd@10008000 {\n" "> + compatible = \"arm,versatile-lcd\";\n" "> + reg = <0x10008000 0x1000>;\n" "> + };\n" @@ -49,7 +54,7 @@ "> + #size-cells = <1>;\n" "> + ranges;\n" "> +\n" - "> + vic: intc at 10140000 {\n" + "> + vic: intc@10140000 {\n" "> + compatible = \"arm,versatile-vic\", \"arm,vic\";\n" "> + interrupt-controller;\n" "> + #interrupt-cells = <1>;\n" @@ -62,4 +67,4 @@ "\n" "\tArnd" -f2eccb64b2782c5dd328e52c68f1ea199150df4da9010fd2836b8215d2e318d1 +518737cf33f04b5e25dcf3f2948b4778443f9dc893c0c8ce24b4dd4550a275a6
diff --git a/a/1.txt b/N2/1.txt index f5ca10d..ca5f601 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,25 +8,25 @@ Hi Grant, Two small questions about the device tree contents: -> + i2c at 10002000 { +> + i2c@10002000 { > + #address-cells = <1>; > + #size-cells = <0>; > + compatible = "arm,versatile-i2c"; > + reg = <0x10002000 0x1000>; > + -> + rtc at 68 { +> + rtc@68 { > + compatible = "dallas,ds1338"; > + reg = <0x68>; > + }; > + }; > + -> + net at 10010000 { +> + net@10010000 { > + compatible = "smsc,lan91c111"; > + reg = <0x10010000 0x10000>; > + interrupts = <25>; > + }; > + -> + lcd at 10008000 { +> + lcd@10008000 { > + compatible = "arm,versatile-lcd"; > + reg = <0x10008000 0x1000>; > + }; @@ -41,7 +41,7 @@ in the FPGA, which would also match the address layout. > + #size-cells = <1>; > + ranges; > + -> + vic: intc at 10140000 { +> + vic: intc@10140000 { > + compatible = "arm,versatile-vic", "arm,vic"; > + interrupt-controller; > + #interrupt-cells = <1>; diff --git a/a/content_digest b/N2/content_digest index 718d038..cb90441 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,14 @@ "ref\020110616042653.29371.2052.stgit@ponder\0" "ref\020110616044311.29371.49018.stgit@ponder\0" - "From\0arnd@arndb.de (Arnd Bergmann)\0" - "Subject\0[RFC PATCH 11/11] arm/versatile: Add device tree support\0" + "From\0Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" + "Subject\0Re: [RFC PATCH 11/11] arm/versatile: Add device tree support\0" "Date\0Thu, 16 Jun 2011 16:20:37 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>\0" + "Cc\0Nicolas Pitre <nicolas.pitre-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>" + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Thursday 16 June 2011, Grant Likely wrote:\n" @@ -16,25 +21,25 @@ "\n" "Two small questions about the device tree contents:\n" "\n" - "> + i2c at 10002000 {\n" + "> + i2c@10002000 {\n" "> + #address-cells = <1>;\n" "> + #size-cells = <0>;\n" "> + compatible = \"arm,versatile-i2c\";\n" "> + reg = <0x10002000 0x1000>;\n" "> +\n" - "> + rtc at 68 {\n" + "> + rtc@68 {\n" "> + compatible = \"dallas,ds1338\";\n" "> + reg = <0x68>;\n" "> + };\n" "> + };\n" "> +\n" - "> + net at 10010000 {\n" + "> + net@10010000 {\n" "> + compatible = \"smsc,lan91c111\";\n" "> + reg = <0x10010000 0x10000>;\n" "> + interrupts = <25>;\n" "> + };\n" "> +\n" - "> + lcd at 10008000 {\n" + "> + lcd@10008000 {\n" "> + compatible = \"arm,versatile-lcd\";\n" "> + reg = <0x10008000 0x1000>;\n" "> + };\n" @@ -49,7 +54,7 @@ "> + #size-cells = <1>;\n" "> + ranges;\n" "> +\n" - "> + vic: intc at 10140000 {\n" + "> + vic: intc@10140000 {\n" "> + compatible = \"arm,versatile-vic\", \"arm,vic\";\n" "> + interrupt-controller;\n" "> + #interrupt-cells = <1>;\n" @@ -62,4 +67,4 @@ "\n" "\tArnd" -f2eccb64b2782c5dd328e52c68f1ea199150df4da9010fd2836b8215d2e318d1 +6c53ebe173d405b260cb703f633ecd7d85d651510965b5276e6070151477d9e2
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.