diff for duplicates of <4E8EF6F4.4030905@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 8f64bf7..0a5980a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -63,14 +63,14 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + serial4 = &usart3; >> + }; >> + cpus { ->> + cpu at 0 { +>> + cpu@0 { >> + compatible = "arm,arm926ejs"; >> + }; >> + }; >> + >> + memory { > -> Should be memory at 0x70000000 +> Should be memory@0x70000000 > >> + reg = <0x70000000 0x10000000>; >> + }; @@ -87,7 +87,7 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + #size-cells = <1>; >> + ranges; >> + ->> + aic: interrupt-controller at fffff000 { +>> + aic: interrupt-controller@fffff000 { >> + #interrupt-cells = <1>; >> + compatible = "atmel,at91rm9200-aic"; >> + interrupt-controller; @@ -97,7 +97,7 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + reg = <0xfffff000 0x200>; >> + }; >> + ->> + dma: dma-controller at ffffec00 { +>> + dma: dma-controller@ffffec00 { >> + compatible = "atmel,at91sam9g45-hdmac"; >> + reg = <0xffffec00 0x200>; >> + interrupts = <21>; @@ -106,13 +106,13 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + 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>; > @@ -129,7 +129,7 @@ I can adapt this to real values. >> + atmel,use-dma-tx; >> + }; >> + ->> + usart1: serial at fff90000 { +>> + usart1: serial@fff90000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfff90000 0x4000>; >> + interrupts = <8>; @@ -137,7 +137,7 @@ I can adapt this to real values. >> + atmel,use-dma-tx; >> + }; >> + ->> + usart2: serial at fff94000 { +>> + usart2: serial@fff94000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfff94000 0x4000>; >> + interrupts = <9>; @@ -145,7 +145,7 @@ I can adapt this to real values. >> + atmel,use-dma-tx; >> + }; >> + ->> + usart3: serial at fff98000 { +>> + usart3: serial@fff98000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfff98000 0x4000>; >> + interrupts = <10>; @@ -186,13 +186,13 @@ I can adapt this to real values. >> + >> + 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 590327b..c1f8d61 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,14 @@ "ref\01317636056-9537-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\04E8C54DC.6040700@gmail.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" "Date\0Fri, 07 Oct 2011 14:56:20 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robherring2@gmail.com>" + " grant.likely@secretlab.ca\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + devicetree-discuss@lists.ozlabs.org + linux-kernel@vger.kernel.org + " Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>\0" "\00:1\0" "b\0" "On 10/05/2011 03:00 PM, Rob Herring :\n" @@ -71,14 +76,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" @@ -95,7 +100,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" @@ -105,7 +110,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" @@ -114,13 +119,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" @@ -137,7 +142,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" @@ -145,7 +150,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" @@ -153,7 +158,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" @@ -194,13 +199,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" @@ -435,4 +440,4 @@ "-- \n" Nicolas Ferre -bdf5aa7fa5d3ecbfc7b01c3259c44b439c139aaf8eb71402ecd1b3f685acd54b +c555626bac1f6183bef6e164cb6084d9c208e6dd96d9cd1c0addee2d00959c65
diff --git a/a/1.txt b/N2/1.txt index 8f64bf7..0a5980a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -63,14 +63,14 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + serial4 = &usart3; >> + }; >> + cpus { ->> + cpu at 0 { +>> + cpu@0 { >> + compatible = "arm,arm926ejs"; >> + }; >> + }; >> + >> + memory { > -> Should be memory at 0x70000000 +> Should be memory@0x70000000 > >> + reg = <0x70000000 0x10000000>; >> + }; @@ -87,7 +87,7 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + #size-cells = <1>; >> + ranges; >> + ->> + aic: interrupt-controller at fffff000 { +>> + aic: interrupt-controller@fffff000 { >> + #interrupt-cells = <1>; >> + compatible = "atmel,at91rm9200-aic"; >> + interrupt-controller; @@ -97,7 +97,7 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + reg = <0xfffff000 0x200>; >> + }; >> + ->> + dma: dma-controller at ffffec00 { +>> + dma: dma-controller@ffffec00 { >> + compatible = "atmel,at91sam9g45-hdmac"; >> + reg = <0xffffec00 0x200>; >> + interrupts = <21>; @@ -106,13 +106,13 @@ On 10/05/2011 03:00 PM, Rob Herring : >> + 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>; > @@ -129,7 +129,7 @@ I can adapt this to real values. >> + atmel,use-dma-tx; >> + }; >> + ->> + usart1: serial at fff90000 { +>> + usart1: serial@fff90000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfff90000 0x4000>; >> + interrupts = <8>; @@ -137,7 +137,7 @@ I can adapt this to real values. >> + atmel,use-dma-tx; >> + }; >> + ->> + usart2: serial at fff94000 { +>> + usart2: serial@fff94000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfff94000 0x4000>; >> + interrupts = <9>; @@ -145,7 +145,7 @@ I can adapt this to real values. >> + atmel,use-dma-tx; >> + }; >> + ->> + usart3: serial at fff98000 { +>> + usart3: serial@fff98000 { >> + compatible = "atmel,at91sam9260-usart"; >> + reg = <0xfff98000 0x4000>; >> + interrupts = <10>; @@ -186,13 +186,13 @@ I can adapt this to real values. >> + >> + 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 590327b..3e414df 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,14 @@ "ref\01317636056-9537-1-git-send-email-nicolas.ferre@atmel.com\0" "ref\04E8C54DC.6040700@gmail.com\0" - "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" - "Subject\0[PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" + "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" + "Subject\0Re: [PATCH V2] AT91: dt: at91sam9g45 family and board device tree files\0" "Date\0Fri, 07 Oct 2011 14:56:20 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robherring2@gmail.com>" + " grant.likely@secretlab.ca\0" + "Cc\0devicetree-discuss@lists.ozlabs.org" + Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 10/05/2011 03:00 PM, Rob Herring :\n" @@ -71,14 +76,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" @@ -95,7 +100,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" @@ -105,7 +110,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" @@ -114,13 +119,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" @@ -137,7 +142,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" @@ -145,7 +150,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" @@ -153,7 +158,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" @@ -194,13 +199,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" @@ -435,4 +440,4 @@ "-- \n" Nicolas Ferre -bdf5aa7fa5d3ecbfc7b01c3259c44b439c139aaf8eb71402ecd1b3f685acd54b +10a6cca5507d8aacfe3cb9e52749a01f45dc87bec467e93ee8c4898da0e9662c
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.