diff for duplicates of <20180220170049.22809-7-niklas.cassel@axis.com> diff --git a/a/1.txt b/N1/1.txt index e70d185..2bdfb38 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -22,7 +22,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 ranges; dma-ranges; -+ dma0: dma at f8019000 { ++ dma0: dma@f8019000 { + compatible = "renesas,nbpfaxi64dmac8b16"; + reg = <0xf8019000 0x400>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */ @@ -44,7 +44,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-channels = <8>; + dma-requests = <8>; + }; -+ dma1: dma at f8019400 { ++ dma1: dma@f8019400 { + compatible = "renesas,nbpfaxi64dmac8b16"; + reg = <0xf8019400 0x400>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */ @@ -67,7 +67,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-requests = <8>; + }; + - ethernet: ethernet at f8010000 { + ethernet: ethernet@f8010000 { clock-names = "stmmaceth", "ptp_ref"; clocks = <&clkctrl ARTPEC6_CLK_ETH_ACLK>, @@ -266,6 +312,9 @@ @@ -79,7 +79,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-names = "rx", "tx"; status = "disabled"; }; - uart1: serial at f8037000 { + uart1: serial@f8037000 { @@ -277,6 +326,9 @@ clock-names = "uart_clk", "apb_pclk"; pinctrl-names = "default"; @@ -89,7 +89,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-names = "rx", "tx"; status = "disabled"; }; - uart2: serial at f8038000 { + uart2: serial@f8038000 { @@ -288,6 +340,9 @@ clock-names = "uart_clk", "apb_pclk"; pinctrl-names = "default"; @@ -99,7 +99,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-names = "rx", "tx"; status = "disabled"; }; - uart3: serial at f8039000 { + uart3: serial@f8039000 { @@ -299,6 +354,9 @@ clock-names = "uart_clk", "apb_pclk"; pinctrl-names = "default"; diff --git a/a/content_digest b/N1/content_digest index 7e33ddd..04174b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,18 @@ "ref\020180220170049.22809-1-niklas.cassel@axis.com\0" - "From\0niklas.cassel@axis.com (Niklas Cassel)\0" + "From\0Niklas Cassel <niklas.cassel@axis.com>\0" "Subject\0[PATCH 6/8] ARM: dts: artpec: add and utilize nbpfaxi DMA controllers\0" "Date\0Tue, 20 Feb 2018 18:00:47 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0arm@kernel.org" + Jesper Nilsson <jespern@axis.com> + Lars Persson <larper@axis.com> + Niklas Cassel <niklass@axis.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + " Russell King <linux@armlinux.org.uk>\0" + "Cc\0devicetree@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + linux-arm-kernel@axis.com + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Add nodes for the nbpfaxi DMA controllers used in the artpec6 SoC,\n" @@ -29,7 +39,7 @@ " \t\tranges;\n" " \t\tdma-ranges;\n" " \n" - "+\t\tdma0: dma at f8019000 {\n" + "+\t\tdma0: dma@f8019000 {\n" "+\t\t\tcompatible = \"renesas,nbpfaxi64dmac8b16\";\n" "+\t\t\treg = <0xf8019000 0x400>;\n" "+\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */\n" @@ -51,7 +61,7 @@ "+\t\t\tdma-channels = <8>;\n" "+\t\t\tdma-requests = <8>;\n" "+\t\t};\n" - "+\t\tdma1: dma at f8019400 {\n" + "+\t\tdma1: dma@f8019400 {\n" "+\t\t\tcompatible = \"renesas,nbpfaxi64dmac8b16\";\n" "+\t\t\treg = <0xf8019400 0x400>;\n" "+\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */\n" @@ -74,7 +84,7 @@ "+\t\t\tdma-requests = <8>;\n" "+\t\t};\n" "+\n" - " \t\tethernet: ethernet at f8010000 {\n" + " \t\tethernet: ethernet@f8010000 {\n" " \t\t\tclock-names = \"stmmaceth\", \"ptp_ref\";\n" " \t\t\tclocks = <&clkctrl ARTPEC6_CLK_ETH_ACLK>,\n" "@@ -266,6 +312,9 @@\n" @@ -86,7 +96,7 @@ "+\t\t\tdma-names = \"rx\", \"tx\";\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - " \t\tuart1: serial at f8037000 {\n" + " \t\tuart1: serial@f8037000 {\n" "@@ -277,6 +326,9 @@\n" " \t\t\tclock-names = \"uart_clk\", \"apb_pclk\";\n" " \t\t\tpinctrl-names = \"default\";\n" @@ -96,7 +106,7 @@ "+\t\t\tdma-names = \"rx\", \"tx\";\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - " \t\tuart2: serial at f8038000 {\n" + " \t\tuart2: serial@f8038000 {\n" "@@ -288,6 +340,9 @@\n" " \t\t\tclock-names = \"uart_clk\", \"apb_pclk\";\n" " \t\t\tpinctrl-names = \"default\";\n" @@ -106,7 +116,7 @@ "+\t\t\tdma-names = \"rx\", \"tx\";\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - " \t\tuart3: serial at f8039000 {\n" + " \t\tuart3: serial@f8039000 {\n" "@@ -299,6 +354,9 @@\n" " \t\t\tclock-names = \"uart_clk\", \"apb_pclk\";\n" " \t\t\tpinctrl-names = \"default\";\n" @@ -120,4 +130,4 @@ "-- \n" 2.14.2 -bb2cde85d324e7f508bb6b87ac059ac0a79f2a8c5b81c44fa545968356fbafb3 +85b16a5af818cc94a21dc1663461353b985df7c190d0e291a88595a114be9b6c
diff --git a/a/1.txt b/N2/1.txt index e70d185..2bdfb38 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -22,7 +22,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 ranges; dma-ranges; -+ dma0: dma at f8019000 { ++ dma0: dma@f8019000 { + compatible = "renesas,nbpfaxi64dmac8b16"; + reg = <0xf8019000 0x400>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */ @@ -44,7 +44,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-channels = <8>; + dma-requests = <8>; + }; -+ dma1: dma at f8019400 { ++ dma1: dma@f8019400 { + compatible = "renesas,nbpfaxi64dmac8b16"; + reg = <0xf8019400 0x400>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */ @@ -67,7 +67,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-requests = <8>; + }; + - ethernet: ethernet at f8010000 { + ethernet: ethernet@f8010000 { clock-names = "stmmaceth", "ptp_ref"; clocks = <&clkctrl ARTPEC6_CLK_ETH_ACLK>, @@ -266,6 +312,9 @@ @@ -79,7 +79,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-names = "rx", "tx"; status = "disabled"; }; - uart1: serial at f8037000 { + uart1: serial@f8037000 { @@ -277,6 +326,9 @@ clock-names = "uart_clk", "apb_pclk"; pinctrl-names = "default"; @@ -89,7 +89,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-names = "rx", "tx"; status = "disabled"; }; - uart2: serial at f8038000 { + uart2: serial@f8038000 { @@ -288,6 +340,9 @@ clock-names = "uart_clk", "apb_pclk"; pinctrl-names = "default"; @@ -99,7 +99,7 @@ index 7a6d8f39823a..1c46df0c03ce 100644 + dma-names = "rx", "tx"; status = "disabled"; }; - uart3: serial at f8039000 { + uart3: serial@f8039000 { @@ -299,6 +354,9 @@ clock-names = "uart_clk", "apb_pclk"; pinctrl-names = "default"; diff --git a/a/content_digest b/N2/content_digest index 7e33ddd..22a15bf 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,18 @@ "ref\020180220170049.22809-1-niklas.cassel@axis.com\0" - "From\0niklas.cassel@axis.com (Niklas Cassel)\0" + "From\0Niklas Cassel <niklas.cassel@axis.com>\0" "Subject\0[PATCH 6/8] ARM: dts: artpec: add and utilize nbpfaxi DMA controllers\0" "Date\0Tue, 20 Feb 2018 18:00:47 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0arm@kernel.org" + Jesper Nilsson <jespern@axis.com> + Lars Persson <larper@axis.com> + Niklas Cassel <niklass@axis.com> + Rob Herring <robh+dt@kernel.org> + Mark Rutland <mark.rutland@arm.com> + " Russell King <linux@armlinux.org.uk>\0" + "Cc\0linux-arm-kernel@axis.com" + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Add nodes for the nbpfaxi DMA controllers used in the artpec6 SoC,\n" @@ -29,7 +39,7 @@ " \t\tranges;\n" " \t\tdma-ranges;\n" " \n" - "+\t\tdma0: dma at f8019000 {\n" + "+\t\tdma0: dma@f8019000 {\n" "+\t\t\tcompatible = \"renesas,nbpfaxi64dmac8b16\";\n" "+\t\t\treg = <0xf8019000 0x400>;\n" "+\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */\n" @@ -51,7 +61,7 @@ "+\t\t\tdma-channels = <8>;\n" "+\t\t\tdma-requests = <8>;\n" "+\t\t};\n" - "+\t\tdma1: dma at f8019400 {\n" + "+\t\tdma1: dma@f8019400 {\n" "+\t\t\tcompatible = \"renesas,nbpfaxi64dmac8b16\";\n" "+\t\t\treg = <0xf8019400 0x400>;\n" "+\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>, /* error */\n" @@ -74,7 +84,7 @@ "+\t\t\tdma-requests = <8>;\n" "+\t\t};\n" "+\n" - " \t\tethernet: ethernet at f8010000 {\n" + " \t\tethernet: ethernet@f8010000 {\n" " \t\t\tclock-names = \"stmmaceth\", \"ptp_ref\";\n" " \t\t\tclocks = <&clkctrl ARTPEC6_CLK_ETH_ACLK>,\n" "@@ -266,6 +312,9 @@\n" @@ -86,7 +96,7 @@ "+\t\t\tdma-names = \"rx\", \"tx\";\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - " \t\tuart1: serial at f8037000 {\n" + " \t\tuart1: serial@f8037000 {\n" "@@ -277,6 +326,9 @@\n" " \t\t\tclock-names = \"uart_clk\", \"apb_pclk\";\n" " \t\t\tpinctrl-names = \"default\";\n" @@ -96,7 +106,7 @@ "+\t\t\tdma-names = \"rx\", \"tx\";\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - " \t\tuart2: serial at f8038000 {\n" + " \t\tuart2: serial@f8038000 {\n" "@@ -288,6 +340,9 @@\n" " \t\t\tclock-names = \"uart_clk\", \"apb_pclk\";\n" " \t\t\tpinctrl-names = \"default\";\n" @@ -106,7 +116,7 @@ "+\t\t\tdma-names = \"rx\", \"tx\";\n" " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" - " \t\tuart3: serial at f8039000 {\n" + " \t\tuart3: serial@f8039000 {\n" "@@ -299,6 +354,9 @@\n" " \t\t\tclock-names = \"uart_clk\", \"apb_pclk\";\n" " \t\t\tpinctrl-names = \"default\";\n" @@ -120,4 +130,4 @@ "-- \n" 2.14.2 -bb2cde85d324e7f508bb6b87ac059ac0a79f2a8c5b81c44fa545968356fbafb3 +0351cfbad722921c2500f6c07d95b8a6677ca1b4b3bfa59f8a8898cc6ee4aae0
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.