diff for duplicates of <57341FCE.6050403@huawei.com> diff --git a/a/1.txt b/N1/1.txt index e8f5fc3..93047f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -69,7 +69,7 @@ Kefeng > status = "disabled"; > }; > -> + uart0: serial at 66100000 { +> + uart0: serial@66100000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x66100000 0x100>; > + interrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>; @@ -79,7 +79,7 @@ Kefeng > + status = "disabled"; > + }; > + -> + uart1: serial at 66110000 { +> + uart1: serial@66110000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x66110000 0x100>; > + interrupts = <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>; @@ -89,7 +89,7 @@ Kefeng > + status = "disabled"; > + }; > + -> + uart2: serial at 66120000 { +> + uart2: serial@66120000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x66120000 0x100>; > + interrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>; @@ -99,7 +99,7 @@ Kefeng > + status = "disabled"; > + }; > + -> uart3: serial at 66130000 { +> uart3: serial@66130000 { > compatible = "snps,dw-apb-uart"; > reg = <0x66130000 0x100>; > diff --git a/a/content_digest b/N1/content_digest index 70f06d1..a1d491b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,22 @@ "ref\01463007369-13071-1-git-send-email-jonmason@broadcom.com\0" - "From\0wangkefeng.wang@huawei.com (Kefeng Wang)\0" - "Subject\0[PATCH 1/2] arm64: dts: NS2: Add all of the UARTs\0" + "From\0Kefeng Wang <wangkefeng.wang@huawei.com>\0" + "Subject\0Re: [PATCH 1/2] arm64: dts: NS2: Add all of the UARTs\0" "Date\0Thu, 12 May 2016 14:16:46 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jon.mason@broadcom.com>" + Florian Fainelli <f.fainelli@gmail.com> + Ray Jui <rjui@broadcom.com> + Scott Branden <sbranden@broadcom.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Catalin Marinas <catalin.marinas@arm.com> + " Will Deacon <will.deacon@arm.com>\0" + "Cc\0bcm-kernel-feedback-list@broadcom.com" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -76,7 +90,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tuart0: serial at 66100000 {\n" + "> +\t\tuart0: serial@66100000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x66100000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -86,7 +100,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart1: serial at 66110000 {\n" + "> +\t\tuart1: serial@66110000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x66110000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -96,7 +110,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart2: serial at 66120000 {\n" + "> +\t\tuart2: serial@66120000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x66120000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -106,9 +120,9 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tuart3: serial at 66130000 {\n" + "> \t\tuart3: serial@66130000 {\n" "> \t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\treg = <0x66130000 0x100>;\n" > -92b6a488cb1b333d33563fc0c48438f3a04c671d347b7d6d934f8d7475095fb4 +57fcf1bf12282b6d98a54a9c8fee80f0397701b86eaa54a5319765c5b34a6630
diff --git a/a/1.txt b/N2/1.txt index e8f5fc3..93047f0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -69,7 +69,7 @@ Kefeng > status = "disabled"; > }; > -> + uart0: serial at 66100000 { +> + uart0: serial@66100000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x66100000 0x100>; > + interrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>; @@ -79,7 +79,7 @@ Kefeng > + status = "disabled"; > + }; > + -> + uart1: serial at 66110000 { +> + uart1: serial@66110000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x66110000 0x100>; > + interrupts = <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>; @@ -89,7 +89,7 @@ Kefeng > + status = "disabled"; > + }; > + -> + uart2: serial at 66120000 { +> + uart2: serial@66120000 { > + compatible = "snps,dw-apb-uart"; > + reg = <0x66120000 0x100>; > + interrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>; @@ -99,7 +99,7 @@ Kefeng > + status = "disabled"; > + }; > + -> uart3: serial at 66130000 { +> uart3: serial@66130000 { > compatible = "snps,dw-apb-uart"; > reg = <0x66130000 0x100>; > diff --git a/a/content_digest b/N2/content_digest index 70f06d1..a935592 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,22 @@ "ref\01463007369-13071-1-git-send-email-jonmason@broadcom.com\0" - "From\0wangkefeng.wang@huawei.com (Kefeng Wang)\0" - "Subject\0[PATCH 1/2] arm64: dts: NS2: Add all of the UARTs\0" + "From\0Kefeng Wang <wangkefeng.wang@huawei.com>\0" + "Subject\0Re: [PATCH 1/2] arm64: dts: NS2: Add all of the UARTs\0" "Date\0Thu, 12 May 2016 14:16:46 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jon.mason@broadcom.com>" + Florian Fainelli <f.fainelli@gmail.com> + Ray Jui <rjui@broadcom.com> + Scott Branden <sbranden@broadcom.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Catalin Marinas <catalin.marinas@arm.com> + " Will Deacon <will.deacon@arm.com>\0" + "Cc\0<bcm-kernel-feedback-list@broadcom.com>" + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "\n" @@ -76,7 +90,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tuart0: serial at 66100000 {\n" + "> +\t\tuart0: serial@66100000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x66100000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 390 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -86,7 +100,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart1: serial at 66110000 {\n" + "> +\t\tuart1: serial@66110000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x66110000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 391 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -96,7 +110,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tuart2: serial at 66120000 {\n" + "> +\t\tuart2: serial@66120000 {\n" "> +\t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> +\t\t\treg = <0x66120000 0x100>;\n" "> +\t\t\tinterrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -106,9 +120,9 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tuart3: serial at 66130000 {\n" + "> \t\tuart3: serial@66130000 {\n" "> \t\t\tcompatible = \"snps,dw-apb-uart\";\n" "> \t\t\treg = <0x66130000 0x100>;\n" > -92b6a488cb1b333d33563fc0c48438f3a04c671d347b7d6d934f8d7475095fb4 +e2aca82245b589ae646b964fe1ff62930b6c4fd71a19c16368023d5125eb56db
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.