diff for duplicates of <20161107182247.GA3669@arx12> diff --git a/a/1.txt b/N1/1.txt index ae11c8c..9d71492 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ index e3c3d7d8..855ae2c 100644 }; }; -+ dma: dma-controller at 01c02000 { ++ dma: dma-controller@01c02000 { + compatible = "allwinner,sun50i-a64-dma"; + reg = <0x01c02000 0x1000>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; @@ -22,7 +22,7 @@ index e3c3d7d8..855ae2c 100644 + #dma-cells = <1>; + }; + - uart0: serial at 1c28000 { + uart0: serial@1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; -- diff --git a/a/content_digest b/N1/content_digest index 7f6943f..9230c2a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,16 @@ - "From\0hao5781286@gmail.com (Hao Zhang)\0" + "From\0Hao Zhang <hao5781286@gmail.com>\0" "Subject\0[PATCH v3 2/3] ARM64: dts: sun6i: add dma node for a64.\0" "Date\0Tue, 8 Nov 2016 02:22:47 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0maxime.ripard@free-electrons.com" + wens@csie.org + robh+dt@kernel.org + mark.rutland@arm.com + catalin.marinas@arm.com + " will.deacon@arm.com\0" + "Cc\0hao5781286@gmail.com" + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This adds the dma node for sun50i a64.\n" @@ -19,7 +28,7 @@ " \t\t\t};\n" " \t\t};\n" " \n" - "+\t\tdma: dma-controller at 01c02000 {\n" + "+\t\tdma: dma-controller@01c02000 {\n" "+\t\t\tcompatible = \"allwinner,sun50i-a64-dma\";\n" "+\t\t\treg = <0x01c02000 0x1000>;\n" "+\t\t\tinterrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -28,10 +37,10 @@ "+\t\t\t#dma-cells = <1>;\n" "+\t\t};\n" "+\n" - " \t\tuart0: serial at 1c28000 {\n" + " \t\tuart0: serial@1c28000 {\n" " \t\t\tcompatible = \"snps,dw-apb-uart\";\n" " \t\t\treg = <0x01c28000 0x400>;\n" "-- \n" 2.7.4 -d46974e4a4ff0ff067e15130f26fa1fd4fa2058b4bc038f7ff08c244bb7c4359 +a7f0cb4af5b88b13fc3fa78762f746c1185e21cb5a30a2f1ab8f7d0b6e0c59d8
diff --git a/a/1.txt b/N2/1.txt index ae11c8c..9d71492 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -13,7 +13,7 @@ index e3c3d7d8..855ae2c 100644 }; }; -+ dma: dma-controller at 01c02000 { ++ dma: dma-controller@01c02000 { + compatible = "allwinner,sun50i-a64-dma"; + reg = <0x01c02000 0x1000>; + interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; @@ -22,7 +22,7 @@ index e3c3d7d8..855ae2c 100644 + #dma-cells = <1>; + }; + - uart0: serial at 1c28000 { + uart0: serial@1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; -- diff --git a/a/content_digest b/N2/content_digest index 7f6943f..15d588c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,16 @@ - "From\0hao5781286@gmail.com (Hao Zhang)\0" + "From\0Hao Zhang <hao5781286@gmail.com>\0" "Subject\0[PATCH v3 2/3] ARM64: dts: sun6i: add dma node for a64.\0" "Date\0Tue, 8 Nov 2016 02:22:47 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0maxime.ripard@free-electrons.com" + wens@csie.org + robh+dt@kernel.org + mark.rutland@arm.com + catalin.marinas@arm.com + " will.deacon@arm.com\0" + "Cc\0devicetree@vger.kernel.org" + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " hao5781286@gmail.com\0" "\00:1\0" "b\0" "This adds the dma node for sun50i a64.\n" @@ -19,7 +28,7 @@ " \t\t\t};\n" " \t\t};\n" " \n" - "+\t\tdma: dma-controller at 01c02000 {\n" + "+\t\tdma: dma-controller@01c02000 {\n" "+\t\t\tcompatible = \"allwinner,sun50i-a64-dma\";\n" "+\t\t\treg = <0x01c02000 0x1000>;\n" "+\t\t\tinterrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -28,10 +37,10 @@ "+\t\t\t#dma-cells = <1>;\n" "+\t\t};\n" "+\n" - " \t\tuart0: serial at 1c28000 {\n" + " \t\tuart0: serial@1c28000 {\n" " \t\t\tcompatible = \"snps,dw-apb-uart\";\n" " \t\t\treg = <0x01c28000 0x400>;\n" "-- \n" 2.7.4 -d46974e4a4ff0ff067e15130f26fa1fd4fa2058b4bc038f7ff08c244bb7c4359 +74324f9962e184575233641861e41fc2f2d7903a0d50ece19ba5cf767ec02d86
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.