diff for duplicates of <20170726210943.6875-1-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 5ac63d5..d87eb83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,11 +1,11 @@ dtc recently added PCI bus checks. Fix these warnings. -Signed-off-by: Rob Herring <robh@kernel.org> -Cc: Bjorn Helgaas <bhelgaas@google.com> -Cc: Jason Cooper <jason@lakedaemon.net> -Cc: Andrew Lunn <andrew@lunn.ch> -Cc: Gregory Clement <gregory.clement@free-electrons.com> -Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +Signed-off-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> +Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org> +Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> +Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> +Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +Cc: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- v2: - rebase on v4.13-rc2 @@ -48,8 +48,8 @@ index 2de6f65ecfb1..e5af2e8461cf 100644 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>; @@ -61,8 +61,8 @@ index f9cf1273f35e..b1cf5a26f3c2 100644 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"; @@ -90,8 +90,8 @@ index 50c5e8417802..7225c7ce9a8d 100644 }; }; -- 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"; @@ -173,7 +173,7 @@ index be16ce39fb3d..06831e1e3f80 100644 + 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 7fcc4c4885cf..74863aff01c6 100644 --- a/arch/arm/boot/dts/armada-385.dtsi @@ -229,7 +229,7 @@ index 0d5f1f062275..ee7b0089eff0 100644 - 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 @@ -322,7 +322,7 @@ index e8604281c3c9..f0e0379f7619 100644 + 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 @@ -376,8 +376,8 @@ index be22ec5236ac..bdd4c7a45fbf 100644 /* * 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"; @@ -397,8 +397,8 @@ index a33974254d8c..065282c21789 100644 /* 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"; }; @@ -410,8 +410,8 @@ index d62bf7bea1df..ac9eab8ac186 100644 /* 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"; }; @@ -423,8 +423,8 @@ index 9f25814077f2..129738f7973d 100644 * 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"; @@ -476,8 +476,8 @@ index 2bfe07aebf1a..e58d597e37b9 100644 * 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"; @@ -561,8 +561,8 @@ index 6c33935f7074..a5c961cee7de 100644 * 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"; @@ -642,8 +642,8 @@ index 6c33935f7074..a5c961cee7de 100644 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>; @@ -663,8 +663,8 @@ index f5f59bb5a534..e88ff83f1dec 100644 &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>; @@ -672,8 +672,8 @@ index f5f59bb5a534..e88ff83f1dec 100644 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>; }; @@ -694,8 +694,8 @@ index 698d58cea20d..1475d3672e56 100644 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>; @@ -710,8 +710,8 @@ index 698d58cea20d..1475d3672e56 100644 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>; @@ -729,9 +729,9 @@ index d573e03f3134..f003f3f1bd65 100644 +++ 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"; @@ -749,9 +749,9 @@ index 748d0b62f233..47d4b3d3d9e9 100644 +++ 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"; @@ -769,9 +769,9 @@ index bb63d2d50fc5..a13dad0a7c08 100644 +++ 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"; @@ -797,9 +797,9 @@ index 720c210d491d..90d4d71b6683 100644 +++ 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"; @@ -813,3 +813,8 @@ index 720c210d491d..90d4d71b6683 100644 marvell,pcie-port = <0>; -- 2.11.0 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 5b3472f..5894a4b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,24 @@ - "From\0robh@kernel.org (Rob Herring)\0" + "From\0Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0[PATCH v2] ARM: dts: marvell: fix PCI bus dtc warnings\0" "Date\0Wed, 26 Jul 2017 16:09:37 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" + "Cc\0Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>" + Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org> + Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> + Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> + " Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" "\00:1\0" "b\0" "dtc recently added PCI bus checks. Fix these warnings.\n" "\n" - "Signed-off-by: Rob Herring <robh@kernel.org>\n" - "Cc: Bjorn Helgaas <bhelgaas@google.com>\n" - "Cc: Jason Cooper <jason@lakedaemon.net>\n" - "Cc: Andrew Lunn <andrew@lunn.ch>\n" - "Cc: Gregory Clement <gregory.clement@free-electrons.com>\n" - "Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\n" + "Signed-off-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" + "Cc: Bjorn Helgaas <bhelgaas-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>\n" + "Cc: Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>\n" + "Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>\n" + "Cc: Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + "Cc: Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" "---\n" "v2:\n" "- rebase on v4.13-rc2\n" @@ -54,8 +61,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" @@ -67,8 +74,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" @@ -96,8 +103,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" @@ -179,7 +186,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 7fcc4c4885cf..74863aff01c6 100644\n" "--- a/arch/arm/boot/dts/armada-385.dtsi\n" @@ -235,7 +242,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" @@ -328,7 +335,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" @@ -382,8 +389,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" @@ -403,8 +410,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" @@ -416,8 +423,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" @@ -429,8 +436,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" @@ -482,8 +489,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" @@ -567,8 +574,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" @@ -648,8 +655,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" @@ -669,8 +676,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" @@ -678,8 +685,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" @@ -700,8 +707,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" @@ -716,8 +723,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" @@ -735,9 +742,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" @@ -755,9 +762,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" @@ -775,9 +782,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" @@ -803,9 +810,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" @@ -818,6 +825,11 @@ " \t\t\t\tinterrupt-map = <0 0 0 0 &intc 9>;\n" " \t\t\t\tmarvell,pcie-port = <0>;\n" "-- \n" - 2.11.0 + "2.11.0\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -1794e012de50f0ca9a4f8776e15e111c1132a9cf514a9e18a45a89f6915de03f +e2b1db9b6c97a5c6cf614ebe6aac54390de978493f5ab79d9276add484bd6720
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.