diff for duplicates of <20160203143711.1eee3243@xhacker> diff --git a/a/1.txt b/N1/1.txt index ec04b67..e436d10 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -175,17 +175,17 @@ Do we need to put "Author: " at the head? > + * Exported on the micro USB connector CON32 > + * through an FTDI > + */ -> + uart0: serial@12000 { +> + uart0: serial at 12000 { > + status = "okay"; > + }; > + > + /* CON31 */ -> + usb3@58000 { +> + usb3 at 58000 { > + status = "okay"; > + }; > + > + /* CON3 */ -> + sata@e0000 { +> + sata at e0000 { > + status = "okay"; > + }; > + }; @@ -252,7 +252,7 @@ Do we need to put "Author: " at the head? > + compatible = "marvell,armada3720", "marvell,armada3700"; > + > + cpus { -> + cpu@1 { +> + cpu at 1 { > + device_type = "cpu"; > + compatible = "arm,cortex-a53","arm,armv8"; > + reg = <0x1>; @@ -329,7 +329,7 @@ Do we need to put "Author: " at the head? > + cpus { > + #address-cells = <1>; > + #size-cells = <0>; -> + cpu@0 { +> + cpu at 0 { > + device_type = "cpu"; > + compatible = "arm,cortex-a53", "arm,armv8"; > + reg = <0>; @@ -367,28 +367,28 @@ Do we need to put "Author: " at the head? > + /* 32M internal register @ 0xd000_0000 */ > + ranges = <0x0 0x0 0xd0000000 0x2000000>; > + -> + uart0: serial@12000 { +> + uart0: serial at 12000 { > + compatible = "marvell,armada-3700-uart"; > + reg = <0x12000 0x400>; > + interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>; > + status = "disabled"; > + }; > + -> + usb3@58000 { +> + usb3 at 58000 { > + compatible = "generic-xhci"; > + reg = <0x58000 0x4000>; > + interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; > + status = "disabled"; > + }; > + -> + sata@e0000 { +> + sata at e0000 { > + compatible = "marvell,armada-3700-ahci"; > + reg = <0xe0000 0x2000>; > + interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; > + status = "disabled"; > + }; > + -> + gic: interrupt-controller@1d00000 { +> + gic: interrupt-controller at 1d00000 { > + compatible = "arm,gic-v3"; > + #interrupt-cells = <3>; > + interrupt-controller; diff --git a/a/content_digest b/N1/content_digest index 2535d04..aae7d18 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,27 +1,9 @@ "ref\01454436468-4241-1-git-send-email-gregory.clement@free-electrons.com\0" "ref\01454436468-4241-8-git-send-email-gregory.clement@free-electrons.com\0" - "From\0Jisheng Zhang <jszhang@marvell.com>\0" - "Subject\0Re: [PATCH 07/10] arm64: dts: add the Marvell Armada 3700 family and a development board\0" + "From\0jszhang@marvell.com (Jisheng Zhang)\0" + "Subject\0[PATCH 07/10] arm64: dts: add the Marvell Armada 3700 family and a development board\0" "Date\0Wed, 3 Feb 2016 14:37:11 +0800\0" - "To\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" - "Cc\0Jason Cooper <jason@lakedaemon.net>" - Andrew Lunn <andrew@lunn.ch> - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - arm@kernel.org - Catalin Marinas <catalin.marinas@arm.com> - Will Deacon <will.deacon@arm.com> - Jonathan Corbet <corbet@lwn.net> - Mark Rutland <mark.rutland@arm.com> - devicetree@vger.kernel.org - linux-ide@vger.kernel.org - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - linux-kernel@vger.kernel.org - Hans de Goede <hdegoede@redhat.com> - linux-serial@vger.kernel.org - Jiri Slaby <jslaby@suse.com> - Tejun Heo <tj@kernel.org> - Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2 Feb 2016 19:07:45 +0100 Gregory CLEMENT wrote:\n" @@ -201,17 +183,17 @@ "> +\t\t\t* Exported on the micro USB connector CON32\n" "> +\t\t\t* through an FTDI\n" "> +\t\t\t*/\n" - "> +\t\t\tuart0: serial@12000 {\n" + "> +\t\t\tuart0: serial at 12000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* CON31 */\n" - "> +\t\t\tusb3@58000 {\n" + "> +\t\t\tusb3 at 58000 {\n" "> +\t\t\t\tstatus = \"okay\";\n" "> +\t\t\t};\n" "> +\n" "> +\t\t\t/* CON3 */\n" - "> +\t\t\tsata@e0000 {\n" + "> +\t\t\tsata at e0000 {\n" "> +\t\t\t status = \"okay\";\n" "> +\t\t\t};\n" "> +\t\t};\n" @@ -278,7 +260,7 @@ "> +\tcompatible = \"marvell,armada3720\", \"marvell,armada3700\";\n" "> +\n" "> +\tcpus {\n" - "> +\t\tcpu@1 {\n" + "> +\t\tcpu at 1 {\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\tcompatible = \"arm,cortex-a53\",\"arm,armv8\";\n" "> +\t\t\treg = <0x1>;\n" @@ -355,7 +337,7 @@ "> +\tcpus {\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <0>;\n" - "> +\t\tcpu@0 {\n" + "> +\t\tcpu at 0 {\n" "> +\t\t\tdevice_type = \"cpu\";\n" "> +\t\t\tcompatible = \"arm,cortex-a53\", \"arm,armv8\";\n" "> +\t\t\treg = <0>;\n" @@ -393,28 +375,28 @@ "> +\t\t\t/* 32M internal register @ 0xd000_0000 */\n" "> +\t\t\tranges = <0x0 0x0 0xd0000000 0x2000000>;\n" "> +\n" - "> +\t\t\tuart0: serial@12000 {\n" + "> +\t\t\tuart0: serial at 12000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-3700-uart\";\n" "> +\t\t\t\treg = <0x12000 0x400>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tusb3@58000 {\n" + "> +\t\t\tusb3 at 58000 {\n" "> +\t\t\t\tcompatible = \"generic-xhci\";\n" "> +\t\t\t\treg = <0x58000 0x4000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tsata@e0000 {\n" + "> +\t\t\tsata at e0000 {\n" "> +\t\t\t\tcompatible = \"marvell,armada-3700-ahci\";\n" "> +\t\t\t\treg = <0xe0000 0x2000>;\n" "> +\t\t\t\tinterrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t\t\t\tstatus = \"disabled\";\n" "> +\t\t\t};\n" "> +\n" - "> +\t\t\tgic: interrupt-controller@1d00000 {\n" + "> +\t\t\tgic: interrupt-controller at 1d00000 {\n" "> +\t\t\t\tcompatible = \"arm,gic-v3\";\n" "> +\t\t\t\t#interrupt-cells = <3>;\n" "> +\t\t\t\tinterrupt-controller;\n" @@ -431,4 +413,4 @@ "> +\t};\n" > +}; -d3b8e3016545f73456d82c1920b9b4dd620bd75a8da212df8a86ff6f7586f351 +af0f4b63ef2c97e7a87f592a03a9a21984bfd9c3fe7a6c426803bcd8cdedb750
diff --git a/a/content_digest b/N2/content_digest index 2535d04..bb5f3ee 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,21 +7,21 @@ "Cc\0Jason Cooper <jason@lakedaemon.net>" Andrew Lunn <andrew@lunn.ch> Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - arm@kernel.org + <arm@kernel.org> Catalin Marinas <catalin.marinas@arm.com> Will Deacon <will.deacon@arm.com> Jonathan Corbet <corbet@lwn.net> Mark Rutland <mark.rutland@arm.com> - devicetree@vger.kernel.org - linux-ide@vger.kernel.org + <devicetree@vger.kernel.org> + <linux-ide@vger.kernel.org> Greg Kroah-Hartman <gregkh@linuxfoundation.org> - linux-kernel@vger.kernel.org + <linux-kernel@vger.kernel.org> Hans de Goede <hdegoede@redhat.com> - linux-serial@vger.kernel.org + <linux-serial@vger.kernel.org> Jiri Slaby <jslaby@suse.com> Tejun Heo <tj@kernel.org> Thomas Petazzoni <thomas.petazzoni@free-electrons.com> - " linux-arm-kernel@lists.infradead.org\0" + " <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "On Tue, 2 Feb 2016 19:07:45 +0100 Gregory CLEMENT wrote:\n" @@ -431,4 +431,4 @@ "> +\t};\n" > +}; -d3b8e3016545f73456d82c1920b9b4dd620bd75a8da212df8a86ff6f7586f351 +c382198d8026fb3734053f696875a1af80d8b8ef259c14052fc60625160d3ace
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.