Skip to contentSkip to conversation

powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'

PATCH Applied Rob Herring 3 participants 6 messages Feb 28, 2018 – Mar 20, 2018

Subsystems (2)
lore
Share & tools
lore

Rob Herring

author maintainer
#0 lore raw

PATCH 1/1 powerpc: dts: replace 'linux,stdout-path' with 'stdout-path'

'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'.

Cc Mark Rutland <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>
---
 arch/powerpc/boot/dts/acadia.dts           | 2 +-
 arch/powerpc/boot/dts/adder875-redboot.dts | 2 +-
 arch/powerpc/boot/dts/adder875-uboot.dts   | 2 +-
 arch/powerpc/boot/dts/akebono.dts          | 2 +-
 arch/powerpc/boot/dts/amigaone.dts         | 2 +-
 arch/powerpc/boot/dts/asp834x-redboot.dts  | 2 +-
 arch/powerpc/boot/dts/bamboo.dts           | 2 +-
 arch/powerpc/boot/dts/c2k.dts              | 2 +-
 arch/powerpc/boot/dts/currituck.dts        | 2 +-
 arch/powerpc/boot/dts/ebony.dts            | 2 +-
 arch/powerpc/boot/dts/eiger.dts            | 2 +-
 arch/powerpc/boot/dts/ep405.dts            | 2 +-
 arch/powerpc/boot/dts/fsl/mvme7100.dts     | 2 +-
 arch/powerpc/boot/dts/fsp2.dts             | 2 +-
 arch/powerpc/boot/dts/holly.dts            | 2 +-
 arch/powerpc/boot/dts/hotfoot.dts          | 2 +-
 arch/powerpc/boot/dts/icon.dts             | 2 +-
 arch/powerpc/boot/dts/iss4xx-mpic.dts      | 2 +-
 arch/powerpc/boot/dts/iss4xx.dts           | 2 +-
 arch/powerpc/boot/dts/katmai.dts           | 2 +-
 arch/powerpc/boot/dts/klondike.dts         | 2 +-
 arch/powerpc/boot/dts/ksi8560.dts          | 2 +-
 arch/powerpc/boot/dts/media5200.dts        | 2 +-
 arch/powerpc/boot/dts/mpc8272ads.dts       | 2 +-
 arch/powerpc/boot/dts/mpc866ads.dts        | 2 +-
 arch/powerpc/boot/dts/mpc885ads.dts        | 2 +-
 arch/powerpc/boot/dts/mvme5100.dts         | 2 +-
 arch/powerpc/boot/dts/obs600.dts           | 2 +-
 arch/powerpc/boot/dts/pq2fads.dts          | 2 +-
 arch/powerpc/boot/dts/rainier.dts          | 2 +-
 arch/powerpc/boot/dts/redwood.dts          | 2 +-
 arch/powerpc/boot/dts/sam440ep.dts         | 2 +-
 arch/powerpc/boot/dts/sequoia.dts          | 2 +-
 arch/powerpc/boot/dts/storcenter.dts       | 2 +-
 arch/powerpc/boot/dts/taishan.dts          | 2 +-
 arch/powerpc/boot/dts/virtex440-ml507.dts  | 2 +-
 arch/powerpc/boot/dts/virtex440-ml510.dts  | 2 +-
 arch/powerpc/boot/dts/walnut.dts           | 2 +-
 arch/powerpc/boot/dts/warp.dts             | 2 +-
 arch/powerpc/boot/dts/xpedite5200_xmon.dts | 2 +-
 arch/powerpc/boot/dts/yosemite.dts         | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)
arch/powerpc/boot/dts/acadia.dts +1 -1
index 86266159521e..deb52e41ab84 100644
@@ -219,6 +219,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
arch/powerpc/boot/dts/adder875-redboot.dts +1 -1
index 083984720b2f..7f5ff4168482 100644
@@ -178,6 +178,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = &console;
+		stdout-path = &console;
 	};
 };
arch/powerpc/boot/dts/adder875-uboot.dts +1 -1
index e4554caf8f8d..bd9f33c57737 100644
@@ -177,6 +177,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = &console;
+		stdout-path = &console;
 	};
 };
arch/powerpc/boot/dts/akebono.dts +1 -1
index 746779202a12..8a7a10139bc9 100644
@@ -410,6 +410,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = &UART0;
+		stdout-path = &UART0;
 	};
 };
arch/powerpc/boot/dts/amigaone.dts +1 -1
index 49ac36b16dd7..712430155b99 100644
@@ -168,6 +168,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/pci@80000000/isa@7/serial@3f8";
+		stdout-path = "/pci@80000000/isa@7/serial@3f8";
 	};
 };
arch/powerpc/boot/dts/asp834x-redboot.dts +1 -1
index 9198745f45fb..e987b5af9326 100644
@@ -304,7 +304,7 @@
 
 	chosen {
 		bootargs = "console=ttyS0,38400 root=/dev/mtdblock3 rootfstype=jffs2";
-		linux,stdout-path = &serial0;
+		stdout-path = &serial0;
 	};
 
 };
arch/powerpc/boot/dts/bamboo.dts +1 -1
index aa68911f6560..538e42b1120d 100644
@@ -295,6 +295,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
arch/powerpc/boot/dts/c2k.dts +1 -1
index 27f169e3ade9..c5beb72d18b7 100644
@@ -361,6 +361,6 @@
 		};
 	};
 	chosen {
-		linux,stdout-path = &MPSC0;
+		stdout-path = &MPSC0;
 	};
 };
arch/powerpc/boot/dts/currituck.dts +1 -1
index f2ad5815f08d..a04a4fcfde63 100644
@@ -237,6 +237,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = &UART0;
+		stdout-path = &UART0;
 	};
 };
arch/powerpc/boot/dts/ebony.dts +1 -1
index ec2d142291b4..5d11e6ea7405 100644
@@ -332,6 +332,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@40000200";
+		stdout-path = "/plb/opb/serial@40000200";
 	};
 };
arch/powerpc/boot/dts/eiger.dts +1 -1
index 48bcf7187924..7a1231d9d6f0 100644
@@ -421,7 +421,7 @@
 
 	};
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600200";
+		stdout-path = "/plb/opb/serial@ef600200";
 	};
 
 };
arch/powerpc/boot/dts/ep405.dts +1 -1
index 53ef06cc2134..4ac9c5ab6e6b 100644
@@ -225,6 +225,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
arch/powerpc/boot/dts/fsl/mvme7100.dts +1 -1
index e2d306ad37a6..721cb53758ae 100644
@@ -146,7 +146,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = &serial0;
+		stdout-path = &serial0;
 	};
 };
 
arch/powerpc/boot/dts/fsp2.dts +1 -1
index 6560283c5aec..9311b86b1bd9 100644
@@ -607,7 +607,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@b0020000";
+		stdout-path = "/plb/opb/serial@b0020000";
 		bootargs = "console=ttyS0,115200 rw log_buf_len=32768 debug";
 	};
 };
arch/powerpc/boot/dts/holly.dts +1 -1
index 43e6f0c8e449..02bd304c7d38 100644
@@ -191,6 +191,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/tsi109@c0000000/serial@7808";
+		stdout-path = "/tsi109@c0000000/serial@7808";
 	};
 };
arch/powerpc/boot/dts/hotfoot.dts +1 -1
index 71d3bb4931dc..b93bf2d9dd5b 100644
@@ -291,6 +291,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = &UART0;
+		stdout-path = &UART0;
 	};
 };
arch/powerpc/boot/dts/icon.dts +1 -1
index 9c94fd737f7c..2e6e3a7b2604 100644
@@ -442,6 +442,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@f0000200";
+		stdout-path = "/plb/opb/serial@f0000200";
 	};
 };
arch/powerpc/boot/dts/iss4xx-mpic.dts +1 -1
index 23e9d9b7e400..f7063198b2dc 100644
@@ -150,6 +150,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@40000200";
+		stdout-path = "/plb/opb/serial@40000200";
 	};
 };
arch/powerpc/boot/dts/iss4xx.dts +1 -1
index 4ff6555c866d..5533aff25e41 100644
@@ -111,6 +111,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@40000200";
+		stdout-path = "/plb/opb/serial@40000200";
 	};
 };
arch/powerpc/boot/dts/katmai.dts +1 -1
index f913dbe25d35..02629e119b87 100644
@@ -505,6 +505,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@f0000200";
+		stdout-path = "/plb/opb/serial@f0000200";
 	};
 };
arch/powerpc/boot/dts/klondike.dts +1 -1
index 8c9429033618..d9613b7b945f 100644
@@ -222,6 +222,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@50001000";
+		stdout-path = "/plb/opb/serial@50001000";
 	};
 };
arch/powerpc/boot/dts/ksi8560.dts +1 -1
index 5d68236e7c3c..fe6c17c8812a 100644
@@ -339,6 +339,6 @@
 
 
 	chosen {
-		linux,stdout-path = "/soc/cpm/serial@91a00";
+		stdout-path = "/soc/cpm/serial@91a00";
 	};
 };
arch/powerpc/boot/dts/media5200.dts +1 -1
index b5413cb85f13..843f156a49c4 100644
@@ -25,7 +25,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = &console;
+		stdout-path = &console;
 	};
 
 	cpus {
arch/powerpc/boot/dts/mpc8272ads.dts +1 -1
index 6d2cddf64cfd..98282c18d989 100644
@@ -262,6 +262,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/soc/cpm/serial@11a00";
+		stdout-path = "/soc/cpm/serial@11a00";
 	};
 };
arch/powerpc/boot/dts/mpc866ads.dts +1 -1
index 34c1f48b1a09..4443fac3f576 100644
@@ -185,6 +185,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/soc/cpm/serial@a80";
+		stdout-path = "/soc/cpm/serial@a80";
 	};
 };
arch/powerpc/boot/dts/mpc885ads.dts +1 -1
index 4e93bd961e0f..5b037f51741d 100644
@@ -227,6 +227,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/soc/cpm/serial@a80";
+		stdout-path = "/soc/cpm/serial@a80";
 	};
 };
arch/powerpc/boot/dts/mvme5100.dts +1 -1
index 1ecb341a232a..a7eb6d25903d 100644
@@ -179,7 +179,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = &serial0;
+		stdout-path = &serial0;
         };
 
 };
arch/powerpc/boot/dts/obs600.dts +1 -1
index 18e7d79ee4c3..d10b0411809b 100644
@@ -309,6 +309,6 @@
 		};
 	};
         chosen {
-                linux,stdout-path = "/plb/opb/serial@ef600200";
+                stdout-path = "/plb/opb/serial@ef600200";
         };
 };
arch/powerpc/boot/dts/pq2fads.dts +1 -1
index 0c525ff0c257..a477615e3468 100644
@@ -242,6 +242,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/soc/cpm/serial@11a00";
+		stdout-path = "/soc/cpm/serial@11a00";
 	};
 };
arch/powerpc/boot/dts/rainier.dts +1 -1
index 9684c80e4093..e59829cff556 100644
@@ -344,7 +344,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 		bootargs = "console=ttyS0,115200";
 	};
 };
arch/powerpc/boot/dts/redwood.dts +1 -1
index d86a3a498118..f3e046fb49e2 100644
@@ -381,7 +381,7 @@
 
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600200";
+		stdout-path = "/plb/opb/serial@ef600200";
 	};
 
 };
arch/powerpc/boot/dts/sam440ep.dts +1 -1
index 088361cf4636..7d15f18e1180 100644
@@ -288,6 +288,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
arch/powerpc/boot/dts/sequoia.dts +1 -1
index e41b88a5eaee..60d211da9593 100644
@@ -406,7 +406,7 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 		bootargs = "console=ttyS0,115200";
 	};
 };
arch/powerpc/boot/dts/storcenter.dts +1 -1
index 2a555738517e..99f6f544dc5f 100644
@@ -137,6 +137,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = &serial0;
+		stdout-path = &serial0;
 	};
 };
arch/powerpc/boot/dts/taishan.dts +1 -1
index 1657ad0bf8a6..803f1bff7fa8 100644
@@ -422,6 +422,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@40000300";
+		stdout-path = "/plb/opb/serial@40000300";
 	};
 };
arch/powerpc/boot/dts/virtex440-ml507.dts +1 -1
index 391a4e299783..66f1c6312de6 100644
@@ -32,7 +32,7 @@
 	} ;
 	chosen {
 		bootargs = "console=ttyS0 root=/dev/ram";
-		linux,stdout-path = &RS232_Uart_1;
+		stdout-path = &RS232_Uart_1;
 	} ;
 	cpus {
 		#address-cells = <1>;
arch/powerpc/boot/dts/virtex440-ml510.dts +1 -1
index 81201d3907e2..3b736ca26ddc 100644
@@ -26,7 +26,7 @@
 	} ;
 	chosen {
 		bootargs = "console=ttyS0 root=/dev/ram";
-		linux,stdout-path = "/plb@0/serial@83e00000";
+		stdout-path = "/plb@0/serial@83e00000";
 	} ;
 	cpus {
 		#address-cells = <1>;
arch/powerpc/boot/dts/walnut.dts +1 -1
index 4a9f726ada13..0872862c9363 100644
@@ -241,6 +241,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
arch/powerpc/boot/dts/warp.dts +1 -1
index ea9053ef4819..b4f32740870e 100644
@@ -304,6 +304,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
arch/powerpc/boot/dts/xpedite5200_xmon.dts +1 -1
index 646acfbef0dd..d5e14421c39a 100644
@@ -503,6 +503,6 @@
 
 	/* Needed for dtbImage boot wrapper compatibility */
 	chosen {
-		linux,stdout-path = &serial0;
+		stdout-path = &serial0;
 	};
 };
arch/powerpc/boot/dts/yosemite.dts +1 -1
index 30bb4753577a..56508785ce13 100644
@@ -327,6 +327,6 @@
 	};
 
 	chosen {
-		linux,stdout-path = "/plb/opb/serial@ef600300";
+		stdout-path = "/plb/opb/serial@ef600300";
 	};
 };
Signature · 1 line
2.14.1
#1 lore raw
Quoted 3 lines · Rob Herring

'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'.

This patch looks OK.

But please remember that not all device trees are generated with dtc, we still have machines in the wild that have firmware which use "linux,stdout-path" and may never be updated.

cheers

author maintainer
#2 lore raw
Quoted 11 lines · Michael Ellerman
Quoted 3 lines · Rob Herring

'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'.

This patch looks OK.

But please remember that not all device trees are generated with dtc, we still have machines in the wild that have firmware which use "linux,stdout-path" and may never be updated.

Absolutely. The core code still supports both.

The only scenario I could come up with is someone has an old bootloader that only understands linux,stdout-path and modifies it and they update the dtb. We may end up with both properties with stdout-path taking preference.

Rob

#3 lore raw
Quoted 7 lines · Rob Herring
Quoted 6 lines · Michael Ellerman
Quoted 3 lines · Rob Herring

'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'.

Quoted 7 lines
Quoted 5 lines

This patch looks OK.

But please remember that not all device trees are generated with dtc, we still have machines in the wild that have firmware which use "linux,stdout-path" and may never be updated.

Absolutely. The core code still supports both.

Phew ;)

It has prompted us to look at various firmware pieces and some we can update to start using the new property or both. It's still going to be many years before we can actually remove support for linux,stdout-path though.

Quoted 4 lines

The only scenario I could come up with is someone has an old bootloader that only understands linux,stdout-path and modifies it and they update the dtb. We may end up with both properties with stdout-path taking preference.

Yeah I think this is fairly safe, and in the unlikely case it does cause a problem we can always back the change out for an individual file.

cheers

#4 lore raw
In reply to Rob Herring
Quoted 10 lines · Rob Herring

'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'.

Cc Mark Rutland <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/d79a02b3e03b103d84536fb19ae7a7

cheers

#5 lore raw
In reply to Rob Herring
Quoted 10 lines · Rob Herring

'linux,stdout-path' has been deprecated for some time in favor of 'stdout-path'. Now dtc will warn on occurrences of 'linux,stdout-path'. Search and replace all the of occurrences with 'stdout-path'.

Cc Mark Rutland <[email protected]>
Cc Benjamin Herrenschmidt <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Michael Ellerman <[email protected]>

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/78e5dfea84dc15d69940831b3981b3

cheers