powerpc/boot/dts: Fix dtc "pciex" warnings

With CONFIG_OF_ALL_DTBS=y, as set by eg. allmodconfig, we see lots of
warnings about our dts files, such as:

  arch/powerpc/boot/dts/glacier.dts:492.26-532.5:
  Warning (pci_bridge): /plb/pciex@d00000000: node name is not "pci"
  or "pcie"

The node name should not particularly matter, it's just a name, and
AFAICS there's no kernel code that cares whether nodes are *named*
"pciex" or "pcie". So shutup these warnings by converting to the name
dtc wants.

As always there's some risk this could break something obscure that
does rely on the name, in which case we can revert.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200623130320.405852-1-mpe@ellerman.id.au

diff --git a/arch/powerpc/boot/dts/akebono.dts b/arch/powerpc/boot/dts/akebono.dts
index cd9d66041a3fee93000debb92d26e07540fb4307..df18f8dc464288e1f2f328192f8ada5528c6cf3a 100644 (file)
--- a/arch/powerpc/boot/dts/akebono.dts
+++ b/arch/powerpc/boot/dts/akebono.dts
@@ -248,7 +248,7 @@
                        };
                };
 
-               PCIE0: pciex@10100000000 {
+               PCIE0: pcie@10100000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -288,7 +288,7 @@
                                0x0 0x0 0x0 0x4 &MPIC 48 0x2 /* int D */>;
                };
 
-               PCIE1: pciex@20100000000 {
+               PCIE1: pcie@20100000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -328,7 +328,7 @@
                                0x0 0x0 0x0 0x4 &MPIC 56 0x2 /* int D */>;
                };
 
-               PCIE2: pciex@18100000000 {
+               PCIE2: pcie@18100000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -368,7 +368,7 @@
                                0x0 0x0 0x0 0x4 &MPIC 64 0x2 /* int D */>;
                };
 
-               PCIE3: pciex@28100000000 {
+               PCIE3: pcie@28100000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/bluestone.dts b/arch/powerpc/boot/dts/bluestone.dts
index cc965a1816b69ff39dc8a863b157cf62ee4935f7..aa1ae94cd776a7ed1ce4abde7258c20b00a6887b 100644 (file)
--- a/arch/powerpc/boot/dts/bluestone.dts
+++ b/arch/powerpc/boot/dts/bluestone.dts
@@ -325,7 +325,7 @@
                        };
                };
 
-               PCIE0: pciex@d00000000 {
+               PCIE0: pcie@d00000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 0d6ac92d0f5e4a62d2e2292a02c6fbc6f8044f13..c5fbb08e0a6e144f35b48e5a6cb84112cb8b9848 100644 (file)
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -461,7 +461,7 @@
                        interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >;
                };
 
-               PCIE0: pciex@d00000000 {
+               PCIE0: pcie@d00000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -503,7 +503,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@d20000000 {
+               PCIE1: pcie@d20000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/currituck.dts b/arch/powerpc/boot/dts/currituck.dts
index b6d87b9c2cefb139f389e7c25204c4da2049452d..aea8af810106dda96c73e10bd257308b02518f6b 100644 (file)
--- a/arch/powerpc/boot/dts/currituck.dts
+++ b/arch/powerpc/boot/dts/currituck.dts
@@ -122,7 +122,7 @@
                        };
                };
 
-               PCIE0: pciex@10100000000 {              // 4xGBIF1
+               PCIE0: pcie@10100000000 {               // 4xGBIF1
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -160,7 +160,7 @@
                                0x0 0x0 0x0 0x4 &MPIC 49 0x2 /* int D */>;
                };
 
-               PCIE1: pciex@30100000000 {              // 4xGBIF0
+               PCIE1: pcie@30100000000 {               // 4xGBIF0
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -197,7 +197,7 @@
                                0x0 0x0 0x0 0x4 &MPIC 41 0x2 /* int D */>;
                };
 
-               PCIE2: pciex@38100000000 {              // 2xGBIF0
+               PCIE2: pcie@38100000000 {               // 2xGBIF0
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index a7a802f4ffddf98f7ba8775982d7a874016a8fcc..e84ff1afb58ca90c527ea56aa080d82ae73b808a 100644 (file)
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -489,7 +489,7 @@
                        interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >;
                };
 
-               PCIE0: pciex@d00000000 {
+               PCIE0: pcie@d00000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -531,7 +531,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@d20000000 {
+               PCIE1: pcie@d20000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index cb16dad43c9223a925b9f3c912b10ad636f547bb..f81ce8786d59742a7c97acf3305328f0e81a5a8c 100644 (file)
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -237,7 +237,7 @@
                        };
                };
 
-               PCIE0: pciex@a0000000 {
+               PCIE0: pcie@a0000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/icon.dts b/arch/powerpc/boot/dts/icon.dts
index 2e6e3a7b26040d0c1a84ebf4a3820ac5920d2b77..fbaa60b8f87a5c4d39fc9415b4b79ca87ed41c7a 100644 (file)
--- a/arch/powerpc/boot/dts/icon.dts
+++ b/arch/powerpc/boot/dts/icon.dts
@@ -315,7 +315,7 @@
                        interrupt-map = <0x0 0x0 0x0 0x0 &UIC1 19 0x8>;
                };
 
-               PCIE0: pciex@d00000000 {
+               PCIE0: pcie@d00000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -356,7 +356,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@d20000000 {
+               PCIE1: pcie@d20000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index 02629e119b875193e6137400ebf391c9b899613c..a8f353229fb7e372ef9f7106eea737f2808ad67a 100644 (file)
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -319,7 +319,7 @@
                        >;
                };
 
-               PCIE0: pciex@d00000000 {
+               PCIE0: pcie@d00000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -360,7 +360,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@d20000000 {
+               PCIE1: pcie@d20000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -401,7 +401,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>;
                };
 
-               PCIE2: pciex@d40000000 {
+               PCIE2: pcie@d40000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 2a3413221cc1f35150a36637449cb7b8f6ad763a..a709fb47a180d60d619d18b60b118d9f373ee679 100644 (file)
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -322,7 +322,7 @@
                        };
                };
 
-               PCIE0: pciex@a0000000 {
+               PCIE0: pcie@a0000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -363,7 +363,7 @@
                                0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@c0000000 {
+               PCIE1: pcie@c0000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index bf8fe16293924a15c5047c86cd924cb13cce8109..c473cd911bca078db7ea4cc34c5c51a447308ba8 100644 (file)
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -268,7 +268,7 @@
                        };
                };
 
-               PCIE0: pciex@a0000000 {
+               PCIE0: pcie@a0000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -309,7 +309,7 @@
                                0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@c0000000 {
+               PCIE1: pcie@c0000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;

diff --git a/arch/powerpc/boot/dts/redwood.dts b/arch/powerpc/boot/dts/redwood.dts
index f3e046fb49e28ea6548c872f0a2b43b90ea7d68c..f38035a1f4a15b350e605975a35b72f392ec8568 100644 (file)
--- a/arch/powerpc/boot/dts/redwood.dts
+++ b/arch/powerpc/boot/dts/redwood.dts
@@ -235,7 +235,7 @@
                                has-new-stacr-staopc;
                        };
                };
-               PCIE0: pciex@d00000000 {
+               PCIE0: pcie@d00000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -276,7 +276,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
                };
 
-               PCIE1: pciex@d20000000 {
+               PCIE1: pcie@d20000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;
@@ -317,7 +317,7 @@
                                0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>;
                };
 
-               PCIE2: pciex@d40000000 {
+               PCIE2: pcie@d40000000 {
                        device_type = "pci";
                        #interrupt-cells = <1>;
                        #size-cells = <2>;