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

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

arch/powerpc/boot/dts/akebono.dts

+4 −4
Original line number Diff line number Diff line
@@ -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>;

arch/powerpc/boot/dts/bluestone.dts

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ 
			};

		};



		PCIE0: pciex@d00000000 {

		PCIE0: pcie@d00000000 {

			device_type = "pci";

			#interrupt-cells = <1>;

			#size-cells = <2>;

arch/powerpc/boot/dts/canyonlands.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;

arch/powerpc/boot/dts/currituck.dts

+3 −3
Original line number Diff line number Diff line
@@ -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>;

arch/powerpc/boot/dts/glacier.dts

+2 −2
Original line number Diff line number Diff line
@@ -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>;