diff for duplicates of <51A5C4F1.3010809@ti.com> diff --git a/a/1.txt b/N1/1.txt index d533dc2..38c8c75 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,12 +85,12 @@ Benoit >>> + }; >>> + >>> + cpus { ->>> + cpu@0 { +>>> + cpu at 0 { >>> + compatible = "arm,cortex-a9"; >>> + }; >>> + }; >>> + ->>> + gic: interrupt-controller@48241000 { +>>> + gic: interrupt-controller at 48241000 { >>> + compatible = "arm,cortex-a9-gic"; >>> + interrupt-controller; >>> + #interrupt-cells = <3>; @@ -104,26 +104,26 @@ Benoit >>> + #size-cells = <1>; >>> + ranges; >>> + ->>> + uart1: serial@44e09000 { +>>> + uart1: serial at 44e09000 { >>> + compatible = "ti,am4372-uart","ti,omap2-uart"; >>> + reg = <0x44e09000 0x2000>; >>> + interrupts = <0 72 0x4>; >>> + }; >>> + ->>> + timer1: timer@44e31000 { +>>> + timer1: timer at 44e31000 { >>> + compatible = "ti,am4372-timer-1ms","ti,am335x-timer-1ms"; >>> + reg = <0x44e31000 0x400>; >>> + interrupts = <0 67 0x4>; >>> + ti,timer-alwon; >>> + }; >>> + ->>> + timer2: timer@48040000 { +>>> + timer2: timer at 48040000 { >>> + compatible = "ti,am4372-timer","ti,am335x-timer"; >>> + reg = <0x48040000 0x400>; >>> + interrupts = <0 68 0x4>; >>> + }; >>> + ->>> + counter32k: counter@44e86000 { +>>> + counter32k: counter at 44e86000 { >>> + compatible = "ti,am4372-counter32k","ti,omap-counter32k"; >>> + reg = <0x44e86000 0x40>; >>> + }; diff --git a/a/content_digest b/N1/content_digest index cccb674..842cc03 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,21 +2,10 @@ "ref\03790fa57fc4c69da12224fbcec17cd07c59771a0.1369658705.git.afzal@ti.com\0" "ref\051A5C1F3.2070605@ti.com\0" "ref\051A5C2EE.4060607@epfl.ch\0" - "From\0Benoit Cousson <b-cousson@ti.com>\0" - "Subject\0Re: [PATCH v2 14/14] ARM: dts: AM43x: initial support\0" + "From\0b-cousson@ti.com (Benoit Cousson)\0" + "Subject\0[PATCH v2 14/14] ARM: dts: AM43x: initial support\0" "Date\0Wed, 29 May 2013 11:05:53 +0200\0" - "To\0florian.vaussard@epfl.ch\0" - "Cc\0Afzal Mohammed <afzal@ti.com>" - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - linux-doc@vger.kernel.org - linux-kernel@vger.kernel.org - Russell King <linux@arm.linux.org.uk> - Rob Herring <rob.herring@calxeda.com> - Ankur Kishore <a-kishore@ti.com> - Grant Likely <grant.likely@linaro.org> - " Benoit Cousson <benoit.cousson@linaro.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 05/29/2013 10:57 AM, Florian Vaussard wrote:\n" @@ -106,12 +95,12 @@ ">>> + };\n" ">>> +\n" ">>> + cpus {\n" - ">>> + cpu@0 {\n" + ">>> + cpu at 0 {\n" ">>> + compatible = \"arm,cortex-a9\";\n" ">>> + };\n" ">>> + };\n" ">>> +\n" - ">>> + gic: interrupt-controller@48241000 {\n" + ">>> + gic: interrupt-controller at 48241000 {\n" ">>> + compatible = \"arm,cortex-a9-gic\";\n" ">>> + interrupt-controller;\n" ">>> + #interrupt-cells = <3>;\n" @@ -125,26 +114,26 @@ ">>> + #size-cells = <1>;\n" ">>> + ranges;\n" ">>> +\n" - ">>> + uart1: serial@44e09000 {\n" + ">>> + uart1: serial at 44e09000 {\n" ">>> + compatible = \"ti,am4372-uart\",\"ti,omap2-uart\";\n" ">>> + reg = <0x44e09000 0x2000>;\n" ">>> + interrupts = <0 72 0x4>;\n" ">>> + };\n" ">>> +\n" - ">>> + timer1: timer@44e31000 {\n" + ">>> + timer1: timer at 44e31000 {\n" ">>> + compatible = \"ti,am4372-timer-1ms\",\"ti,am335x-timer-1ms\";\n" ">>> + reg = <0x44e31000 0x400>;\n" ">>> + interrupts = <0 67 0x4>;\n" ">>> + ti,timer-alwon;\n" ">>> + };\n" ">>> +\n" - ">>> + timer2: timer@48040000 {\n" + ">>> + timer2: timer at 48040000 {\n" ">>> + compatible = \"ti,am4372-timer\",\"ti,am335x-timer\";\n" ">>> + reg = <0x48040000 0x400>;\n" ">>> + interrupts = <0 68 0x4>;\n" ">>> + };\n" ">>> +\n" - ">>> + counter32k: counter@44e86000 {\n" + ">>> + counter32k: counter at 44e86000 {\n" ">>> + compatible = \"ti,am4372-counter32k\",\"ti,omap-counter32k\";\n" ">>> + reg = <0x44e86000 0x40>;\n" ">>> + };\n" @@ -153,4 +142,4 @@ ">>>\n" >> -73522153b3782976f6bf38b18e159ddf7cedb60d4550a3d7d9fc1841c16dd6c1 +39432800bb406860738a326390e19b69abec2e8ceeec8dbab54c446cd97b34be
diff --git a/a/content_digest b/N2/content_digest index cccb674..83e87f5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,13 +5,13 @@ "From\0Benoit Cousson <b-cousson@ti.com>\0" "Subject\0Re: [PATCH v2 14/14] ARM: dts: AM43x: initial support\0" "Date\0Wed, 29 May 2013 11:05:53 +0200\0" - "To\0florian.vaussard@epfl.ch\0" + "To\0<florian.vaussard@epfl.ch>\0" "Cc\0Afzal Mohammed <afzal@ti.com>" - linux-omap@vger.kernel.org - linux-arm-kernel@lists.infradead.org - devicetree-discuss@lists.ozlabs.org - linux-doc@vger.kernel.org - linux-kernel@vger.kernel.org + <linux-omap@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <devicetree-discuss@lists.ozlabs.org> + <linux-doc@vger.kernel.org> + <linux-kernel@vger.kernel.org> Russell King <linux@arm.linux.org.uk> Rob Herring <rob.herring@calxeda.com> Ankur Kishore <a-kishore@ti.com> @@ -153,4 +153,4 @@ ">>>\n" >> -73522153b3782976f6bf38b18e159ddf7cedb60d4550a3d7d9fc1841c16dd6c1 +26bd015ef8c03f8af717aa8e0aad2a328ac6baa07d17048f22fe0dbef18209cd
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.