diff for duplicates of <4E8C54DC.6040700@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 364a57f..9374c5d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -62,14 +62,14 @@ On 10/03/2011 05:00 AM, Nicolas Ferre wrote: > + serial4 = &usart3; > + }; > + cpus { -> + cpu at 0 { +> + cpu@0 { > + compatible = "arm,arm926ejs"; > + }; > + }; > + > + memory { -Should be memory at 0x70000000 +Should be memory@0x70000000 > + reg = <0x70000000 0x10000000>; > + }; @@ -86,7 +86,7 @@ Should be memory at 0x70000000 > + #size-cells = <1>; > + ranges; > + -> + aic: interrupt-controller at fffff000 { +> + aic: interrupt-controller@fffff000 { > + #interrupt-cells = <1>; > + compatible = "atmel,at91rm9200-aic"; > + interrupt-controller; @@ -96,7 +96,7 @@ Add "interrupt-parent;" so that the aic is not the parent of itself. > + reg = <0xfffff000 0x200>; > + }; > + -> + dma: dma-controller at ffffec00 { +> + dma: dma-controller@ffffec00 { > + compatible = "atmel,at91sam9g45-hdmac"; > + reg = <0xffffec00 0x200>; > + interrupts = <21>; @@ -105,13 +105,13 @@ Add "interrupt-parent;" so that the aic is not the parent of itself. > + atmel,hdmac-cap-slave; > + }; > + -> + dbgu: serial at ffffee00 { +> + dbgu: serial@ffffee00 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xffffee00 0x200>; > + interrupts = <1>; > + }; > + -> + usart0: serial at fff8c000 { +> + usart0: serial@fff8c000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff8c000 0x4000>; @@ -123,7 +123,7 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + atmel,use-dma-tx; > + }; > + -> + usart1: serial at fff90000 { +> + usart1: serial@fff90000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff90000 0x4000>; > + interrupts = <8>; @@ -131,7 +131,7 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + atmel,use-dma-tx; > + }; > + -> + usart2: serial at fff94000 { +> + usart2: serial@fff94000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff94000 0x4000>; > + interrupts = <9>; @@ -139,7 +139,7 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + atmel,use-dma-tx; > + }; > + -> + usart3: serial at fff98000 { +> + usart3: serial@fff98000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff98000 0x4000>; > + interrupts = <10>; @@ -180,13 +180,13 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + > + ahb { > + apb { -> + usart0: serial at fff8c000 { +> + usart0: serial@fff8c000 { > + status = "disabled"; > + }; -> + usart2: serial at fff94000 { +> + usart2: serial@fff94000 { > + status = "disabled"; > + }; -> + usart3: serial at fff98000 { +> + usart3: serial@fff98000 { > + status = "disabled"; > + }; > + }; diff --git a/a/content_digest b/N1/content_digest index f4e8d10..2b40a1d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,12 @@ "ref\01317636056-9537-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0robherring2@gmail.com (Rob Herring)\0" - "Subject\0[PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" + "From\0Rob Herring <robherring2@gmail.com>\0" + "Subject\0Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" "Date\0Wed, 05 Oct 2011 08:00:12 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + devicetree-discuss@lists.ozlabs.org + grant.likely@secretlab.ca + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Nicolas,\n" @@ -69,14 +73,14 @@ "> +\t\tserial4 = &usart3;\n" "> +\t};\n" "> +\tcpus {\n" - "> +\t\tcpu at 0 {\n" + "> +\t\tcpu@0 {\n" "> +\t\t\tcompatible = \"arm,arm926ejs\";\n" "> +\t\t};\n" "> +\t};\n" "> +\n" "> +\tmemory {\n" "\n" - "Should be memory at 0x70000000\n" + "Should be memory@0x70000000\n" "\n" "> +\t\treg = <0x70000000 0x10000000>;\n" "> +\t};\n" @@ -93,7 +97,7 @@ "> +\t\t\t#size-cells = <1>;\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\taic: interrupt-controller at fffff000 {\n" + "> +\t\t\taic: interrupt-controller@fffff000 {\n" "> +\t\t\t\t#interrupt-cells = <1>;\n" "> +\t\t\t\tcompatible = \"atmel,at91rm9200-aic\";\n" "> +\t\t\t\tinterrupt-controller;\n" @@ -103,7 +107,7 @@ "> +\t\t\t\treg = <0xfffff000 0x200>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tdma: dma-controller at ffffec00 {\n" + "> +\t\t\tdma: dma-controller@ffffec00 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-hdmac\";\n" "> +\t\t\t\treg = <0xffffec00 0x200>;\n" "> +\t\t\t\tinterrupts = <21>;\n" @@ -112,13 +116,13 @@ "> +\t\t\t\tatmel,hdmac-cap-slave;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tdbgu: serial at ffffee00 {\n" + "> +\t\t\tdbgu: serial@ffffee00 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xffffee00 0x200>;\n" "> +\t\t\t\tinterrupts = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart0: serial at fff8c000 {\n" + "> +\t\t\tusart0: serial@fff8c000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff8c000 0x4000>;\n" "\n" @@ -130,7 +134,7 @@ "> +\t\t\t\tatmel,use-dma-tx;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart1: serial at fff90000 {\n" + "> +\t\t\tusart1: serial@fff90000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff90000 0x4000>;\n" "> +\t\t\t\tinterrupts = <8>;\n" @@ -138,7 +142,7 @@ "> +\t\t\t\tatmel,use-dma-tx;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart2: serial at fff94000 {\n" + "> +\t\t\tusart2: serial@fff94000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff94000 0x4000>;\n" "> +\t\t\t\tinterrupts = <9>;\n" @@ -146,7 +150,7 @@ "> +\t\t\t\tatmel,use-dma-tx;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart3: serial at fff98000 {\n" + "> +\t\t\tusart3: serial@fff98000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff98000 0x4000>;\n" "> +\t\t\t\tinterrupts = <10>;\n" @@ -187,13 +191,13 @@ "> +\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tusart0: serial at fff8c000 {\n" + "> +\t\t\tusart0: serial@fff8c000 {\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" - "> +\t\t\tusart2: serial at fff94000 {\n" + "> +\t\t\tusart2: serial@fff94000 {\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" - "> +\t\t\tusart3: serial at fff98000 {\n" + "> +\t\t\tusart3: serial@fff98000 {\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\t\t};\n" @@ -410,4 +414,4 @@ "\n" Rob -4c6c66417851fdcc2c34a746ed1b692526705efcfa18f46fc38f5a8562a98921 +9b815c620429bcf598b3c5976563fb7b6a73cec66b060bffc513a18b94d00f1d
diff --git a/a/1.txt b/N2/1.txt index 364a57f..9374c5d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -62,14 +62,14 @@ On 10/03/2011 05:00 AM, Nicolas Ferre wrote: > + serial4 = &usart3; > + }; > + cpus { -> + cpu at 0 { +> + cpu@0 { > + compatible = "arm,arm926ejs"; > + }; > + }; > + > + memory { -Should be memory at 0x70000000 +Should be memory@0x70000000 > + reg = <0x70000000 0x10000000>; > + }; @@ -86,7 +86,7 @@ Should be memory at 0x70000000 > + #size-cells = <1>; > + ranges; > + -> + aic: interrupt-controller at fffff000 { +> + aic: interrupt-controller@fffff000 { > + #interrupt-cells = <1>; > + compatible = "atmel,at91rm9200-aic"; > + interrupt-controller; @@ -96,7 +96,7 @@ Add "interrupt-parent;" so that the aic is not the parent of itself. > + reg = <0xfffff000 0x200>; > + }; > + -> + dma: dma-controller at ffffec00 { +> + dma: dma-controller@ffffec00 { > + compatible = "atmel,at91sam9g45-hdmac"; > + reg = <0xffffec00 0x200>; > + interrupts = <21>; @@ -105,13 +105,13 @@ Add "interrupt-parent;" so that the aic is not the parent of itself. > + atmel,hdmac-cap-slave; > + }; > + -> + dbgu: serial at ffffee00 { +> + dbgu: serial@ffffee00 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xffffee00 0x200>; > + interrupts = <1>; > + }; > + -> + usart0: serial at fff8c000 { +> + usart0: serial@fff8c000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff8c000 0x4000>; @@ -123,7 +123,7 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + atmel,use-dma-tx; > + }; > + -> + usart1: serial at fff90000 { +> + usart1: serial@fff90000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff90000 0x4000>; > + interrupts = <8>; @@ -131,7 +131,7 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + atmel,use-dma-tx; > + }; > + -> + usart2: serial at fff94000 { +> + usart2: serial@fff94000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff94000 0x4000>; > + interrupts = <9>; @@ -139,7 +139,7 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + atmel,use-dma-tx; > + }; > + -> + usart3: serial at fff98000 { +> + usart3: serial@fff98000 { > + compatible = "atmel,at91sam9260-usart"; > + reg = <0xfff98000 0x4000>; > + interrupts = <10>; @@ -180,13 +180,13 @@ Is 16K really used? I would set to 4K so your not wasting virtual space > + > + ahb { > + apb { -> + usart0: serial at fff8c000 { +> + usart0: serial@fff8c000 { > + status = "disabled"; > + }; -> + usart2: serial at fff94000 { +> + usart2: serial@fff94000 { > + status = "disabled"; > + }; -> + usart3: serial at fff98000 { +> + usart3: serial@fff98000 { > + status = "disabled"; > + }; > + }; diff --git a/a/content_digest b/N2/content_digest index f4e8d10..2a7a716 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,12 @@ "ref\01317636056-9537-1-git-send-email-nicolas.ferre@atmel.com\0" - "From\0robherring2@gmail.com (Rob Herring)\0" - "Subject\0[PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" + "From\0Rob Herring <robherring2@gmail.com>\0" + "Subject\0Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" "Date\0Wed, 05 Oct 2011 08:00:12 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Cc\0grant.likely@secretlab.ca" + devicetree-discuss@lists.ozlabs.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Nicolas,\n" @@ -69,14 +73,14 @@ "> +\t\tserial4 = &usart3;\n" "> +\t};\n" "> +\tcpus {\n" - "> +\t\tcpu at 0 {\n" + "> +\t\tcpu@0 {\n" "> +\t\t\tcompatible = \"arm,arm926ejs\";\n" "> +\t\t};\n" "> +\t};\n" "> +\n" "> +\tmemory {\n" "\n" - "Should be memory at 0x70000000\n" + "Should be memory@0x70000000\n" "\n" "> +\t\treg = <0x70000000 0x10000000>;\n" "> +\t};\n" @@ -93,7 +97,7 @@ "> +\t\t\t#size-cells = <1>;\n" "> +\t\t\tranges;\n" "> +\n" - "> +\t\t\taic: interrupt-controller at fffff000 {\n" + "> +\t\t\taic: interrupt-controller@fffff000 {\n" "> +\t\t\t\t#interrupt-cells = <1>;\n" "> +\t\t\t\tcompatible = \"atmel,at91rm9200-aic\";\n" "> +\t\t\t\tinterrupt-controller;\n" @@ -103,7 +107,7 @@ "> +\t\t\t\treg = <0xfffff000 0x200>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tdma: dma-controller at ffffec00 {\n" + "> +\t\t\tdma: dma-controller@ffffec00 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9g45-hdmac\";\n" "> +\t\t\t\treg = <0xffffec00 0x200>;\n" "> +\t\t\t\tinterrupts = <21>;\n" @@ -112,13 +116,13 @@ "> +\t\t\t\tatmel,hdmac-cap-slave;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tdbgu: serial at ffffee00 {\n" + "> +\t\t\tdbgu: serial@ffffee00 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xffffee00 0x200>;\n" "> +\t\t\t\tinterrupts = <1>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart0: serial at fff8c000 {\n" + "> +\t\t\tusart0: serial@fff8c000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff8c000 0x4000>;\n" "\n" @@ -130,7 +134,7 @@ "> +\t\t\t\tatmel,use-dma-tx;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart1: serial at fff90000 {\n" + "> +\t\t\tusart1: serial@fff90000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff90000 0x4000>;\n" "> +\t\t\t\tinterrupts = <8>;\n" @@ -138,7 +142,7 @@ "> +\t\t\t\tatmel,use-dma-tx;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart2: serial at fff94000 {\n" + "> +\t\t\tusart2: serial@fff94000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff94000 0x4000>;\n" "> +\t\t\t\tinterrupts = <9>;\n" @@ -146,7 +150,7 @@ "> +\t\t\t\tatmel,use-dma-tx;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusart3: serial at fff98000 {\n" + "> +\t\t\tusart3: serial@fff98000 {\n" "> +\t\t\t\tcompatible = \"atmel,at91sam9260-usart\";\n" "> +\t\t\t\treg = <0xfff98000 0x4000>;\n" "> +\t\t\t\tinterrupts = <10>;\n" @@ -187,13 +191,13 @@ "> +\n" "> +\tahb {\n" "> +\t\tapb {\n" - "> +\t\t\tusart0: serial at fff8c000 {\n" + "> +\t\t\tusart0: serial@fff8c000 {\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" - "> +\t\t\tusart2: serial at fff94000 {\n" + "> +\t\t\tusart2: serial@fff94000 {\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" - "> +\t\t\tusart3: serial at fff98000 {\n" + "> +\t\t\tusart3: serial@fff98000 {\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\t\t};\n" @@ -410,4 +414,4 @@ "\n" Rob -4c6c66417851fdcc2c34a746ed1b692526705efcfa18f46fc38f5a8562a98921 +f2218895687ad6edc5bfdd4b62499fd38400817be6af824758b452ddd51b970a
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.