diff for duplicates of <20180220212945.GA30339@axis.com> diff --git a/a/1.txt b/N1/1.txt index 453f338..ad4ae62 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,14 +23,14 @@ On Tue, Feb 20, 2018 at 06:00:48PM +0100, Niklas Cassel wrote: > + * Both pci nodes cannot be enabled at the same time, > + * leave the unwanted node as disabled. > + */ -> pcie: pcie at f8050000 { +> pcie: pcie@f8050000 { > compatible = "axis,artpec6-pcie", "snps,dw-pcie"; > reg = <0xf8050000 0x2000 > @@ -181,6 +185,22 @@ > status = "disabled"; > }; > -> + pcie_ep: pcie_ep at f8050000 { +> + pcie_ep: pcie_ep@f8050000 { > + compatible = "axis,artpec6-pcie-ep", "snps,dw-pcie"; > + reg = <0xf8050000 0x2000 > + 0xf8051000 0x2000 @@ -53,7 +53,7 @@ review the rest of the patch series. > + status = "disabled"; > + }; > + -> pinctrl: pinctrl at f801d000 { +> pinctrl: pinctrl@f801d000 { > compatible = "axis,artpec6-pinctrl"; > reg = <0xf801d000 0x400>; > -- diff --git a/a/content_digest b/N1/content_digest index 974f6ff..3496c02 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,18 @@ "ref\020180220170049.22809-1-niklas.cassel@axis.com\0" "ref\020180220170049.22809-8-niklas.cassel@axis.com\0" - "From\0niklas.cassel@axis.com (Niklas Cassel)\0" - "Subject\0[PATCH 7/8] ARM: dts: artpec: add disabled node for PCIe endpoint mode\0" + "From\0Niklas Cassel <niklas.cassel@axis.com>\0" + "Subject\0Re: [PATCH 7/8] ARM: dts: artpec: add disabled node for PCIe endpoint mode\0" "Date\0Tue, 20 Feb 2018 22:29:45 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0arm@kernel.org" + Jesper Nilsson <jespern@axis.com> + Lars Persson <larper@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" "On Tue, Feb 20, 2018 at 06:00:48PM +0100, Niklas Cassel wrote:\n" @@ -31,14 +40,14 @@ "> +\t * Both pci nodes cannot be enabled at the same time,\n" "> +\t * leave the unwanted node as disabled.\n" "> +\t */\n" - "> \tpcie: pcie at f8050000 {\n" + "> \tpcie: pcie@f8050000 {\n" "> \t\tcompatible = \"axis,artpec6-pcie\", \"snps,dw-pcie\";\n" "> \t\treg = <0xf8050000 0x2000\n" "> @@ -181,6 +185,22 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tpcie_ep: pcie_ep at f8050000 {\n" + "> +\tpcie_ep: pcie_ep@f8050000 {\n" "> +\t\tcompatible = \"axis,artpec6-pcie-ep\", \"snps,dw-pcie\";\n" "> +\t\treg = <0xf8050000 0x2000\n" "> +\t\t 0xf8051000 0x2000\n" @@ -61,11 +70,11 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tpinctrl: pinctrl at f801d000 {\n" + "> \tpinctrl: pinctrl@f801d000 {\n" "> \t\tcompatible = \"axis,artpec6-pinctrl\";\n" "> \t\treg = <0xf801d000 0x400>;\n" "> -- \n" "> 2.14.2\n" > -fb5d8c6cd58507409bad55a412743c5f49ec69f3692d141d8acccc9538fef6c0 +dd95212eacf26883be748db0336aaad76aa479d45b64d5be14020238b53c912c
diff --git a/a/1.txt b/N2/1.txt index 453f338..ad4ae62 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -23,14 +23,14 @@ On Tue, Feb 20, 2018 at 06:00:48PM +0100, Niklas Cassel wrote: > + * Both pci nodes cannot be enabled at the same time, > + * leave the unwanted node as disabled. > + */ -> pcie: pcie at f8050000 { +> pcie: pcie@f8050000 { > compatible = "axis,artpec6-pcie", "snps,dw-pcie"; > reg = <0xf8050000 0x2000 > @@ -181,6 +185,22 @@ > status = "disabled"; > }; > -> + pcie_ep: pcie_ep at f8050000 { +> + pcie_ep: pcie_ep@f8050000 { > + compatible = "axis,artpec6-pcie-ep", "snps,dw-pcie"; > + reg = <0xf8050000 0x2000 > + 0xf8051000 0x2000 @@ -53,7 +53,7 @@ review the rest of the patch series. > + status = "disabled"; > + }; > + -> pinctrl: pinctrl at f801d000 { +> pinctrl: pinctrl@f801d000 { > compatible = "axis,artpec6-pinctrl"; > reg = <0xf801d000 0x400>; > -- diff --git a/a/content_digest b/N2/content_digest index 974f6ff..a609d03 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,18 @@ "ref\020180220170049.22809-1-niklas.cassel@axis.com\0" "ref\020180220170049.22809-8-niklas.cassel@axis.com\0" - "From\0niklas.cassel@axis.com (Niklas Cassel)\0" - "Subject\0[PATCH 7/8] ARM: dts: artpec: add disabled node for PCIe endpoint mode\0" + "From\0Niklas Cassel <niklas.cassel@axis.com>\0" + "Subject\0Re: [PATCH 7/8] ARM: dts: artpec: add disabled node for PCIe endpoint mode\0" "Date\0Tue, 20 Feb 2018 22:29:45 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0arm@kernel.org" + Jesper Nilsson <jespern@axis.com> + Lars Persson <larper@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" "On Tue, Feb 20, 2018 at 06:00:48PM +0100, Niklas Cassel wrote:\n" @@ -31,14 +40,14 @@ "> +\t * Both pci nodes cannot be enabled at the same time,\n" "> +\t * leave the unwanted node as disabled.\n" "> +\t */\n" - "> \tpcie: pcie at f8050000 {\n" + "> \tpcie: pcie@f8050000 {\n" "> \t\tcompatible = \"axis,artpec6-pcie\", \"snps,dw-pcie\";\n" "> \t\treg = <0xf8050000 0x2000\n" "> @@ -181,6 +185,22 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tpcie_ep: pcie_ep at f8050000 {\n" + "> +\tpcie_ep: pcie_ep@f8050000 {\n" "> +\t\tcompatible = \"axis,artpec6-pcie-ep\", \"snps,dw-pcie\";\n" "> +\t\treg = <0xf8050000 0x2000\n" "> +\t\t 0xf8051000 0x2000\n" @@ -61,11 +70,11 @@ "> +\t\tstatus = \"disabled\";\n" "> +\t};\n" "> +\n" - "> \tpinctrl: pinctrl at f801d000 {\n" + "> \tpinctrl: pinctrl@f801d000 {\n" "> \t\tcompatible = \"axis,artpec6-pinctrl\";\n" "> \t\treg = <0xf801d000 0x400>;\n" "> -- \n" "> 2.14.2\n" > -fb5d8c6cd58507409bad55a412743c5f49ec69f3692d141d8acccc9538fef6c0 +eb309b026af8b91e0f53e1b605c6f11b6f4a7675dbe50021290835f206241fa3
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.