diff for duplicates of <201106292329.44447.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index fe46a52..7411685 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,7 +81,7 @@ Good progress! > + #size-cells = <1>; > + ranges; > + -> + intc: interrupt-controller at 0x80020000 { +> + intc: interrupt-controller@0x80020000 { > + interrupt-controller; > + compatible = "sirf,intc", "sirf,prima2-intc"; > + reg = <0x80020000 0x1000>; @@ -95,22 +95,22 @@ the stock ticker name of the company making the device as a unique identifier. This means you'd have to use "csrxf,sirf-intc", "csrxf,sirf-prima2-intc" as the value, instead of starting with the product name. I don't know exactly how strictly -we apply that rule, but I've taken the devicetree-discuss at lists.ozlabs.org +we apply that rule, but I've taken the devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org mailing list on Cc, maybe someone can clarify. -> + timer0: timer at 0xb0020000 { +> + timer0: timer@0xb0020000 { > + compatible = "sirf,tick", "sirf,prima2-tick"; > + reg = <0xb0020000 0x1000>; > + interrupts = <0>; > + }; > + -> + uart0: uart at 0xb0050000 { +> + uart0: uart@0xb0050000 { > + compatible = "sirf,uart", "sirf,prima2-uart"; > + reg = <0xb0050000 0x1000>; > + interrupts = <17>; > + }; > + -> + uart1: uart at 0xb0060000 { +> + uart1: uart@0xb0060000 { > + compatible = "sirf,uart", "sirf,prima2-uart"; > + reg = <0xb0060000 0x1000>; > + interrupts = <18>; @@ -126,7 +126,7 @@ When you use local addresses, this would become something like #size-cells = <1>; ranges <0 0x80000000 0x10000000>; - intc: interrupt-controller at 20000 { + intc: interrupt-controller@20000 { interrupt-controller; compatible = "sirf,intc", "sirf,prima2-intc"; reg = <0x20000 0x1000>; @@ -139,15 +139,15 @@ When you use local addresses, this would become something like #size-cells = <1>; ranges <0 0xb0000000 0x10000000>; - timer0: timer at 20000 { + timer0: timer@20000 { reg = <0x20000 0x1000>; }; - uart0: uart at 50000 { + uart0: uart@50000 { reg = <0x50000 0x1000>; }; - uart1: uart at 60000 { + uart1: uart@60000 { reg = <0x60000 0x1000>; }; }; diff --git a/a/content_digest b/N1/content_digest index 6aba966..bc70057 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,21 @@ "ref\01309231954-23260-1-git-send-email-bs14@csr.com\0" - "From\0arnd@arndb.de (Arnd Bergmann)\0" - "Subject\0[PATCH v2] ARM: CSR: Adding CSR SiRFprimaII board support\0" + "ref\01309231954-23260-1-git-send-email-bs14-kQvG35nSl+M@public.gmane.org\0" + "From\0Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\0" + "Subject\0Re: [PATCH v2] ARM: CSR: Adding CSR SiRFprimaII board support\0" "Date\0Wed, 29 Jun 2011 23:29:44 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Barry Song <bs14-kQvG35nSl+M@public.gmane.org>\0" + "Cc\0linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org" + Bin Shi <Bin.Shi-kQvG35nSl+M@public.gmane.org> + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + workgroup.linux-kQvG35nSl+M@public.gmane.org + Zhiwu Song <Zhiwu.Song-kQvG35nSl+M@public.gmane.org> + Rongjun Ying <Rongjun.Ying-kQvG35nSl+M@public.gmane.org> + Binghua Duan <binghua.duan-kQvG35nSl+M@public.gmane.org> + Barry Song <Baohua.Song-kQvG35nSl+M@public.gmane.org> + tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org + Yuping Luo <Yuping.Luo-kQvG35nSl+M@public.gmane.org> + Huayi Li <Huayi.Li-kQvG35nSl+M@public.gmane.org> + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On Tuesday 28 June 2011, Barry Song wrote:\n" @@ -88,7 +101,7 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\tranges;\n" "> +\n" - "> +\t\tintc: interrupt-controller at 0x80020000 {\n" + "> +\t\tintc: interrupt-controller@0x80020000 {\n" "> +\t\t\tinterrupt-controller;\n" "> +\t\t\tcompatible = \"sirf,intc\", \"sirf,prima2-intc\";\n" "> +\t\t\treg = <0x80020000 0x1000>;\n" @@ -102,22 +115,22 @@ "identifier. This means you'd have to use \n" "\"csrxf,sirf-intc\", \"csrxf,sirf-prima2-intc\" as the value, instead\n" "of starting with the product name. I don't know exactly how strictly\n" - "we apply that rule, but I've taken the devicetree-discuss at lists.ozlabs.org\n" + "we apply that rule, but I've taken the devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org\n" "mailing list on Cc, maybe someone can clarify.\n" "\n" - "> +\t\ttimer0: timer at 0xb0020000 {\n" + "> +\t\ttimer0: timer@0xb0020000 {\n" "> +\t\t\tcompatible = \"sirf,tick\", \"sirf,prima2-tick\";\n" "> +\t\t\treg = <0xb0020000 0x1000>;\n" "> +\t\t\tinterrupts = <0>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart0: uart at 0xb0050000 {\n" + "> +\t\tuart0: uart@0xb0050000 {\n" "> +\t\t\tcompatible = \"sirf,uart\", \"sirf,prima2-uart\";\n" "> +\t\t\treg = <0xb0050000 0x1000>;\n" "> +\t\t\tinterrupts = <17>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart1: uart at 0xb0060000 {\n" + "> +\t\tuart1: uart@0xb0060000 {\n" "> +\t\t\tcompatible = \"sirf,uart\", \"sirf,prima2-uart\";\n" "> +\t\t\treg = <0xb0060000 0x1000>;\n" "> +\t\t\tinterrupts = <18>;\n" @@ -133,7 +146,7 @@ "\t\t#size-cells = <1>;\n" "\t\tranges <0 0x80000000 0x10000000>;\n" "\n" - "\t\tintc: interrupt-controller at 20000 {\n" + "\t\tintc: interrupt-controller@20000 {\n" "\t\t\tinterrupt-controller;\n" "\t\t\tcompatible = \"sirf,intc\", \"sirf,prima2-intc\";\n" "\t\t\treg = <0x20000 0x1000>;\n" @@ -146,15 +159,15 @@ "\t\t#size-cells = <1>;\n" "\t\tranges <0 0xb0000000 0x10000000>;\n" "\n" - "\t\ttimer0: timer at 20000 {\n" + "\t\ttimer0: timer@20000 {\n" "\t\t\treg = <0x20000 0x1000>;\n" "\t\t};\n" "\n" - "\t\tuart0: uart at 50000 {\n" + "\t\tuart0: uart@50000 {\n" "\t\t\treg = <0x50000 0x1000>;\n" "\t\t};\n" "\n" - "\t\tuart1: uart at 60000 {\n" + "\t\tuart1: uart@60000 {\n" "\t\t\treg = <0x60000 0x1000>;\n" "\t\t};\n" "\t};\n" @@ -323,4 +336,4 @@ "\n" "\tArnd" -14110c2da3f142a797c1a22db7bad567e7d0d0c2755f1f5ff06b8f69ac1be8d9 +12e055c280eaa67de837ff2250c289f26c4356004c6ad470da5e11f1dd43d3bc
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.