diff for duplicates of <4EB93E02.9000100@gmail.com> diff --git a/a/1.txt b/N1/1.txt index ff72cbb..0a9118e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On 11/08/2011 07:16 AM, Pawel Moll wrote: > used with V2M motherboard and an initial implementation of the > DT machine support. > -> Signed-off-by: Pawel Moll <pawel.moll@arm.com> +> Signed-off-by: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> > --- > arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 196 +++++++++++++++++++++++++++++++ > arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 121 +++++++++++++++++++ @@ -57,20 +57,20 @@ the DT. > + #size-cells = <1>; > + #interrupt-cells = <1>; > + -> + flash at 0,00000000 { +> + flash@0,00000000 { > + compatible = "arm,vexpress-flash", "cfi-flash"; > + reg = <0 0x00000000 0x04000000 > + 4 0x00000000 0x04000000>; > + bank-width = <4>; > + }; > + -> + psram at 1,00000000 { +> + psram@1,00000000 { > + compatible = "mtd-ram"; > + reg = <1 0x00000000 0x02000000>; > + bank-width = <4>; > + }; > + -> + ethernet at 2,02000000 { +> + ethernet@2,02000000 { > + compatible = "smsc,lan9118", "smsc,lan9115"; > + reg = <2 0x02000000 0x10000>; > + interrupts = <15>; @@ -80,68 +80,68 @@ the DT. > + smsc,irq-push-pull; > + }; > + -> + usb at 2,03000000 { +> + usb@2,03000000 { > + compatible = "nxp,usb-isp1761"; > + reg = <2 0x03000000 0x20000>; > + interrupts = <16>; > + port1-otg; > + }; > + -> + peripherals at 3,00000000 { +> + peripherals@3,00000000 { > + compatible = "arm,amba-bus", "simple-bus"; > + #address-cells = <1>; > + #size-cells = <1>; > + ranges = <0 3 0 0x200000>; > + -> + sysreg: sysreg at 010000 { +> + sysreg: sysreg@010000 { > + compatible = "arm,vexpress-sysreg"; > + reg = <0x010000 0x1000>; > + }; > + -> + sysctl: sysctl at 020000 { +> + sysctl: sysctl@020000 { > + compatible = "arm,sp810"; > + reg = <0x020000 0x1000>; > + }; > + > + /* PCI-E I2C bus */ -> + i2c0: i2c at 030000 { +> + i2c0: i2c@030000 { > + compatible = "arm,versatile-i2c"; > + reg = <0x030000 0x1000>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + -> + pcie-switch at 60 { +> + pcie-switch@60 { > + compatible = "idt,89hpes32h8"; > + reg = <0x60>; > + }; > + }; > + -> + aaci at 040000 { +> + aaci@040000 { > + compatible = "arm,pl041", "arm,primecell"; > + reg = <0x040000 0x1000>; > + interrupts = <11>; > + }; > + -> + mmci at 050000 { +> + mmci@050000 { > + compatible = "arm,pl180", "arm,primecell"; > + reg = <0x050000 0x1000>; > + interrupts = <9 10>; > + }; > + -> + kmi at 060000 { +> + kmi@060000 { > + compatible = "arm,pl050", "arm,primecell"; > + reg = <0x060000 0x1000>; > + interrupts = <12>; > + }; > + -> + kmi at 070000 { +> + kmi@070000 { > + compatible = "arm,pl050", "arm,primecell"; > + reg = <0x070000 0x1000>; > + interrupts = <13>; > + }; > + -> + uart0: uart at 090000 { +> + uart0: uart@090000 { Use generic names: @@ -152,74 +152,74 @@ s/uart/serial/ > + interrupts = <5>; > + }; > + -> + uart1: uart at 0a0000 { +> + uart1: uart@0a0000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x0a0000 0x1000>; > + interrupts = <6>; > + }; > + -> + uart2: uart at 0b0000 { +> + uart2: uart@0b0000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x0b0000 0x1000>; > + interrupts = <7>; > + }; > + -> + uart3: uart at 0c0000 { +> + uart3: uart@0c0000 { > + compatible = "arm,pl011", "arm,primecell"; > + reg = <0x0c0000 0x1000>; > + interrupts = <8>; > + }; > + -> + wdt at 0f0000 { +> + wdt@0f0000 { > + compatible = "arm,sp805", "arm,primecell"; > + reg = <0x0f0000 0x1000>; > + interrupts = <0>; > + }; > + -> + timer01: timer at 110000 { +> + timer01: timer@110000 { > + compatible = "arm,sp804", "arm,primecell"; > + reg = <0x110000 0x1000>; > + interrupts = <2>; > + }; > + -> + timer23: timer at 120000 { +> + timer23: timer@120000 { > + compatible = "arm,sp804", "arm,primecell"; > + reg = <0x120000 0x1000>; > + }; > + > + /* DVI I2C bus */ -> + i2c1: i2c at 160000 { +> + i2c1: i2c@160000 { > + compatible = "arm,versatile-i2c"; > + reg = <0x160000 0x1000>; > + > + #address-cells = <1>; > + #size-cells = <0>; > + -> + dvi-switch-a at 39 { +> + dvi-switch-a@39 { > + compatible = "sil,sii9022"; > + reg = <0x39>; > + }; > + -> + dvi-switch-b at 60 { +> + dvi-switch-b@60 { > + compatible = "sil,sii9022"; > + reg = <0x60>; > + }; > + }; > + -> + rtc at 170000 { +> + rtc@170000 { > + compatible = "arm,pl031", "arm,primecell"; > + reg = <0x170000 0x1000>; > + interrupts = <4>; > + }; > + -> + compact-flash at 1a0000 { +> + compact-flash@1a0000 { > + compatible = "ata-generic"; > + reg = <0x1a0000 0x100 > + 0x1a0100 0xf00>; > + reg-shift = <2>; > + }; > + -> + clcd at 1f0000 { +> + clcd@1f0000 { > + compatible = "arm,pl111", "arm,primecell"; > + reg = <0x1f0000 0x1000>; > + interrupts = <14>; @@ -253,31 +253,31 @@ s/uart/serial/ > + > + memory { -memory at 80000000 +memory@80000000 > + device_type = "memory"; > + reg = <0x80000000 0x40000000>; > + }; > + -> + hdlcd at 2a110000 { +> + hdlcd@2a110000 { > + compatible = "arm,hdlcd"; > + reg = <0x2a110000 0x1000>; > + interrupts = <0 85 4>; > + }; > + -> + dmc at 2a150000 { +> + dmc@2a150000 { > + compatible = "arm,pl341", "arm,primecell"; > + reg = <0x2a150000 0x1000>; > + }; > + -> + smc at 2a190000 { +> + smc@2a190000 { > + compatible = "arm,pl354", "arm,primecell"; > + reg = <0x2a190000 0x1000>; > + interrupts = <0 86 4>, > + <0 87 4>; > + }; > + -> + gic: interrupt-controller at 2c001000 { +> + gic: interrupt-controller@2c001000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #address-cells = <0>; @@ -286,7 +286,7 @@ memory at 80000000 > + <0x2c000100 0x100>; > + }; > + -> + L2: cache-controller at 2c0f0000 { +> + L2: cache-controller@2c0f0000 { > + compatible = "arm,pl310-cache"; > + reg = <0x2c0f0000 0x1000>; > + interrupts = <0 84 4>; diff --git a/a/content_digest b/N1/content_digest index 4a3f05d..e9d1f3f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,12 @@ "ref\01320758169-22668-1-git-send-email-pawel.moll@arm.com\0" "ref\01320758169-22668-7-git-send-email-pawel.moll@arm.com\0" - "From\0robherring2@gmail.com (Rob Herring)\0" - "Subject\0[RFC 6/6] ARM: vexpress: DT-based support for Coretile Express A5x2 (V2P-CA5s)\0" + "ref\01320758169-22668-7-git-send-email-pawel.moll-5wv7dgnIgG8@public.gmane.org\0" + "From\0Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Subject\0Re: [RFC 6/6] ARM: vexpress: DT-based support for Coretile Express A5x2 (V2P-CA5s)\0" "Date\0Tue, 08 Nov 2011 08:34:42 -0600\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\0" + "Cc\0devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org" + " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" "\00:1\0" "b\0" "On 11/08/2011 07:16 AM, Pawel Moll wrote:\n" @@ -11,7 +14,7 @@ "> used with V2M motherboard and an initial implementation of the\n" "> DT machine support.\n" "> \n" - "> Signed-off-by: Pawel Moll <pawel.moll@arm.com>\n" + "> Signed-off-by: Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 196 +++++++++++++++++++++++++++++++\n" "> arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 121 +++++++++++++++++++\n" @@ -65,20 +68,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 4 0x00000000 0x04000000>;\n" "> +\t\t\tbank-width = <4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tpsram at 1,00000000 {\n" + "> +\t\tpsram@1,00000000 {\n" "> +\t\t\tcompatible = \"mtd-ram\";\n" "> +\t\t\treg = <1 0x00000000 0x02000000>;\n" "> +\t\t\tbank-width = <4>;\n" "> +\t\t};\n" "> +\n" - "> +\t\tethernet at 2,02000000 {\n" + "> +\t\tethernet@2,02000000 {\n" "> +\t\t\tcompatible = \"smsc,lan9118\", \"smsc,lan9115\";\n" "> +\t\t\treg = <2 0x02000000 0x10000>;\n" "> +\t\t\tinterrupts = <15>;\n" @@ -88,68 +91,68 @@ "> +\t\t\tsmsc,irq-push-pull;\n" "> +\t\t};\n" "> +\n" - "> +\t\tusb at 2,03000000 {\n" + "> +\t\tusb@2,03000000 {\n" "> +\t\t\tcompatible = \"nxp,usb-isp1761\";\n" "> +\t\t\treg = <2 0x03000000 0x20000>;\n" "> +\t\t\tinterrupts = <16>;\n" "> +\t\t\tport1-otg;\n" "> +\t\t};\n" "> +\n" - "> +\t\tperipherals at 3,00000000 {\n" + "> +\t\tperipherals@3,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 3 0 0x200000>;\n" "> +\n" - "> +\t\t\tsysreg: sysreg at 010000 {\n" + "> +\t\t\tsysreg: sysreg@010000 {\n" "> +\t\t\t\tcompatible = \"arm,vexpress-sysreg\";\n" "> +\t\t\t\treg = <0x010000 0x1000>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsysctl: sysctl at 020000 {\n" + "> +\t\t\tsysctl: sysctl@020000 {\n" "> +\t\t\t\tcompatible = \"arm,sp810\";\n" "> +\t\t\t\treg = <0x020000 0x1000>;\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* PCI-E I2C bus */\n" - "> +\t\t\ti2c0: i2c at 030000 {\n" + "> +\t\t\ti2c0: i2c@030000 {\n" "> +\t\t\t\tcompatible = \"arm,versatile-i2c\";\n" "> +\t\t\t\treg = <0x030000 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 040000 {\n" + "> +\t\t\taaci@040000 {\n" "> +\t\t\t\tcompatible = \"arm,pl041\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x040000 0x1000>;\n" "> +\t\t\t\tinterrupts = <11>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tmmci at 050000 {\n" + "> +\t\t\tmmci@050000 {\n" "> +\t\t\t\tcompatible = \"arm,pl180\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x050000 0x1000>;\n" "> +\t\t\t\tinterrupts = <9 10>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tkmi at 060000 {\n" + "> +\t\t\tkmi@060000 {\n" "> +\t\t\t\tcompatible = \"arm,pl050\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x060000 0x1000>;\n" "> +\t\t\t\tinterrupts = <12>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tkmi at 070000 {\n" + "> +\t\t\tkmi@070000 {\n" "> +\t\t\t\tcompatible = \"arm,pl050\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x070000 0x1000>;\n" "> +\t\t\t\tinterrupts = <13>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart0: uart at 090000 {\n" + "> +\t\t\tuart0: uart@090000 {\n" "\n" "Use generic names:\n" "\n" @@ -160,74 +163,74 @@ "> +\t\t\t\tinterrupts = <5>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart1: uart at 0a0000 {\n" + "> +\t\t\tuart1: uart@0a0000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0a0000 0x1000>;\n" "> +\t\t\t\tinterrupts = <6>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart2: uart at 0b0000 {\n" + "> +\t\t\tuart2: uart@0b0000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0b0000 0x1000>;\n" "> +\t\t\t\tinterrupts = <7>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tuart3: uart at 0c0000 {\n" + "> +\t\t\tuart3: uart@0c0000 {\n" "> +\t\t\t\tcompatible = \"arm,pl011\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0c0000 0x1000>;\n" "> +\t\t\t\tinterrupts = <8>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\twdt at 0f0000 {\n" + "> +\t\t\twdt@0f0000 {\n" "> +\t\t\t\tcompatible = \"arm,sp805\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x0f0000 0x1000>;\n" "> +\t\t\t\tinterrupts = <0>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ttimer01: timer at 110000 {\n" + "> +\t\t\ttimer01: timer@110000 {\n" "> +\t\t\t\tcompatible = \"arm,sp804\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x110000 0x1000>;\n" "> +\t\t\t\tinterrupts = <2>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\ttimer23: timer at 120000 {\n" + "> +\t\t\ttimer23: timer@120000 {\n" "> +\t\t\t\tcompatible = \"arm,sp804\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x120000 0x1000>;\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* DVI I2C bus */\n" - "> +\t\t\ti2c1: i2c at 160000 {\n" + "> +\t\t\ti2c1: i2c@160000 {\n" "> +\t\t\t\tcompatible = \"arm,versatile-i2c\";\n" "> +\t\t\t\treg = <0x160000 0x1000>;\n" "> +\n" "> +\t\t\t\t#address-cells = <1>;\n" "> +\t\t\t\t#size-cells = <0>;\n" "> +\n" - "> +\t\t\t\tdvi-switch-a at 39 {\n" + "> +\t\t\t\tdvi-switch-a@39 {\n" "> +\t\t\t\t\tcompatible = \"sil,sii9022\";\n" "> +\t\t\t\t\treg = <0x39>;\n" "> +\t\t\t\t};\n" "> +\n" - "> +\t\t\t\tdvi-switch-b at 60 {\n" + "> +\t\t\t\tdvi-switch-b@60 {\n" "> +\t\t\t\t\tcompatible = \"sil,sii9022\";\n" "> +\t\t\t\t\treg = <0x60>;\n" "> +\t\t\t\t};\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\trtc at 170000 {\n" + "> +\t\t\trtc@170000 {\n" "> +\t\t\t\tcompatible = \"arm,pl031\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x170000 0x1000>;\n" "> +\t\t\t\tinterrupts = <4>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tcompact-flash at 1a0000 {\n" + "> +\t\t\tcompact-flash@1a0000 {\n" "> +\t\t\t\tcompatible = \"ata-generic\";\n" "> +\t\t\t\treg = <0x1a0000 0x100\n" "> +\t\t\t\t 0x1a0100 0xf00>;\n" "> +\t\t\t\treg-shift = <2>;\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tclcd at 1f0000 {\n" + "> +\t\t\tclcd@1f0000 {\n" "> +\t\t\t\tcompatible = \"arm,pl111\", \"arm,primecell\";\n" "> +\t\t\t\treg = <0x1f0000 0x1000>;\n" "> +\t\t\t\tinterrupts = <14>;\n" @@ -261,31 +264,31 @@ "> +\n" "> +\tmemory {\n" "\n" - "memory at 80000000\n" + "memory@80000000\n" "\n" "> +\t\tdevice_type = \"memory\";\n" "> +\t\treg = <0x80000000 0x40000000>;\n" "> +\t};\n" "> +\n" - "> +\thdlcd at 2a110000 {\n" + "> +\thdlcd@2a110000 {\n" "> +\t\tcompatible = \"arm,hdlcd\";\n" "> +\t\treg = <0x2a110000 0x1000>;\n" "> +\t\tinterrupts = <0 85 4>;\n" "> +\t};\n" "> +\t\n" - "> +\tdmc at 2a150000 {\n" + "> +\tdmc@2a150000 {\n" "> +\t\tcompatible = \"arm,pl341\", \"arm,primecell\";\n" "> +\t\treg = <0x2a150000 0x1000>;\n" "> +\t};\n" "> +\n" - "> +\tsmc at 2a190000 {\n" + "> +\tsmc@2a190000 {\n" "> +\t\tcompatible = \"arm,pl354\", \"arm,primecell\";\n" "> +\t\treg = <0x2a190000 0x1000>;\n" "> +\t\tinterrupts = <0 86 4>,\n" "> +\t\t\t <0 87 4>;\n" "> +\t};\n" "> +\n" - "> +\tgic: interrupt-controller at 2c001000 {\n" + "> +\tgic: interrupt-controller@2c001000 {\n" "> +\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> +\t\t#interrupt-cells = <3>;\n" "> +\t\t#address-cells = <0>;\n" @@ -294,7 +297,7 @@ "> +\t\t <0x2c000100 0x100>;\n" "> +\t};\n" "> +\n" - "> +\tL2: cache-controller at 2c0f0000 {\n" + "> +\tL2: cache-controller@2c0f0000 {\n" "> +\t\tcompatible = \"arm,pl310-cache\";\n" "> +\t\treg = <0x2c0f0000 0x1000>;\n" "> +\t\tinterrupts = <0 84 4>;\n" @@ -504,4 +507,4 @@ "> +\t.dt_compat\t= v2p_ca5s_dt_match,\n" > +MACHINE_END -54bebf86488b0eb835296ca2b08a35f4a8c4b37e68919b533a8f2eb2646172c7 +bcfacb2d3ae98bef3c7033aed154e27345ba5f32e760bfe26b541418f537c509
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.