All of lore.kernel.org
 help / color / mirror / Atom feed
diff for duplicates of <20240425213701.655540-13-eajames@linux.ibm.com>

diff --git a/a/1.txt b/N1/1.txt
index 5633a2a..0732709 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -25,85 +25,85 @@ index 000000000000..c3a0ecf12aa0
 +
 +	cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_HIGH>;
 +
-+	cfam at 0,0 {
++	cfam@0,0 {
 +		reg = <0 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <0>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam0_i2c0: i2c-bus at 0 {
++			cfam0_i2c0: i2c-bus@0 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0>;	/* OMI01 */
 +			};
 +
-+			cfam0_i2c1: i2c-bus at 1 {
++			cfam0_i2c1: i2c-bus@1 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <1>;	/* OMI23 */
 +			};
 +
-+			cfam0_i2c10: i2c-bus at a {
++			cfam0_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +			};
 +
-+			cfam0_i2c11: i2c-bus at b {
++			cfam0_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +			};
 +
-+			cfam0_i2c12: i2c-bus at c {
++			cfam0_i2c12: i2c-bus@c {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <12>;	/* OP4A */
 +			};
 +
-+			cfam0_i2c13: i2c-bus at d {
++			cfam0_i2c13: i2c-bus@d {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <13>;	/* OP4B */
 +			};
 +
-+			cfam0_i2c14: i2c-bus at e {
++			cfam0_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +			};
 +
-+			cfam0_i2c15: i2c-bus at f {
++			cfam0_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam0_spi0: spi at 0 {
++			cfam0_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -113,13 +113,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam0_spi1: spi at 20 {
++			cfam0_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -129,13 +129,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam0_spi2: spi at 40 {
++			cfam0_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -145,13 +145,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam0_spi3: spi at 60 {
++			cfam0_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -162,7 +162,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -178,7 +178,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		fsi_hub0: hub at 3400 {
++		fsi_hub0: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -188,85 +188,85 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&fsi_hub0 {
-+	cfam at 1,0 {
++	cfam@1,0 {
 +		reg = <1 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <1>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam1_i2c2: i2c-bus at 2 {
++			cfam1_i2c2: i2c-bus@2 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <2>;	/* OMI45 */
 +			};
 +
-+			cfam1_i2c3: i2c-bus at 3 {
++			cfam1_i2c3: i2c-bus@3 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <3>;	/* OMI67 */
 +			};
 +
-+			cfam1_i2c10: i2c-bus at a {
++			cfam1_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +			};
 +
-+			cfam1_i2c11: i2c-bus at b {
++			cfam1_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +			};
 +
-+			cfam1_i2c14: i2c-bus at e {
++			cfam1_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +			};
 +
-+			cfam1_i2c15: i2c-bus at f {
++			cfam1_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +			};
 +
-+			cfam1_i2c16: i2c-bus at 10 {
++			cfam1_i2c16: i2c-bus@10 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <16>;	/* OP6A */
 +			};
 +
-+			cfam1_i2c17: i2c-bus at 11 {
++			cfam1_i2c17: i2c-bus@11 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <17>;	/* OP6B */
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam1_spi0: spi at 0 {
++			cfam1_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -276,13 +276,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam1_spi1: spi at 20 {
++			cfam1_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -292,13 +292,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam1_spi2: spi at 40 {
++			cfam1_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -308,13 +308,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam1_spi3: spi at 60 {
++			cfam1_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -325,7 +325,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -341,7 +341,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		fsi_hub1: hub at 3400 {
++		fsi_hub1: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -351,85 +351,85 @@ index 000000000000..c3a0ecf12aa0
 +		};
 +	};
 +
-+	cfam at 2,0 {
++	cfam@2,0 {
 +		reg = <2 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <2>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam2_i2c0: i2c-bus at 0 {
++			cfam2_i2c0: i2c-bus@0 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0>;	/* OM01 */
 +			};
 +
-+			cfam2_i2c1: i2c-bus at 1 {
++			cfam2_i2c1: i2c-bus@1 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <1>;	/* OM23 */
 +			};
 +
-+			cfam2_i2c10: i2c-bus at a {
++			cfam2_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +			};
 +
-+			cfam2_i2c11: i2c-bus at b {
++			cfam2_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +			};
 +
-+			cfam2_i2c12: i2c-bus at c {
++			cfam2_i2c12: i2c-bus@c {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <12>;	/* OP4A */
 +			};
 +
-+			cfam2_i2c13: i2c-bus at d {
++			cfam2_i2c13: i2c-bus@d {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <13>;	/* OP4B */
 +			};
 +
-+			cfam2_i2c14: i2c-bus at e {
++			cfam2_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +			};
 +
-+			cfam2_i2c15: i2c-bus at f {
++			cfam2_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam2_spi0: spi at 0 {
++			cfam2_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -439,13 +439,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam2_spi1: spi at 20 {
++			cfam2_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -455,13 +455,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam2_spi2: spi at 40 {
++			cfam2_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -471,13 +471,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam2_spi3: spi at 60 {
++			cfam2_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -488,7 +488,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -504,7 +504,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		fsi_hub2: hub at 3400 {
++		fsi_hub2: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -514,85 +514,85 @@ index 000000000000..c3a0ecf12aa0
 +		};
 +	};
 +
-+	cfam at 3,0 {
++	cfam@3,0 {
 +		reg = <3 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <3>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam3_i2c2: i2c-bus at 2 {
++			cfam3_i2c2: i2c-bus@2 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <2>;	/* OM45 */
 +			};
 +
-+			cfam3_i2c3: i2c-bus at 3 {
++			cfam3_i2c3: i2c-bus@3 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <3>;	/* OM67 */
 +			};
 +
-+			cfam3_i2c10: i2c-bus at a {
++			cfam3_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +			};
 +
-+			cfam3_i2c11: i2c-bus at b {
++			cfam3_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +			};
 +
-+			cfam3_i2c14: i2c-bus at e {
++			cfam3_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +			};
 +
-+			cfam3_i2c15: i2c-bus at f {
++			cfam3_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +			};
 +
-+			cfam3_i2c16: i2c-bus at 10 {
++			cfam3_i2c16: i2c-bus@10 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <16>;	/* OP6A */
 +			};
 +
-+			cfam3_i2c17: i2c-bus at 11 {
++			cfam3_i2c17: i2c-bus@11 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <17>;	/* OP6B */
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam3_spi0: spi at 0 {
++			cfam3_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -602,13 +602,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam3_spi1: spi at 20 {
++			cfam3_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -618,13 +618,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam3_spi2: spi at 40 {
++			cfam3_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -634,13 +634,13 @@ index 000000000000..c3a0ecf12aa0
 +				};
 +			};
 +
-+			cfam3_spi3: spi at 60 {
++			cfam3_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -651,7 +651,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -667,7 +667,7 @@ index 000000000000..c3a0ecf12aa0
 +			};
 +		};
 +
-+		fsi_hub3: hub at 3400 {
++		fsi_hub3: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -679,24 +679,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c0 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom100: scom at 1000 {
++			scom100: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo100: sbefifo at 2400 {
++			sbefifo100: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -707,24 +707,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c1 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom101: scom at 1000 {
++			scom101: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo101: sbefifo at 2400 {
++			sbefifo101: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -735,24 +735,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c10 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom110: scom at 1000 {
++			scom110: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo110: sbefifo at 2400 {
++			sbefifo110: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -763,24 +763,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c11 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom111: scom at 1000 {
++			scom111: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo111: sbefifo at 2400 {
++			sbefifo111: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -791,24 +791,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c12 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom112: scom at 1000 {
++			scom112: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo112: sbefifo at 2400 {
++			sbefifo112: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -819,24 +819,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c13 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom113: scom at 1000 {
++			scom113: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo113: sbefifo at 2400 {
++			sbefifo113: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -847,24 +847,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c14 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom114: scom at 1000 {
++			scom114: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo114: sbefifo at 2400 {
++			sbefifo114: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -875,24 +875,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam0_i2c15 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom115: scom at 1000 {
++			scom115: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo115: sbefifo at 2400 {
++			sbefifo115: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -903,24 +903,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c2 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom202: scom at 1000 {
++			scom202: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo202: sbefifo at 2400 {
++			sbefifo202: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -931,24 +931,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c3 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom203: scom at 1000 {
++			scom203: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo203: sbefifo at 2400 {
++			sbefifo203: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -959,24 +959,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c10 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom210: scom at 1000 {
++			scom210: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo210: sbefifo at 2400 {
++			sbefifo210: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -987,24 +987,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c11 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom211: scom at 1000 {
++			scom211: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo211: sbefifo at 2400 {
++			sbefifo211: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1015,24 +1015,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c14 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom214: scom at 1000 {
++			scom214: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo214: sbefifo at 2400 {
++			sbefifo214: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1043,24 +1043,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c15 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom215: scom at 1000 {
++			scom215: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo215: sbefifo at 2400 {
++			sbefifo215: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1071,24 +1071,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c16 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom216: scom at 1000 {
++			scom216: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo216: sbefifo at 2400 {
++			sbefifo216: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1099,24 +1099,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam1_i2c17 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom217: scom at 1000 {
++			scom217: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo217: sbefifo at 2400 {
++			sbefifo217: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1127,24 +1127,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c0 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom300: scom at 1000 {
++			scom300: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo300: sbefifo at 2400 {
++			sbefifo300: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1155,24 +1155,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c1 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom301: scom at 1000 {
++			scom301: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo301: sbefifo at 2400 {
++			sbefifo301: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1183,24 +1183,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c10 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom310: scom at 1000 {
++			scom310: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo310: sbefifo at 2400 {
++			sbefifo310: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1211,24 +1211,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c11 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom311: scom at 1000 {
++			scom311: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo311: sbefifo at 2400 {
++			sbefifo311: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1239,24 +1239,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c12 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom312: scom at 1000 {
++			scom312: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo312: sbefifo at 2400 {
++			sbefifo312: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1267,24 +1267,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c13 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom313: scom at 1000 {
++			scom313: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo313: sbefifo at 2400 {
++			sbefifo313: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1295,24 +1295,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c14 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom314: scom at 1000 {
++			scom314: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo314: sbefifo at 2400 {
++			sbefifo314: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1323,24 +1323,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam2_i2c15 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom315: scom at 1000 {
++			scom315: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo315: sbefifo at 2400 {
++			sbefifo315: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1351,24 +1351,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c2 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom402: scom at 1000 {
++			scom402: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo402: sbefifo at 2400 {
++			sbefifo402: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1379,24 +1379,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c3 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom403: scom at 1000 {
++			scom403: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo403: sbefifo at 2400 {
++			sbefifo403: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1407,24 +1407,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c10 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom410: scom at 1000 {
++			scom410: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo410: sbefifo at 2400 {
++			sbefifo410: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1435,24 +1435,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c11 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom411: scom at 1000 {
++			scom411: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo411: sbefifo at 2400 {
++			sbefifo411: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1463,24 +1463,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c14 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom414: scom at 1000 {
++			scom414: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo414: sbefifo at 2400 {
++			sbefifo414: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1491,24 +1491,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c15 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom415: scom at 1000 {
++			scom415: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo415: sbefifo at 2400 {
++			sbefifo415: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1519,24 +1519,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c16 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom416: scom at 1000 {
++			scom416: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo416: sbefifo at 2400 {
++			sbefifo416: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
@@ -1547,24 +1547,24 @@ index 000000000000..c3a0ecf12aa0
 +};
 +
 +&cfam3_i2c17 {
-+	fsi-i2cr at 20 {
++	fsi-i2cr@20 {
 +		compatible = "ibm,i2cr-fsi-master";
 +		reg = <0x20>;
 +		#address-cells = <2>;
 +		#size-cells = <0>;
 +
-+		cfam at 0,0 {
++		cfam@0,0 {
 +			reg = <0 0>;
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +			chip-id = <0>;
 +
-+			scom417: scom at 1000 {
++			scom417: scom@1000 {
 +				compatible = "ibm,i2cr-scom";
 +				reg = <0x1000 0x400>;
 +			};
 +
-+			sbefifo417: sbefifo at 2400 {
++			sbefifo417: sbefifo@2400 {
 +				compatible = "ibm,odyssey-sbefifo";
 +				reg = <0x2400 0x400>;
 +				#address-cells = <1>;
diff --git a/a/content_digest b/N1/content_digest
index d64834e..199bbca 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,6 +3,18 @@
  "Subject\0[PATCH v3 12/14] ARM: dts: aspeed: Add IBM P11 FSI devices\0"
  "Date\0Thu, 25 Apr 2024 16:36:59 -0500\0"
  "To\0linux-aspeed@lists.ozlabs.org\0"
+ "Cc\0eajames@linux.ibm.com"
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  linux-fsi@lists.ozlabs.org
+  linux-spi@vger.kernel.org
+  linux-i2c@vger.kernel.org
+  lakshmiy@us.ibm.com
+  robh@kernel.org
+  krzk+dt@kernel.org
+  conor+dt@kernel.org
+  joel@jms.id.au
+ " andrew@codeconstruct.com.au\0"
  "\00:1\0"
  "b\0"
  "Add the P11 FSI device tree for use in upcoming BMC systems.\n"
@@ -32,85 +44,85 @@
  "+\n"
  "+\tcfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_HIGH>;\n"
  "+\n"
- "+\tcfam at 0,0 {\n"
+ "+\tcfam@0,0 {\n"
  "+\t\treg = <0 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam0_i2c0: i2c-bus at 0 {\n"
+ "+\t\t\tcfam0_i2c0: i2c-bus@0 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <0>;\t/* OMI01 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c1: i2c-bus at 1 {\n"
+ "+\t\t\tcfam0_i2c1: i2c-bus@1 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <1>;\t/* OMI23 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam0_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam0_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c12: i2c-bus at c {\n"
+ "+\t\t\tcfam0_i2c12: i2c-bus@c {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <12>;\t/* OP4A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c13: i2c-bus at d {\n"
+ "+\t\t\tcfam0_i2c13: i2c-bus@d {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <13>;\t/* OP4B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam0_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam0_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi2spi at 1c00 {\n"
+ "+\t\tfsi2spi@1c00 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2spi\";\n"
  "+\t\t\treg = <0x1c00 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam0_spi0: spi at 0 {\n"
+ "+\t\t\tcfam0_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -120,13 +132,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_spi1: spi at 20 {\n"
+ "+\t\t\tcfam0_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -136,13 +148,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_spi2: spi at 40 {\n"
+ "+\t\t\tcfam0_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -152,13 +164,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam0_spi3: spi at 60 {\n"
+ "+\t\t\tcfam0_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -169,7 +181,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -185,7 +197,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub0: hub at 3400 {\n"
+ "+\t\tfsi_hub0: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -195,85 +207,85 @@
  "+};\n"
  "+\n"
  "+&fsi_hub0 {\n"
- "+\tcfam at 1,0 {\n"
+ "+\tcfam@1,0 {\n"
  "+\t\treg = <1 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <1>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam1_i2c2: i2c-bus at 2 {\n"
+ "+\t\t\tcfam1_i2c2: i2c-bus@2 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <2>;\t/* OMI45 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c3: i2c-bus at 3 {\n"
+ "+\t\t\tcfam1_i2c3: i2c-bus@3 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <3>;\t/* OMI67 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam1_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam1_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam1_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam1_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c16: i2c-bus at 10 {\n"
+ "+\t\t\tcfam1_i2c16: i2c-bus@10 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <16>;\t/* OP6A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_i2c17: i2c-bus at 11 {\n"
+ "+\t\t\tcfam1_i2c17: i2c-bus@11 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <17>;\t/* OP6B */\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi2spi at 1c00 {\n"
+ "+\t\tfsi2spi@1c00 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2spi\";\n"
  "+\t\t\treg = <0x1c00 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam1_spi0: spi at 0 {\n"
+ "+\t\t\tcfam1_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -283,13 +295,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_spi1: spi at 20 {\n"
+ "+\t\t\tcfam1_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -299,13 +311,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_spi2: spi at 40 {\n"
+ "+\t\t\tcfam1_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -315,13 +327,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam1_spi3: spi at 60 {\n"
+ "+\t\t\tcfam1_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -332,7 +344,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -348,7 +360,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub1: hub at 3400 {\n"
+ "+\t\tfsi_hub1: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -358,85 +370,85 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tcfam at 2,0 {\n"
+ "+\tcfam@2,0 {\n"
  "+\t\treg = <2 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <2>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam2_i2c0: i2c-bus at 0 {\n"
+ "+\t\t\tcfam2_i2c0: i2c-bus@0 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <0>;\t/* OM01 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c1: i2c-bus at 1 {\n"
+ "+\t\t\tcfam2_i2c1: i2c-bus@1 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <1>;\t/* OM23 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam2_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam2_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c12: i2c-bus at c {\n"
+ "+\t\t\tcfam2_i2c12: i2c-bus@c {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <12>;\t/* OP4A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c13: i2c-bus at d {\n"
+ "+\t\t\tcfam2_i2c13: i2c-bus@d {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <13>;\t/* OP4B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam2_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam2_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi2spi at 1c00 {\n"
+ "+\t\tfsi2spi@1c00 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2spi\";\n"
  "+\t\t\treg = <0x1c00 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam2_spi0: spi at 0 {\n"
+ "+\t\t\tcfam2_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -446,13 +458,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_spi1: spi at 20 {\n"
+ "+\t\t\tcfam2_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -462,13 +474,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_spi2: spi at 40 {\n"
+ "+\t\t\tcfam2_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -478,13 +490,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam2_spi3: spi at 60 {\n"
+ "+\t\t\tcfam2_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -495,7 +507,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -511,7 +523,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub2: hub at 3400 {\n"
+ "+\t\tfsi_hub2: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -521,85 +533,85 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tcfam at 3,0 {\n"
+ "+\tcfam@3,0 {\n"
  "+\t\treg = <3 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <3>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam3_i2c2: i2c-bus at 2 {\n"
+ "+\t\t\tcfam3_i2c2: i2c-bus@2 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <2>;\t/* OM45 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c3: i2c-bus at 3 {\n"
+ "+\t\t\tcfam3_i2c3: i2c-bus@3 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <3>;\t/* OM67 */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam3_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam3_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam3_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam3_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c16: i2c-bus at 10 {\n"
+ "+\t\t\tcfam3_i2c16: i2c-bus@10 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <16>;\t/* OP6A */\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_i2c17: i2c-bus at 11 {\n"
+ "+\t\t\tcfam3_i2c17: i2c-bus@11 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <17>;\t/* OP6B */\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi2spi at 1c00 {\n"
+ "+\t\tfsi2spi@1c00 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2spi\";\n"
  "+\t\t\treg = <0x1c00 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam3_spi0: spi at 0 {\n"
+ "+\t\t\tcfam3_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -609,13 +621,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_spi1: spi at 20 {\n"
+ "+\t\t\tcfam3_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -625,13 +637,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_spi2: spi at 40 {\n"
+ "+\t\t\tcfam3_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -641,13 +653,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam3_spi3: spi at 60 {\n"
+ "+\t\t\tcfam3_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -658,7 +670,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -674,7 +686,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub3: hub at 3400 {\n"
+ "+\t\tfsi_hub3: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -686,24 +698,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c0 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom100: scom at 1000 {\n"
+ "+\t\t\tscom100: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo100: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo100: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -714,24 +726,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c1 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom101: scom at 1000 {\n"
+ "+\t\t\tscom101: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo101: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo101: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -742,24 +754,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c10 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom110: scom at 1000 {\n"
+ "+\t\t\tscom110: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo110: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo110: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -770,24 +782,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c11 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom111: scom at 1000 {\n"
+ "+\t\t\tscom111: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo111: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo111: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -798,24 +810,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c12 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom112: scom at 1000 {\n"
+ "+\t\t\tscom112: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo112: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo112: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -826,24 +838,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c13 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom113: scom at 1000 {\n"
+ "+\t\t\tscom113: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo113: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo113: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -854,24 +866,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c14 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom114: scom at 1000 {\n"
+ "+\t\t\tscom114: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo114: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo114: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -882,24 +894,24 @@
  "+};\n"
  "+\n"
  "+&cfam0_i2c15 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom115: scom at 1000 {\n"
+ "+\t\t\tscom115: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo115: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo115: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -910,24 +922,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c2 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom202: scom at 1000 {\n"
+ "+\t\t\tscom202: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo202: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo202: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -938,24 +950,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c3 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom203: scom at 1000 {\n"
+ "+\t\t\tscom203: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo203: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo203: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -966,24 +978,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c10 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom210: scom at 1000 {\n"
+ "+\t\t\tscom210: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo210: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo210: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -994,24 +1006,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c11 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom211: scom at 1000 {\n"
+ "+\t\t\tscom211: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo211: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo211: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1022,24 +1034,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c14 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom214: scom at 1000 {\n"
+ "+\t\t\tscom214: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo214: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo214: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1050,24 +1062,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c15 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom215: scom at 1000 {\n"
+ "+\t\t\tscom215: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo215: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo215: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1078,24 +1090,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c16 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom216: scom at 1000 {\n"
+ "+\t\t\tscom216: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo216: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo216: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1106,24 +1118,24 @@
  "+};\n"
  "+\n"
  "+&cfam1_i2c17 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom217: scom at 1000 {\n"
+ "+\t\t\tscom217: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo217: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo217: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1134,24 +1146,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c0 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom300: scom at 1000 {\n"
+ "+\t\t\tscom300: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo300: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo300: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1162,24 +1174,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c1 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom301: scom at 1000 {\n"
+ "+\t\t\tscom301: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo301: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo301: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1190,24 +1202,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c10 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom310: scom at 1000 {\n"
+ "+\t\t\tscom310: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo310: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo310: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1218,24 +1230,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c11 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom311: scom at 1000 {\n"
+ "+\t\t\tscom311: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo311: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo311: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1246,24 +1258,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c12 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom312: scom at 1000 {\n"
+ "+\t\t\tscom312: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo312: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo312: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1274,24 +1286,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c13 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom313: scom at 1000 {\n"
+ "+\t\t\tscom313: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo313: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo313: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1302,24 +1314,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c14 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom314: scom at 1000 {\n"
+ "+\t\t\tscom314: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo314: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo314: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1330,24 +1342,24 @@
  "+};\n"
  "+\n"
  "+&cfam2_i2c15 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom315: scom at 1000 {\n"
+ "+\t\t\tscom315: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo315: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo315: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1358,24 +1370,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c2 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom402: scom at 1000 {\n"
+ "+\t\t\tscom402: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo402: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo402: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1386,24 +1398,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c3 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom403: scom at 1000 {\n"
+ "+\t\t\tscom403: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo403: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo403: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1414,24 +1426,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c10 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom410: scom at 1000 {\n"
+ "+\t\t\tscom410: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo410: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo410: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1442,24 +1454,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c11 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom411: scom at 1000 {\n"
+ "+\t\t\tscom411: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo411: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo411: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1470,24 +1482,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c14 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom414: scom at 1000 {\n"
+ "+\t\t\tscom414: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo414: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo414: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1498,24 +1510,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c15 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom415: scom at 1000 {\n"
+ "+\t\t\tscom415: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo415: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo415: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1526,24 +1538,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c16 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom416: scom at 1000 {\n"
+ "+\t\t\tscom416: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo416: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo416: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1554,24 +1566,24 @@
  "+};\n"
  "+\n"
  "+&cfam3_i2c17 {\n"
- "+\tfsi-i2cr at 20 {\n"
+ "+\tfsi-i2cr@20 {\n"
  "+\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\treg = <0x20>;\n"
  "+\t\t#address-cells = <2>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\tcfam at 0,0 {\n"
+ "+\t\tcfam@0,0 {\n"
  "+\t\t\treg = <0 0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <1>;\n"
  "+\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\tscom417: scom at 1000 {\n"
+ "+\t\t\tscom417: scom@1000 {\n"
  "+\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tsbefifo417: sbefifo at 2400 {\n"
+ "+\t\t\tsbefifo417: sbefifo@2400 {\n"
  "+\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -1720,4 +1732,4 @@
  "-- \n"
  2.39.3
 
-4d97c1f4b448323634fcb361513e26098fc6255ffde1bf15077167e8f1ac73dd
+7f63b973173291897d5d129d7f90695a23e58c29b82008b20a44eb57beb77991

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.