diff for duplicates of <20170322020313.24338-8-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index d8f82e1..f77decb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,10 +1,10 @@ dtc recently added PCI bus checks. Fix these warnings. -Signed-off-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> -Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> -Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> -Cc: Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> -Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +Signed-off-by: Rob Herring <robh@kernel.org> +Cc: Stephen Warren <swarren@wwwdotorg.org> +Cc: Thierry Reding <thierry.reding@gmail.com> +Cc: Alexandre Courbot <gnurou@gmail.com> +Cc: linux-tegra at vger.kernel.org --- Sub-arch maintainers, please apply to your trees unless arm-soc wants to take the whole lot. @@ -33,9 +33,9 @@ index 5b860ad5cbee..ecffcd115fa7 100644 stdout-path = "serial0:115200n8"; }; -- pcie-controller@01003000 { -+ pcie@1003000 { - pci@1,0 { +- pcie-controller at 01003000 { ++ pcie at 1003000 { + pci at 1,0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi @@ -46,8 +46,8 @@ index f9e623bdd5c3..5d9b18ef5af6 100644 reg = <0x0 0x80000000 0x0 0x80000000>; }; -- pcie-controller@01003000 { -+ pcie@1003000 { +- pcie-controller at 01003000 { ++ pcie at 1003000 { status = "okay"; avddio-pex-supply = <&vdd_1v05>; @@ -59,8 +59,8 @@ index 53994f9fbbcc..7bacb2954f58 100644 reg = <0x0 0x80000000 0x0 0x80000000>; }; -- pcie-controller@01003000 { -+ pcie@1003000 { +- pcie-controller at 01003000 { ++ pcie at 1003000 { status = "okay"; avddio-pex-supply = <&vdd_1v05_run>; @@ -72,8 +72,8 @@ index 187a36c6d0fc..1b10b14a6abd 100644 #address-cells = <2>; #size-cells = <2>; -- pcie-controller@01003000 { -+ pcie@1003000 { +- pcie-controller at 01003000 { ++ pcie at 1003000 { compatible = "nvidia,tegra124-pcie"; device_type = "pci"; reg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */ @@ -101,8 +101,8 @@ index d4fb4d39ede7..41749693ec3c 100644 nvidia,sys-clock-req-active-high; }; -- pcie-controller@80003000 { -+ pcie@80003000 { +- pcie-controller at 80003000 { ++ pcie at 80003000 { status = "okay"; avdd-pex-supply = <&pci_vdd_reg>; @@ -114,8 +114,8 @@ index 27d2bbbf1eae..7361f4a82e80 100644 nvidia,sys-clock-req-active-high; }; -- pcie-controller@80003000 { -+ pcie@80003000 { +- pcie-controller at 80003000 { ++ pcie at 80003000 { avdd-pex-supply = <&pci_vdd_reg>; vdd-pex-supply = <&pci_vdd_reg>; avdd-pex-pll-supply = <&pci_vdd_reg>; @@ -127,11 +127,11 @@ index c12d8bead2ee..9cb534f4441e 100644 }; }; -- pcie-controller@80003000 { -+ pcie@80003000 { +- pcie-controller at 80003000 { ++ pcie at 80003000 { status = "okay"; - pci@1,0 { + pci at 1,0 { diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts index 87b07fbadbbe..b902ab594afa 100644 --- a/arch/arm/boot/dts/tegra20-trimslice.dts @@ -140,8 +140,8 @@ index 87b07fbadbbe..b902ab594afa 100644 nvidia,sys-clock-req-active-high; }; -- pcie-controller@80003000 { -+ pcie@80003000 { +- pcie-controller at 80003000 { ++ pcie at 80003000 { status = "okay"; avdd-pex-supply = <&pci_vdd_reg>; @@ -153,8 +153,8 @@ index e8807503f87c..7c85f97f72ea 100644 reset-names = "fuse"; }; -- pcie-controller@80003000 { -+ pcie@80003000 { +- pcie-controller at 80003000 { ++ pcie at 80003000 { compatible = "nvidia,tegra20-pcie"; device_type = "pci"; reg = <0x80003000 0x00000800 /* PADS registers */ @@ -182,11 +182,11 @@ index 99a69457dbf5..fc530e4a96c4 100644 stdout-path = "serial0:115200n8"; }; -- pcie-controller@00003000 { -+ pcie@3000 { +- pcie-controller at 00003000 { ++ pcie at 3000 { status = "okay"; - pci@1,0 { + pci at 1,0 { diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi index f6c7c3e958ac..7a6a1a014603 100644 --- a/arch/arm/boot/dts/tegra30-apalis.dtsi @@ -195,8 +195,8 @@ index f6c7c3e958ac..7a6a1a014603 100644 model = "Toradex Apalis T30"; compatible = "toradex,apalis_t30", "nvidia,tegra30"; -- pcie-controller@00003000 { -+ pcie@3000 { +- pcie-controller at 00003000 { ++ pcie at 3000 { avdd-pexa-supply = <&vdd2_reg>; vdd-pexa-supply = <&vdd2_reg>; avdd-pexb-supply = <&vdd2_reg>; @@ -208,8 +208,8 @@ index 0350002849d5..4f41b18d9547 100644 reg = <0x80000000 0x7ff00000>; }; -- pcie-controller@00003000 { -+ pcie@3000 { +- pcie-controller at 00003000 { ++ pcie at 3000 { status = "okay"; avdd-pexa-supply = <&ldo1_reg>; @@ -221,8 +221,8 @@ index f11012bb58cc..83dc14a9b353 100644 reg = <0x80000000 0x40000000>; }; -- pcie-controller@00003000 { -+ pcie@3000 { +- pcie-controller at 00003000 { ++ pcie at 3000 { status = "okay"; /* AVDD_PEXA and VDD_PEXA inputs are grounded on Cardhu. */ @@ -234,8 +234,8 @@ index bbb1c002e7f1..13960fda7471 100644 compatible = "nvidia,tegra30"; interrupt-parent = <&lic>; -- pcie-controller@00003000 { -+ pcie@3000 { +- pcie-controller at 00003000 { ++ pcie at 3000 { compatible = "nvidia,tegra30-pcie"; device_type = "pci"; reg = <0x00003000 0x00000800 /* PADS registers */ diff --git a/a/content_digest b/N1/content_digest index e17094f..02ea5ac 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,17 @@ "ref\020170322020313.24338-1-robh@kernel.org\0" - "ref\020170322020313.24338-1-robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" - "From\0Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" + "From\0robh@kernel.org (Rob Herring)\0" "Subject\0[PATCH 08/15] ARM: dts: tegra: fix PCI bus dtc warnings\0" "Date\0Tue, 21 Mar 2017 21:03:06 -0500\0" - "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org" - " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" - "Cc\0arm-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org" - Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> - Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> - " linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "dtc recently added PCI bus checks. Fix these warnings.\n" "\n" - "Signed-off-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\n" - "Cc: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>\n" - "Cc: Thierry Reding <thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" - "Cc: Alexandre Courbot <gnurou-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" - "Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + "Signed-off-by: Rob Herring <robh@kernel.org>\n" + "Cc: Stephen Warren <swarren@wwwdotorg.org>\n" + "Cc: Thierry Reding <thierry.reding@gmail.com>\n" + "Cc: Alexandre Courbot <gnurou@gmail.com>\n" + "Cc: linux-tegra at vger.kernel.org\n" "---\n" "Sub-arch maintainers, please apply to your trees unless arm-soc wants \n" "to take the whole lot.\n" @@ -47,9 +40,9 @@ " \t\tstdout-path = \"serial0:115200n8\";\n" " \t};\n" " \n" - "-\tpcie-controller@01003000 {\n" - "+\tpcie@1003000 {\n" - " \t\tpci@1,0 {\n" + "-\tpcie-controller at 01003000 {\n" + "+\tpcie at 1003000 {\n" + " \t\tpci at 1,0 {\n" " \t\t\tstatus = \"okay\";\n" " \t\t};\n" "diff --git a/arch/arm/boot/dts/tegra124-apalis.dtsi b/arch/arm/boot/dts/tegra124-apalis.dtsi\n" @@ -60,8 +53,8 @@ " \t\treg = <0x0 0x80000000 0x0 0x80000000>;\n" " \t};\n" " \n" - "-\tpcie-controller@01003000 {\n" - "+\tpcie@1003000 {\n" + "-\tpcie-controller at 01003000 {\n" + "+\tpcie at 1003000 {\n" " \t\tstatus = \"okay\";\n" " \n" " \t\tavddio-pex-supply = <&vdd_1v05>;\n" @@ -73,8 +66,8 @@ " \t\treg = <0x0 0x80000000 0x0 0x80000000>;\n" " \t};\n" " \n" - "-\tpcie-controller@01003000 {\n" - "+\tpcie@1003000 {\n" + "-\tpcie-controller at 01003000 {\n" + "+\tpcie at 1003000 {\n" " \t\tstatus = \"okay\";\n" " \n" " \t\tavddio-pex-supply = <&vdd_1v05_run>;\n" @@ -86,8 +79,8 @@ " \t#address-cells = <2>;\n" " \t#size-cells = <2>;\n" " \n" - "-\tpcie-controller@01003000 {\n" - "+\tpcie@1003000 {\n" + "-\tpcie-controller at 01003000 {\n" + "+\tpcie at 1003000 {\n" " \t\tcompatible = \"nvidia,tegra124-pcie\";\n" " \t\tdevice_type = \"pci\";\n" " \t\treg = <0x0 0x01003000 0x0 0x00000800 /* PADS registers */\n" @@ -115,8 +108,8 @@ " \t\tnvidia,sys-clock-req-active-high;\n" " \t};\n" " \n" - "-\tpcie-controller@80003000 {\n" - "+\tpcie@80003000 {\n" + "-\tpcie-controller at 80003000 {\n" + "+\tpcie at 80003000 {\n" " \t\tstatus = \"okay\";\n" " \n" " \t\tavdd-pex-supply = <&pci_vdd_reg>;\n" @@ -128,8 +121,8 @@ " \t\tnvidia,sys-clock-req-active-high;\n" " \t};\n" " \n" - "-\tpcie-controller@80003000 {\n" - "+\tpcie@80003000 {\n" + "-\tpcie-controller at 80003000 {\n" + "+\tpcie at 80003000 {\n" " \t\tavdd-pex-supply = <&pci_vdd_reg>;\n" " \t\tvdd-pex-supply = <&pci_vdd_reg>;\n" " \t\tavdd-pex-pll-supply = <&pci_vdd_reg>;\n" @@ -141,11 +134,11 @@ " \t\t};\n" " \t};\n" " \n" - "-\tpcie-controller@80003000 {\n" - "+\tpcie@80003000 {\n" + "-\tpcie-controller at 80003000 {\n" + "+\tpcie at 80003000 {\n" " \t\tstatus = \"okay\";\n" " \n" - " \t\tpci@1,0 {\n" + " \t\tpci at 1,0 {\n" "diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts\n" "index 87b07fbadbbe..b902ab594afa 100644\n" "--- a/arch/arm/boot/dts/tegra20-trimslice.dts\n" @@ -154,8 +147,8 @@ " \t\tnvidia,sys-clock-req-active-high;\n" " \t};\n" " \n" - "-\tpcie-controller@80003000 {\n" - "+\tpcie@80003000 {\n" + "-\tpcie-controller at 80003000 {\n" + "+\tpcie at 80003000 {\n" " \t\tstatus = \"okay\";\n" " \n" " \t\tavdd-pex-supply = <&pci_vdd_reg>;\n" @@ -167,8 +160,8 @@ " \t\treset-names = \"fuse\";\n" " \t};\n" " \n" - "-\tpcie-controller@80003000 {\n" - "+\tpcie@80003000 {\n" + "-\tpcie-controller at 80003000 {\n" + "+\tpcie at 80003000 {\n" " \t\tcompatible = \"nvidia,tegra20-pcie\";\n" " \t\tdevice_type = \"pci\";\n" " \t\treg = <0x80003000 0x00000800 /* PADS registers */\n" @@ -196,11 +189,11 @@ " \t\tstdout-path = \"serial0:115200n8\";\n" " \t};\n" " \n" - "-\tpcie-controller@00003000 {\n" - "+\tpcie@3000 {\n" + "-\tpcie-controller at 00003000 {\n" + "+\tpcie at 3000 {\n" " \t\tstatus = \"okay\";\n" " \n" - " \t\tpci@1,0 {\n" + " \t\tpci at 1,0 {\n" "diff --git a/arch/arm/boot/dts/tegra30-apalis.dtsi b/arch/arm/boot/dts/tegra30-apalis.dtsi\n" "index f6c7c3e958ac..7a6a1a014603 100644\n" "--- a/arch/arm/boot/dts/tegra30-apalis.dtsi\n" @@ -209,8 +202,8 @@ " \tmodel = \"Toradex Apalis T30\";\n" " \tcompatible = \"toradex,apalis_t30\", \"nvidia,tegra30\";\n" " \n" - "-\tpcie-controller@00003000 {\n" - "+\tpcie@3000 {\n" + "-\tpcie-controller at 00003000 {\n" + "+\tpcie at 3000 {\n" " \t\tavdd-pexa-supply = <&vdd2_reg>;\n" " \t\tvdd-pexa-supply = <&vdd2_reg>;\n" " \t\tavdd-pexb-supply = <&vdd2_reg>;\n" @@ -222,8 +215,8 @@ " \t\treg = <0x80000000 0x7ff00000>;\n" " \t};\n" " \n" - "-\tpcie-controller@00003000 {\n" - "+\tpcie@3000 {\n" + "-\tpcie-controller at 00003000 {\n" + "+\tpcie at 3000 {\n" " \t\tstatus = \"okay\";\n" " \n" " \t\tavdd-pexa-supply = <&ldo1_reg>;\n" @@ -235,8 +228,8 @@ " \t\treg = <0x80000000 0x40000000>;\n" " \t};\n" " \n" - "-\tpcie-controller@00003000 {\n" - "+\tpcie@3000 {\n" + "-\tpcie-controller at 00003000 {\n" + "+\tpcie at 3000 {\n" " \t\tstatus = \"okay\";\n" " \n" " \t\t/* AVDD_PEXA and VDD_PEXA inputs are grounded on Cardhu. */\n" @@ -248,8 +241,8 @@ " \tcompatible = \"nvidia,tegra30\";\n" " \tinterrupt-parent = <&lic>;\n" " \n" - "-\tpcie-controller@00003000 {\n" - "+\tpcie@3000 {\n" + "-\tpcie-controller at 00003000 {\n" + "+\tpcie at 3000 {\n" " \t\tcompatible = \"nvidia,tegra30-pcie\";\n" " \t\tdevice_type = \"pci\";\n" " \t\treg = <0x00003000 0x00000800 /* PADS registers */\n" @@ -280,4 +273,4 @@ "-- \n" 2.10.1 -b5cd214c2d924a55525cfa030166a57d62a803fcee286343f14f66b532ad9a24 +f001271c36a6da4227535706dac836d3425cd36a5d114c8256ed72183e35c6ce
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.