Commit 86bc917d authored by Michael Ellerman's avatar Michael Ellerman

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: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200623130320.405852-1-mpe@ellerman.id.au
parent df4232d9
...@@ -248,7 +248,7 @@ FPGA0: fpga@ebc00000 { ...@@ -248,7 +248,7 @@ FPGA0: fpga@ebc00000 {
}; };
}; };
PCIE0: pciex@10100000000 { PCIE0: pcie@10100000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -288,7 +288,7 @@ PCIE0: pciex@10100000000 { ...@@ -288,7 +288,7 @@ PCIE0: pciex@10100000000 {
0x0 0x0 0x0 0x4 &MPIC 48 0x2 /* int D */>; 0x0 0x0 0x0 0x4 &MPIC 48 0x2 /* int D */>;
}; };
PCIE1: pciex@20100000000 { PCIE1: pcie@20100000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -328,7 +328,7 @@ PCIE1: pciex@20100000000 { ...@@ -328,7 +328,7 @@ PCIE1: pciex@20100000000 {
0x0 0x0 0x0 0x4 &MPIC 56 0x2 /* int D */>; 0x0 0x0 0x0 0x4 &MPIC 56 0x2 /* int D */>;
}; };
PCIE2: pciex@18100000000 { PCIE2: pcie@18100000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -368,7 +368,7 @@ PCIE2: pciex@18100000000 { ...@@ -368,7 +368,7 @@ PCIE2: pciex@18100000000 {
0x0 0x0 0x0 0x4 &MPIC 64 0x2 /* int D */>; 0x0 0x0 0x0 0x4 &MPIC 64 0x2 /* int D */>;
}; };
PCIE3: pciex@28100000000 { PCIE3: pcie@28100000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -325,7 +325,7 @@ EMAC0: ethernet@ef600c00 { ...@@ -325,7 +325,7 @@ EMAC0: ethernet@ef600c00 {
}; };
}; };
PCIE0: pciex@d00000000 { PCIE0: pcie@d00000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -461,7 +461,7 @@ PCIX0: pci@c0ec00000 { ...@@ -461,7 +461,7 @@ PCIX0: pci@c0ec00000 {
interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >; interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >;
}; };
PCIE0: pciex@d00000000 { PCIE0: pcie@d00000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -503,7 +503,7 @@ PCIE0: pciex@d00000000 { ...@@ -503,7 +503,7 @@ PCIE0: pciex@d00000000 {
0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@d20000000 { PCIE1: pcie@d20000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -122,7 +122,7 @@ rtc@68 { ...@@ -122,7 +122,7 @@ rtc@68 {
}; };
}; };
PCIE0: pciex@10100000000 { // 4xGBIF1 PCIE0: pcie@10100000000 { // 4xGBIF1
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -160,7 +160,7 @@ PCIE0: pciex@10100000000 { // 4xGBIF1 ...@@ -160,7 +160,7 @@ PCIE0: pciex@10100000000 { // 4xGBIF1
0x0 0x0 0x0 0x4 &MPIC 49 0x2 /* int D */>; 0x0 0x0 0x0 0x4 &MPIC 49 0x2 /* int D */>;
}; };
PCIE1: pciex@30100000000 { // 4xGBIF0 PCIE1: pcie@30100000000 { // 4xGBIF0
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -197,7 +197,7 @@ PCIE1: pciex@30100000000 { // 4xGBIF0 ...@@ -197,7 +197,7 @@ PCIE1: pciex@30100000000 { // 4xGBIF0
0x0 0x0 0x0 0x4 &MPIC 41 0x2 /* int D */>; 0x0 0x0 0x0 0x4 &MPIC 41 0x2 /* int D */>;
}; };
PCIE2: pciex@38100000000 { // 2xGBIF0 PCIE2: pcie@38100000000 { // 2xGBIF0
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -489,7 +489,7 @@ PCIX0: pci@c0ec00000 { ...@@ -489,7 +489,7 @@ PCIX0: pci@c0ec00000 {
interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >; interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >;
}; };
PCIE0: pciex@d00000000 { PCIE0: pcie@d00000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -531,7 +531,7 @@ PCIE0: pciex@d00000000 { ...@@ -531,7 +531,7 @@ PCIE0: pciex@d00000000 {
0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@d20000000 { PCIE1: pcie@d20000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -237,7 +237,7 @@ EMAC0: ethernet@ef600900 { ...@@ -237,7 +237,7 @@ EMAC0: ethernet@ef600900 {
}; };
}; };
PCIE0: pciex@a0000000 { PCIE0: pcie@a0000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -315,7 +315,7 @@ PCIX0: pci@c0ec00000 { ...@@ -315,7 +315,7 @@ PCIX0: pci@c0ec00000 {
interrupt-map = <0x0 0x0 0x0 0x0 &UIC1 19 0x8>; interrupt-map = <0x0 0x0 0x0 0x0 &UIC1 19 0x8>;
}; };
PCIE0: pciex@d00000000 { PCIE0: pcie@d00000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -356,7 +356,7 @@ PCIE0: pciex@d00000000 { ...@@ -356,7 +356,7 @@ PCIE0: pciex@d00000000 {
0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@d20000000 { PCIE1: pcie@d20000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -319,7 +319,7 @@ PCIX0: pci@c0ec00000 { ...@@ -319,7 +319,7 @@ PCIX0: pci@c0ec00000 {
>; >;
}; };
PCIE0: pciex@d00000000 { PCIE0: pcie@d00000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -360,7 +360,7 @@ PCIE0: pciex@d00000000 { ...@@ -360,7 +360,7 @@ PCIE0: pciex@d00000000 {
0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@d20000000 { PCIE1: pcie@d20000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -401,7 +401,7 @@ PCIE1: pciex@d20000000 { ...@@ -401,7 +401,7 @@ PCIE1: pciex@d20000000 {
0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>;
}; };
PCIE2: pciex@d40000000 { PCIE2: pcie@d40000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -322,7 +322,7 @@ EMAC1: ethernet@ef600a00 { ...@@ -322,7 +322,7 @@ EMAC1: ethernet@ef600a00 {
}; };
}; };
PCIE0: pciex@a0000000 { PCIE0: pcie@a0000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -363,7 +363,7 @@ PCIE0: pciex@a0000000 { ...@@ -363,7 +363,7 @@ PCIE0: pciex@a0000000 {
0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@c0000000 { PCIE1: pcie@c0000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -268,7 +268,7 @@ EMAC1: ethernet@ef600a00 { ...@@ -268,7 +268,7 @@ EMAC1: ethernet@ef600a00 {
}; };
}; };
PCIE0: pciex@a0000000 { PCIE0: pcie@a0000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -309,7 +309,7 @@ PCIE0: pciex@a0000000 { ...@@ -309,7 +309,7 @@ PCIE0: pciex@a0000000 {
0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@c0000000 { PCIE1: pcie@c0000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -235,7 +235,7 @@ EMAC0: ethernet@ef600a00 { ...@@ -235,7 +235,7 @@ EMAC0: ethernet@ef600a00 {
has-new-stacr-staopc; has-new-stacr-staopc;
}; };
}; };
PCIE0: pciex@d00000000 { PCIE0: pcie@d00000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -276,7 +276,7 @@ PCIE0: pciex@d00000000 { ...@@ -276,7 +276,7 @@ PCIE0: pciex@d00000000 {
0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
}; };
PCIE1: pciex@d20000000 { PCIE1: pcie@d20000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
...@@ -317,7 +317,7 @@ PCIE1: pciex@d20000000 { ...@@ -317,7 +317,7 @@ PCIE1: pciex@d20000000 {
0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>;
}; };
PCIE2: pciex@d40000000 { PCIE2: pcie@d40000000 {
device_type = "pci"; device_type = "pci";
#interrupt-cells = <1>; #interrupt-cells = <1>;
#size-cells = <2>; #size-cells = <2>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment