diff for duplicates of <4E79E588.6010703@gmail.com> diff --git a/a/1.txt b/N1/1.txt index c74523b..7b26fc9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,11 +12,11 @@ On 09/21/2011 04:19 AM, Dave Martin wrote: > For now, clocks and timers are not handled via the device tree. > Implementation of these can follow in later patches. > -> Thanks to Lorenzo Pieralisi, Grant Likely and Pawe? Moll for their +> Thanks to Lorenzo Pieralisi, Grant Likely and Paweł Moll for their > help and contributions. > > Signed-off-by: Dave Martin <dave.martin@linaro.org> -> Acked-by: Pawe? Moll <Pawel.Moll@arm.com> +> Acked-by: Paweł Moll <Pawel.Moll@arm.com> > --- > > There are some outstanding issues which need to be discussed, listed @@ -112,7 +112,7 @@ I'll do the ones on highbank if you want to do the rest on VExp. > multiple core-tiles int the same kernel. It well need to get fixed > later, when extra core tile support is merged (or before). > -> Pawe? Moll is looking into this separately. +> Paweł Moll is looking into this separately. > > * The Kconfig logic for ensuring that at least one boot protocol and > at least one core tile are selected is a bit ugly. Suggestions for @@ -169,20 +169,20 @@ Not sure, but C++ style comments are probably frowned upon in dts too. > + #size-cells = <1>; > + #interrupt-cells = <1>; > + -> + flash at 0,00000000 { +> + flash@0,00000000 { > + compatible = "arm,vexpress-flash", "cfi-flash"; > + reg = <0 0x00000000 0x04000000 > + 1 0x00000000 0x04000000>; > + bank-width = <4>; > + }; > + -> + psram at 2,00000000 { +> + psram@2,00000000 { > + compatible = "mtd-ram"; > + reg = <2 0x00000000 0x02000000>; > + bank-width = <4>; > + }; > + -> + ethernet at 3,02000000 { +> + ethernet@3,02000000 { > + compatible = "smsc,lan9118", "smsc,lan9115"; > + reg = <3 0x02000000 0x10000>; > + reg-io-width = <4>; @@ -191,89 +191,89 @@ Not sure, but C++ style comments are probably frowned upon in dts too. > + smsc,irq-push-pull; > + }; > + -> + usb at 3,03000000 { +> + usb@3,03000000 { > + compatible = "nxp,usb-isp1761"; > + reg = <3 0x03000000 0x20000>; > + interrupts = <16>; > + port1-otg; > + }; > + -> + peripherals at 7,00000000 { +> + peripherals@7,00000000 { > + compatible = "arm,amba-bus", "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges = <0 7 0 0x20000>; > + > + // PCI-E I2C bus -> + i2c0: i2c at 02000 { +> + i2c0: i2c@02000 { > + compatible = "arm,versatile-i2c"; > + reg = <0x02000 0x1000>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + -> + pcie-switch at 60 { +> + pcie-switch@60 { > + compatible = "idt,89hpes32h8"; > + reg = <0x60>; > + }; > + }; > + -> + aaci at 04000 { +> + aaci@04000 { > + compatible = "arm,pl041", "arm,primecell"; > + reg = <0x04000 0x1000>; > + interrupts = <11>; > + }; > + -> + mmci at 05000 { +> + mmci@05000 { > + compatible = "arm,pl180", "arm,primecell"; > + reg = <0x05000 0x1000>; > + interrupts = <9 10>; > + }; > + -> + kmi at 06000 { +> + kmi@06000 { > + compatible = "arm,pl050", "arm,primecell"; > + reg = <0x06000 0x1000>; > + interrupts = <12>; > + }; > + -> + kmi at 07000 { +> + kmi@07000 { > + compatible = "arm,pl050", "arm,primecell"; > + reg = <0x07000 0x1000>; > + interrupts = <13>; > + }; > + -> + uart0: uart at 09000 { +> + uart0: uart@09000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x09000 0x1000>; > + interrupts = <5>; > + }; > + -> + uart1: uart at 0a000 { +> + uart1: uart@0a000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x0a000 0x1000>; > + interrupts = <6>; > + }; > + -> + uart2: uart at 0b000 { +> + uart2: uart@0b000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x0b000 0x1000>; > + interrupts = <7>; > + }; > + -> + uart3: uart at 0c000 { +> + uart3: uart@0c000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x0c000 0x1000>; > + interrupts = <8>; > + }; > + -> + wdt at 0f000 { +> + wdt@0f000 { > + compatible = "arm,sp805", "arm,primecell"; > + reg = <0x0f000 0x1000>; > + interrupts = <0>; > + }; > + > + // Timer init is hardcoded in v2m_timer_init(), for now. -> + // timer at 11000 { +> + // timer@11000 { > + // compatible = "arm,arm-sp804"; arm,sp804 is more consistent. I believe the sp804 does have the periphid @@ -283,7 +283,7 @@ registers, so arm,primecell should also be added. > + // interrupts = <2>; > + // }; > + -> + // timer at 12000 { +> + // timer@12000 { > + // compatible = "arm,arm-sp804"; > + // reg = <0x12000 0x1000>; > + // }; @@ -292,26 +292,26 @@ Just because Linux is not using it, doesn't mean you should comment it out. > + > + // DVI I2C bus (DDC) -> + i2c1: i2c at 16000 { +> + i2c1: i2c@16000 { > + compatible = "arm,versatile-i2c"; > + reg = <0x16000 0x1000>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + -> + edid at 50 { +> + edid@50 { > + compatible = "edid"; > + reg = <0x50>; > + }; > + }; > + -> + rtc at 17000 { +> + rtc@17000 { > + compatible = "arm,pl031", "arm,primecell"; > + reg = <0x017000 0x1000>; > + interrupts = <4>; > + }; > + -> + compact-flash at 1a000 { +> + compact-flash@1a000 { > + compatible = "ata-generic"; > + reg = <0x1a000 0x100 > + 0x1a100 0xf00>; @@ -342,7 +342,7 @@ Just because Linux is not using it, doesn't mean you should comment it out. > + reg = <0x60000000 0x40000000>; > + }; > + -> + intc: interrupt-controller at 1e001000 { +> + intc: interrupt-controller@1e001000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <2>; > + #address-cells = <0>; @@ -638,3 +638,7 @@ file and copying over pieces they need. Once DT support is on par with the old file, the old file can be deleted. Rob +_______________________________________________ +devicetree-discuss mailing list +devicetree-discuss@lists.ozlabs.org +https://lists.ozlabs.org/listinfo/devicetree-discuss diff --git a/a/content_digest b/N1/content_digest index 3353efa..ffcbc62 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\01316596786-2539-1-git-send-email-dave.martin@linaro.org\0" - "From\0robherring2@gmail.com (Rob Herring)\0" - "Subject\0[PATCH] ARM: vexpress: initial device tree support\0" + "ref\01316596786-2539-1-git-send-email-dave.martin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" + "From\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: vexpress: initial device tree support\0" "Date\0Wed, 21 Sep 2011 08:24:24 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Dave Martin <dave.martin-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + Rob Herring <rob.herring-CfjtxxwdHycX+EX/Zwu52A@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " Pawe\305\202 Moll <Pawel.Moll-5wv7dgnIgG8@public.gmane.org>" + " patches-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org\0" "\00:1\0" "b\0" "Dave,\n" @@ -19,11 +25,11 @@ "> For now, clocks and timers are not handled via the device tree.\n" "> Implementation of these can follow in later patches.\n" "> \n" - "> Thanks to Lorenzo Pieralisi, Grant Likely and Pawe? Moll for their\n" + "> Thanks to Lorenzo Pieralisi, Grant Likely and Pawe\305\202 Moll for their\n" "> help and contributions.\n" "> \n" "> Signed-off-by: Dave Martin <dave.martin@linaro.org>\n" - "> Acked-by: Pawe? Moll <Pawel.Moll@arm.com>\n" + "> Acked-by: Pawe\305\202 Moll <Pawel.Moll@arm.com>\n" "> ---\n" "> \n" "> There are some outstanding issues which need to be discussed, listed\n" @@ -119,7 +125,7 @@ "> multiple core-tiles int the same kernel. It well need to get fixed\n" "> later, when extra core tile support is merged (or before).\n" "> \n" - "> Pawe? Moll is looking into this separately.\n" + "> Pawe\305\202 Moll is looking into this separately.\n" "> \n" "> * The Kconfig logic for ensuring that at least one boot protocol and\n" "> at least one core tile are selected is a bit ugly. Suggestions for\n" @@ -176,20 +182,20 @@ "> +\t\t#size-cells = <1>;\n" "> +\t\t#interrupt-cells = <1>;\n" "> +\n" - "> +\t\tflash at 0,00000000 {\n" + "> +\t\tflash@0,00000000 {\n" "> +\t\t\tcompatible = \"arm,vexpress-flash\", \"cfi-flash\";\n" "> +\t\t\treg = <0 0x00000000 0x04000000\n" "> +\t\t\t 1 0x00000000 0x04000000>;\n" "> +\t\t\tbank-width = <4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpsram at 2,00000000 {\n" + "> +\t\tpsram@2,00000000 {\n" "> +\t\t\tcompatible = \"mtd-ram\";\n" "> +\t\t\treg = <2 0x00000000 0x02000000>;\n" "> +\t\t\tbank-width = <4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tethernet at 3,02000000 {\n" + "> +\t\tethernet@3,02000000 {\n" "> +\t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "> +\t\t\treg = <3 0x02000000 0x10000>;\n" "> +\t\t\treg-io-width = <4>;\n" @@ -198,89 +204,89 @@ "> +\t\t\tsmsc,irq-push-pull;\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb at 3,03000000 {\n" + "> +\t\tusb@3,03000000 {\n" "> +\t\t\tcompatible = \"nxp,usb-isp1761\";\n" "> +\t\t\treg = <3 0x03000000 0x20000>;\n" "> +\t\t\tinterrupts = <16>;\n" "> +\t\t\tport1-otg;\n" "> +\t\t};\n" "> +\n" - "> +\t\tperipherals at 7,00000000 {\n" + "> +\t\tperipherals@7,00000000 {\n" "> +\t\t\tcompatible = \"arm,amba-bus\", \"simple-bus\";\n" "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" "> +\t\t\tranges = <0 7 0 0x20000>;\n" "> +\n" "> +\t\t\t// PCI-E I2C bus\n" - "> +\t\t\ti2c0: i2c at 02000 {\n" + "> +\t\t\ti2c0: i2c@02000 {\n" "> +\t\t\t\tcompatible = \"arm,versatile-i2c\";\n" "> +\t\t\t\treg = <0x02000 0x1000>;\n" "> +\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tpcie-switch at 60 {\n" + "> +\t\t\t\tpcie-switch@60 {\n" "> +\t\t\t\t\tcompatible = \"idt,89hpes32h8\";\n" "> +\t\t\t\t\treg = <0x60>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\taaci at 04000 {\n" + "> +\t\t\taaci@04000 {\n" "> +\t\t\t\tcompatible = \"arm,pl041\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x04000 0x1000>;\n" "> +\t\t\t\tinterrupts = <11>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmci at 05000 {\n" + "> +\t\t\tmmci@05000 {\n" "> +\t\t\t\tcompatible = \"arm,pl180\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x05000 0x1000>;\n" "> +\t\t\t\tinterrupts = <9 10>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tkmi at 06000 {\n" + "> +\t\t\tkmi@06000 {\n" "> +\t\t\t\tcompatible = \"arm,pl050\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x06000 0x1000>;\n" "> +\t\t\t\tinterrupts = <12>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tkmi at 07000 {\n" + "> +\t\t\tkmi@07000 {\n" "> +\t\t\t\tcompatible = \"arm,pl050\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x07000 0x1000>;\n" "> +\t\t\t\tinterrupts = <13>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart0: uart at 09000 {\n" + "> +\t\t\tuart0: uart@09000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x09000 0x1000>;\n" "> +\t\t\t\tinterrupts = <5>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart1: uart at 0a000 {\n" + "> +\t\t\tuart1: uart@0a000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0a000 0x1000>;\n" "> +\t\t\t\tinterrupts = <6>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart2: uart at 0b000 {\n" + "> +\t\t\tuart2: uart@0b000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0b000 0x1000>;\n" "> +\t\t\t\tinterrupts = <7>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3: uart at 0c000 {\n" + "> +\t\t\tuart3: uart@0c000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0c000 0x1000>;\n" "> +\t\t\t\tinterrupts = <8>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\twdt at 0f000 {\n" + "> +\t\t\twdt@0f000 {\n" "> +\t\t\t\tcompatible = \"arm,sp805\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0f000 0x1000>;\n" "> +\t\t\t\tinterrupts = <0>;\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t// Timer init is hardcoded in v2m_timer_init(), for now.\n" - "> +\t\t\t// timer at 11000 {\n" + "> +\t\t\t// timer@11000 {\n" "> +\t\t\t//\tcompatible = \"arm,arm-sp804\";\n" "\n" "arm,sp804 is more consistent. I believe the sp804 does have the periphid\n" @@ -290,7 +296,7 @@ "> +\t\t\t//\tinterrupts = <2>;\n" "> +\t\t\t// };\n" "> +\n" - "> +\t\t\t// timer at 12000 {\n" + "> +\t\t\t// timer@12000 {\n" "> +\t\t\t//\tcompatible = \"arm,arm-sp804\";\n" "> +\t\t\t//\treg = <0x12000 0x1000>;\n" "> +\t\t\t// };\n" @@ -299,26 +305,26 @@ "\n" "> +\n" "> +\t\t\t// DVI I2C bus (DDC)\n" - "> +\t\t\ti2c1: i2c at 16000 {\n" + "> +\t\t\ti2c1: i2c@16000 {\n" "> +\t\t\t\tcompatible = \"arm,versatile-i2c\";\n" "> +\t\t\t\treg = <0x16000 0x1000>;\n" "> +\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tedid at 50 {\n" + "> +\t\t\t\tedid@50 {\n" "> +\t\t\t\t\tcompatible = \"edid\";\n" "> +\t\t\t\t\treg = <0x50>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\trtc at 17000 {\n" + "> +\t\t\trtc@17000 {\n" "> +\t\t\t\tcompatible = \"arm,pl031\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x017000 0x1000>;\n" "> +\t\t\t\tinterrupts = <4>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tcompact-flash at 1a000 {\n" + "> +\t\t\tcompact-flash@1a000 {\n" "> +\t\t\t\tcompatible = \"ata-generic\";\n" "> +\t\t\t\treg = <0x1a000 0x100\n" "> +\t\t\t\t 0x1a100 0xf00>;\n" @@ -349,7 +355,7 @@ "> +\t\treg = <0x60000000 0x40000000>;\n" "> +\t};\n" "> +\n" - "> +\tintc: interrupt-controller at 1e001000 {\n" + "> +\tintc: interrupt-controller@1e001000 {\n" "> +\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> +\t\t#interrupt-cells = <2>;\n" "> +\t\t#address-cells = <0>;\n" @@ -644,6 +650,10 @@ "file and copying over pieces they need. Once DT support is on par with\n" "the old file, the old file can be deleted.\n" "\n" - Rob + "Rob\n" + "_______________________________________________\n" + "devicetree-discuss mailing list\n" + "devicetree-discuss@lists.ozlabs.org\n" + https://lists.ozlabs.org/listinfo/devicetree-discuss -553a97fe0fcc77f989562492a7b71403e8204fa943657a532374e3e7e86faaa7 +decdd7f0aef7f13b6d29b878e58fbf189e00e28bbf8a27ab65a5985de954134a
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.