Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+25 -25
+4 -4
arch/powerpc/boot/dts/akebono.dts
··· 248 248 }; 249 249 }; 250 250 251 - PCIE0: pciex@10100000000 { 251 + PCIE0: pcie@10100000000 { 252 252 device_type = "pci"; 253 253 #interrupt-cells = <1>; 254 254 #size-cells = <2>; ··· 288 288 0x0 0x0 0x0 0x4 &MPIC 48 0x2 /* int D */>; 289 289 }; 290 290 291 - PCIE1: pciex@20100000000 { 291 + PCIE1: pcie@20100000000 { 292 292 device_type = "pci"; 293 293 #interrupt-cells = <1>; 294 294 #size-cells = <2>; ··· 328 328 0x0 0x0 0x0 0x4 &MPIC 56 0x2 /* int D */>; 329 329 }; 330 330 331 - PCIE2: pciex@18100000000 { 331 + PCIE2: pcie@18100000000 { 332 332 device_type = "pci"; 333 333 #interrupt-cells = <1>; 334 334 #size-cells = <2>; ··· 368 368 0x0 0x0 0x0 0x4 &MPIC 64 0x2 /* int D */>; 369 369 }; 370 370 371 - PCIE3: pciex@28100000000 { 371 + PCIE3: pcie@28100000000 { 372 372 device_type = "pci"; 373 373 #interrupt-cells = <1>; 374 374 #size-cells = <2>;
+1 -1
arch/powerpc/boot/dts/bluestone.dts
··· 325 325 }; 326 326 }; 327 327 328 - PCIE0: pciex@d00000000 { 328 + PCIE0: pcie@d00000000 { 329 329 device_type = "pci"; 330 330 #interrupt-cells = <1>; 331 331 #size-cells = <2>;
+2 -2
arch/powerpc/boot/dts/canyonlands.dts
··· 461 461 interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >; 462 462 }; 463 463 464 - PCIE0: pciex@d00000000 { 464 + PCIE0: pcie@d00000000 { 465 465 device_type = "pci"; 466 466 #interrupt-cells = <1>; 467 467 #size-cells = <2>; ··· 503 503 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 504 504 }; 505 505 506 - PCIE1: pciex@d20000000 { 506 + PCIE1: pcie@d20000000 { 507 507 device_type = "pci"; 508 508 #interrupt-cells = <1>; 509 509 #size-cells = <2>;
+3 -3
arch/powerpc/boot/dts/currituck.dts
··· 122 122 }; 123 123 }; 124 124 125 - PCIE0: pciex@10100000000 { // 4xGBIF1 125 + PCIE0: pcie@10100000000 { // 4xGBIF1 126 126 device_type = "pci"; 127 127 #interrupt-cells = <1>; 128 128 #size-cells = <2>; ··· 160 160 0x0 0x0 0x0 0x4 &MPIC 49 0x2 /* int D */>; 161 161 }; 162 162 163 - PCIE1: pciex@30100000000 { // 4xGBIF0 163 + PCIE1: pcie@30100000000 { // 4xGBIF0 164 164 device_type = "pci"; 165 165 #interrupt-cells = <1>; 166 166 #size-cells = <2>; ··· 197 197 0x0 0x0 0x0 0x4 &MPIC 41 0x2 /* int D */>; 198 198 }; 199 199 200 - PCIE2: pciex@38100000000 { // 2xGBIF0 200 + PCIE2: pcie@38100000000 { // 2xGBIF0 201 201 device_type = "pci"; 202 202 #interrupt-cells = <1>; 203 203 #size-cells = <2>;
+2 -2
arch/powerpc/boot/dts/glacier.dts
··· 489 489 interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >; 490 490 }; 491 491 492 - PCIE0: pciex@d00000000 { 492 + PCIE0: pcie@d00000000 { 493 493 device_type = "pci"; 494 494 #interrupt-cells = <1>; 495 495 #size-cells = <2>; ··· 531 531 0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>; 532 532 }; 533 533 534 - PCIE1: pciex@d20000000 { 534 + PCIE1: pcie@d20000000 { 535 535 device_type = "pci"; 536 536 #interrupt-cells = <1>; 537 537 #size-cells = <2>;
+1 -1
arch/powerpc/boot/dts/haleakala.dts
··· 237 237 }; 238 238 }; 239 239 240 - PCIE0: pciex@a0000000 { 240 + PCIE0: pcie@a0000000 { 241 241 device_type = "pci"; 242 242 #interrupt-cells = <1>; 243 243 #size-cells = <2>;
+2 -2
arch/powerpc/boot/dts/icon.dts
··· 315 315 interrupt-map = <0x0 0x0 0x0 0x0 &UIC1 19 0x8>; 316 316 }; 317 317 318 - PCIE0: pciex@d00000000 { 318 + PCIE0: pcie@d00000000 { 319 319 device_type = "pci"; 320 320 #interrupt-cells = <1>; 321 321 #size-cells = <2>; ··· 356 356 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 357 357 }; 358 358 359 - PCIE1: pciex@d20000000 { 359 + PCIE1: pcie@d20000000 { 360 360 device_type = "pci"; 361 361 #interrupt-cells = <1>; 362 362 #size-cells = <2>;
+3 -3
arch/powerpc/boot/dts/katmai.dts
··· 319 319 >; 320 320 }; 321 321 322 - PCIE0: pciex@d00000000 { 322 + PCIE0: pcie@d00000000 { 323 323 device_type = "pci"; 324 324 #interrupt-cells = <1>; 325 325 #size-cells = <2>; ··· 360 360 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 361 361 }; 362 362 363 - PCIE1: pciex@d20000000 { 363 + PCIE1: pcie@d20000000 { 364 364 device_type = "pci"; 365 365 #interrupt-cells = <1>; 366 366 #size-cells = <2>; ··· 401 401 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; 402 402 }; 403 403 404 - PCIE2: pciex@d40000000 { 404 + PCIE2: pcie@d40000000 { 405 405 device_type = "pci"; 406 406 #interrupt-cells = <1>; 407 407 #size-cells = <2>;
+2 -2
arch/powerpc/boot/dts/kilauea.dts
··· 322 322 }; 323 323 }; 324 324 325 - PCIE0: pciex@a0000000 { 325 + PCIE0: pcie@a0000000 { 326 326 device_type = "pci"; 327 327 #interrupt-cells = <1>; 328 328 #size-cells = <2>; ··· 363 363 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 364 364 }; 365 365 366 - PCIE1: pciex@c0000000 { 366 + PCIE1: pcie@c0000000 { 367 367 device_type = "pci"; 368 368 #interrupt-cells = <1>; 369 369 #size-cells = <2>;
+2 -2
arch/powerpc/boot/dts/makalu.dts
··· 268 268 }; 269 269 }; 270 270 271 - PCIE0: pciex@a0000000 { 271 + PCIE0: pcie@a0000000 { 272 272 device_type = "pci"; 273 273 #interrupt-cells = <1>; 274 274 #size-cells = <2>; ··· 309 309 0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>; 310 310 }; 311 311 312 - PCIE1: pciex@c0000000 { 312 + PCIE1: pcie@c0000000 { 313 313 device_type = "pci"; 314 314 #interrupt-cells = <1>; 315 315 #size-cells = <2>;
+3 -3
arch/powerpc/boot/dts/redwood.dts
··· 235 235 has-new-stacr-staopc; 236 236 }; 237 237 }; 238 - PCIE0: pciex@d00000000 { 238 + PCIE0: pcie@d00000000 { 239 239 device_type = "pci"; 240 240 #interrupt-cells = <1>; 241 241 #size-cells = <2>; ··· 276 276 0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>; 277 277 }; 278 278 279 - PCIE1: pciex@d20000000 { 279 + PCIE1: pcie@d20000000 { 280 280 device_type = "pci"; 281 281 #interrupt-cells = <1>; 282 282 #size-cells = <2>; ··· 317 317 0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>; 318 318 }; 319 319 320 - PCIE2: pciex@d40000000 { 320 + PCIE2: pcie@d40000000 { 321 321 device_type = "pci"; 322 322 #interrupt-cells = <1>; 323 323 #size-cells = <2>;