diff for duplicates of <87y3vubvyl.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index deb01fd..b309e0f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -61,8 +61,8 @@ Gregory > status = "disabled"; > }; > -> - pcie at 10,0 { -> + pcie at a,0 { +> - pcie@10,0 { +> + pcie@a,0 { > device_type = "pci"; > assigned-addresses = <0x82005000 0 0x82000 0 0x2000>; > reg = <0x5000 0 0 0 0>; @@ -74,8 +74,8 @@ Gregory > reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>; > }; > -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,armada-370-pcie"; > status = "disabled"; > device_type = "pci"; @@ -103,8 +103,8 @@ Gregory > }; > }; > -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,armada-370-pcie"; > status = "disabled"; > device_type = "pci"; @@ -186,7 +186,7 @@ Gregory > + pcie { > status = "okay"; > -> pcie at 1,0 { +> pcie@1,0 { > diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts > index 28eede180e4f..5511c84849ee 100644 > --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts @@ -199,7 +199,7 @@ Gregory > + pcie { > status = "okay"; > -> pcie at 1,0 { +> pcie@1,0 { > diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi > index 8e63be33472e..534bde3fc579 100644 > --- a/arch/arm/boot/dts/armada-385.dtsi @@ -255,7 +255,7 @@ Gregory > > - pcie-controller { > + pcie { -> pcie at 3,0 { +> pcie@3,0 { > /* Port 2, Lane 0. CON2, nearest CPU. */ > reset-gpios = <&expander0 2 GPIO_ACTIVE_LOW>; > diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi @@ -348,7 +348,7 @@ Gregory > + pcie { > status = "okay"; > -> pcie at 1,0 { +> pcie@1,0 { > diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi > index 60fbfd5907c7..ea657071e278 100644 > --- a/arch/arm/boot/dts/armada-39x.dtsi @@ -402,8 +402,8 @@ Gregory > /* > * 98DX3236 has 1 x1 PCIe unit Gen2.0 > */ -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,armada-xp-pcie"; > status = "disabled"; > device_type = "pci"; @@ -423,8 +423,8 @@ Gregory > /* Port 2, Lane 0 */ > status = "okay"; > }; -> - pcie at 10,0 { -> + pcie at a,0 { +> - pcie@10,0 { +> + pcie@a,0 { > /* Port 3, Lane 0 */ > status = "okay"; > }; @@ -436,8 +436,8 @@ Gregory > /* Port 2, Lane 0 */ > status = "okay"; > }; -> - pcie at 10,0 { -> + pcie at a,0 { +> - pcie@10,0 { +> + pcie@a,0 { > /* Port 3, Lane 0 */ > status = "okay"; > }; @@ -449,8 +449,8 @@ Gregory > * configured as x4 or quad x1 lanes. One unit is > * x1 only. > */ -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,armada-xp-pcie"; > status = "disabled"; > device_type = "pci"; @@ -502,8 +502,8 @@ Gregory > * configured as x4 or quad x1 lanes. One unit is > * x4 only. > */ -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,armada-xp-pcie"; > status = "disabled"; > device_type = "pci"; @@ -587,8 +587,8 @@ Gregory > * configured as x4 or quad x1 lanes. Two units are > * x4/x1. > */ -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,armada-xp-pcie"; > status = "disabled"; > device_type = "pci"; @@ -668,8 +668,8 @@ Gregory > status = "disabled"; > }; > -> - pcie10: pcie at 10,0 { -> + pcie10: pcie at a,0 { +> - pcie10: pcie@10,0 { +> + pcie10: pcie@a,0 { > device_type = "pci"; > assigned-addresses = <0x82005000 0 0x82000 0 0x2000>; > reg = <0x5000 0 0 0 0>; @@ -689,8 +689,8 @@ Gregory > &pcie { > status = "okay"; > /* Fresco Logic USB3.0 xHCI controller */ -> - pcie-port at 0 { -> + pcie at 1 { +> - pcie-port@0 { +> + pcie@1 { > status = "okay"; > reset-gpios = <&gpio0 26 1>; > reset-delay-us = <20000>; @@ -698,8 +698,8 @@ Gregory > pinctrl-names = "default"; > }; > /* Mini-PCIe slot */ -> - pcie-port at 1 { -> + pcie at 2 { +> - pcie-port@1 { +> + pcie@2 { > status = "okay"; > reset-gpios = <&gpio0 25 1>; > }; @@ -720,8 +720,8 @@ Gregory > 0x82000000 0x2 0x0 MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 Mem */ > 0x81000000 0x2 0x0 MBUS_ID(0x08, 0xe0) 0 1 0>; /* Port 1.0 I/O */ > -> - pcie0: pcie-port at 0 { -> + pcie0: pcie at 1 { +> - pcie0: pcie-port@0 { +> + pcie0: pcie@1 { > device_type = "pci"; > status = "disabled"; > assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; @@ -736,8 +736,8 @@ Gregory > interrupt-map = <0 0 0 0 &intc 16>; > }; > -> - pcie1: pcie-port at 1 { -> + pcie1: pcie at 2 { +> - pcie1: pcie-port@1 { +> + pcie1: pcie@2 { > device_type = "pci"; > status = "disabled"; > assigned-addresses = <0x82002800 0 0x80000 0 0x2000>; @@ -755,9 +755,9 @@ Gregory > +++ b/arch/arm/boot/dts/kirkwood-6192.dtsi > @@ -1,6 +1,6 @@ > / { -> mbus at f1000000 { -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> mbus@f1000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,kirkwood-pcie"; > status = "disabled"; > device_type = "pci"; @@ -775,9 +775,9 @@ Gregory > +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi > @@ -1,6 +1,6 @@ > / { -> mbus at f1000000 { -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> mbus@f1000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,kirkwood-pcie"; > status = "disabled"; > device_type = "pci"; @@ -795,9 +795,9 @@ Gregory > +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi > @@ -1,6 +1,6 @@ > / { -> mbus at f1000000 { -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> mbus@f1000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,kirkwood-pcie"; > status = "disabled"; > device_type = "pci"; @@ -823,9 +823,9 @@ Gregory > +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi > @@ -1,6 +1,6 @@ > / { -> mbus at f1000000 { -> - pciec: pcie-controller at 82000000 { -> + pciec: pcie at 82000000 { +> mbus@f1000000 { +> - pciec: pcie-controller@82000000 { +> + pciec: pcie@82000000 { > compatible = "marvell,kirkwood-pcie"; > status = "disabled"; > device_type = "pci"; diff --git a/a/content_digest b/N1/content_digest index bba05e7..168c63b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\020170322020313.24338-1-robh@kernel.org\0" "ref\020170322020313.24338-2-robh@kernel.org\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH 02/15] ARM: dts: marvell: fix PCI bus dtc warnings\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH 02/15] ARM: dts: marvell: fix PCI bus dtc warnings\0" "Date\0Fri, 24 Mar 2017 15:17:22 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Rob Herring <robh@kernel.org>\0" + "Cc\0devicetree@vger.kernel.org" + Jason Cooper <jason@lakedaemon.net> + Andrew Lunn <andrew@lunn.ch> + arm@kernel.org + Bjorn Helgaas <bhelgaas@google.com> + linux-arm-kernel@lists.infradead.org + " Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" "\00:1\0" "b\0" "Hi Rob,\n" @@ -69,8 +76,8 @@ "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> -\tpcie at 10,0 {\n" - "> +\tpcie at a,0 {\n" + "> -\tpcie@10,0 {\n" + "> +\tpcie@a,0 {\n" "> \t\tdevice_type = \"pci\";\n" "> \t\tassigned-addresses = <0x82005000 0 0x82000 0 0x2000>;\n" "> \t\treg = <0x5000 0 0 0 0>;\n" @@ -82,8 +89,8 @@ "> \t\t\treg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;\n" "> \t\t};\n" "> \n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,armada-370-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -111,8 +118,8 @@ "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,armada-370-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -194,7 +201,7 @@ "> +\t\tpcie {\n" "> \t\t\tstatus = \"okay\";\n" "> \n" - "> \t\t\tpcie at 1,0 {\n" + "> \t\t\tpcie@1,0 {\n" "> diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts\n" "> index 28eede180e4f..5511c84849ee 100644\n" "> --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts\n" @@ -207,7 +214,7 @@ "> +\t\tpcie {\n" "> \t\t\tstatus = \"okay\";\n" "> \n" - "> \t\t\tpcie at 1,0 {\n" + "> \t\t\tpcie@1,0 {\n" "> diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi\n" "> index 8e63be33472e..534bde3fc579 100644\n" "> --- a/arch/arm/boot/dts/armada-385.dtsi\n" @@ -263,7 +270,7 @@ "> \n" "> -\t\tpcie-controller {\n" "> +\t\tpcie {\n" - "> \t\t\tpcie at 3,0 {\n" + "> \t\t\tpcie@3,0 {\n" "> \t\t\t\t/* Port 2, Lane 0. CON2, nearest CPU. */\n" "> \t\t\t\treset-gpios = <&expander0 2 GPIO_ACTIVE_LOW>;\n" "> diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi\n" @@ -356,7 +363,7 @@ "> +\t\tpcie {\n" "> \t\t\tstatus = \"okay\";\n" "> \n" - "> \t\t\tpcie at 1,0 {\n" + "> \t\t\tpcie@1,0 {\n" "> diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi\n" "> index 60fbfd5907c7..ea657071e278 100644\n" "> --- a/arch/arm/boot/dts/armada-39x.dtsi\n" @@ -410,8 +417,8 @@ "> \t\t/*\n" "> \t\t * 98DX3236 has 1 x1 PCIe unit Gen2.0\n" "> \t\t */\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,armada-xp-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -431,8 +438,8 @@ "> \t\t/* Port 2, Lane 0 */\n" "> \t\tstatus = \"okay\";\n" "> \t};\n" - "> -\tpcie at 10,0 {\n" - "> +\tpcie at a,0 {\n" + "> -\tpcie@10,0 {\n" + "> +\tpcie@a,0 {\n" "> \t\t/* Port 3, Lane 0 */\n" "> \t\tstatus = \"okay\";\n" "> \t};\n" @@ -444,8 +451,8 @@ "> \t\t/* Port 2, Lane 0 */\n" "> \t\tstatus = \"okay\";\n" "> \t};\n" - "> -\tpcie at 10,0 {\n" - "> +\tpcie at a,0 {\n" + "> -\tpcie@10,0 {\n" + "> +\tpcie@a,0 {\n" "> \t\t/* Port 3, Lane 0 */\n" "> \t\tstatus = \"okay\";\n" "> \t};\n" @@ -457,8 +464,8 @@ "> \t\t * configured as x4 or quad x1 lanes. One unit is\n" "> \t\t * x1 only.\n" "> \t\t */\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,armada-xp-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -510,8 +517,8 @@ "> \t\t * configured as x4 or quad x1 lanes. One unit is\n" "> \t\t * x4 only.\n" "> \t\t */\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,armada-xp-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -595,8 +602,8 @@ "> \t\t * configured as x4 or quad x1 lanes. Two units are\n" "> \t\t * x4/x1.\n" "> \t\t */\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,armada-xp-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -676,8 +683,8 @@ "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t};\n" "> \n" - "> -\t\t\tpcie10: pcie at 10,0 {\n" - "> +\t\t\tpcie10: pcie at a,0 {\n" + "> -\t\t\tpcie10: pcie@10,0 {\n" + "> +\t\t\tpcie10: pcie@a,0 {\n" "> \t\t\t\tdevice_type = \"pci\";\n" "> \t\t\t\tassigned-addresses = <0x82005000 0 0x82000 0 0x2000>;\n" "> \t\t\t\treg = <0x5000 0 0 0 0>;\n" @@ -697,8 +704,8 @@ "> &pcie {\n" "> \tstatus = \"okay\";\n" "> \t/* Fresco Logic USB3.0 xHCI controller */\n" - "> -\tpcie-port at 0 {\n" - "> +\tpcie at 1 {\n" + "> -\tpcie-port@0 {\n" + "> +\tpcie@1 {\n" "> \t\tstatus = \"okay\";\n" "> \t\treset-gpios = <&gpio0 26 1>;\n" "> \t\treset-delay-us = <20000>;\n" @@ -706,8 +713,8 @@ "> \t\tpinctrl-names = \"default\";\n" "> \t};\n" "> \t/* Mini-PCIe slot */\n" - "> -\tpcie-port at 1 {\n" - "> +\tpcie at 2 {\n" + "> -\tpcie-port@1 {\n" + "> +\tpcie@2 {\n" "> \t\tstatus = \"okay\";\n" "> \t\treset-gpios = <&gpio0 25 1>;\n" "> \t};\n" @@ -728,8 +735,8 @@ "> \t\t\t\t 0x82000000 0x2 0x0 MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 Mem */\n" "> \t\t\t\t 0x81000000 0x2 0x0 MBUS_ID(0x08, 0xe0) 0 1 0>; /* Port 1.0 I/O */\n" "> \n" - "> -\t\t\tpcie0: pcie-port at 0 {\n" - "> +\t\t\tpcie0: pcie at 1 {\n" + "> -\t\t\tpcie0: pcie-port@0 {\n" + "> +\t\t\tpcie0: pcie@1 {\n" "> \t\t\t\tdevice_type = \"pci\";\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t\tassigned-addresses = <0x82000800 0 0x40000 0 0x2000>;\n" @@ -744,8 +751,8 @@ "> \t\t\t\tinterrupt-map = <0 0 0 0 &intc 16>;\n" "> \t\t\t};\n" "> \n" - "> -\t\t\tpcie1: pcie-port at 1 {\n" - "> +\t\t\tpcie1: pcie at 2 {\n" + "> -\t\t\tpcie1: pcie-port@1 {\n" + "> +\t\t\tpcie1: pcie@2 {\n" "> \t\t\t\tdevice_type = \"pci\";\n" "> \t\t\t\tstatus = \"disabled\";\n" "> \t\t\t\tassigned-addresses = <0x82002800 0 0x80000 0 0x2000>;\n" @@ -763,9 +770,9 @@ "> +++ b/arch/arm/boot/dts/kirkwood-6192.dtsi\n" "> @@ -1,6 +1,6 @@\n" "> / {\n" - "> \tmbus at f1000000 {\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> \tmbus@f1000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,kirkwood-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -783,9 +790,9 @@ "> +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi\n" "> @@ -1,6 +1,6 @@\n" "> / {\n" - "> \tmbus at f1000000 {\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> \tmbus@f1000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,kirkwood-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -803,9 +810,9 @@ "> +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi\n" "> @@ -1,6 +1,6 @@\n" "> / {\n" - "> \tmbus at f1000000 {\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> \tmbus@f1000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,kirkwood-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -831,9 +838,9 @@ "> +++ b/arch/arm/boot/dts/kirkwood-98dx4122.dtsi\n" "> @@ -1,6 +1,6 @@\n" "> / {\n" - "> \tmbus at f1000000 {\n" - "> -\t\tpciec: pcie-controller at 82000000 {\n" - "> +\t\tpciec: pcie at 82000000 {\n" + "> \tmbus@f1000000 {\n" + "> -\t\tpciec: pcie-controller@82000000 {\n" + "> +\t\tpciec: pcie@82000000 {\n" "> \t\t\tcompatible = \"marvell,kirkwood-pcie\";\n" "> \t\t\tstatus = \"disabled\";\n" "> \t\t\tdevice_type = \"pci\";\n" @@ -855,4 +862,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -41c8c3f340398c6dd8316cffd242ce4fb61ce6d60b8a006d9b79254191f157c0 +31e3065f6df61380ed3eb0059e639c77d8062ff3736e855366e97373fb5810cc
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.