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

diff --git a/a/1.txt b/N1/1.txt
index 78f7c12..5514116 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -147,46 +147,46 @@ index 0000000000000..68c941a194b64
 +	bus-frequency = <100000000>;
 +	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,p9-scom";
 +			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 {
 +				reg = <0>;	/* OMI01 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -194,29 +194,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c1: i2c-bus at 1 {
++			cfam0_i2c1: i2c-bus@1 {
 +				reg = <1>;	/* OMI23 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -224,29 +224,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c10: i2c-bus at a {
++			cfam0_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -254,29 +254,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c11: i2c-bus at b {
++			cfam0_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -284,29 +284,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c12: i2c-bus at c {
++			cfam0_i2c12: i2c-bus@c {
 +				reg = <12>;	/* OP4A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -314,29 +314,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c13: i2c-bus at d {
++			cfam0_i2c13: i2c-bus@d {
 +				reg = <13>;	/* OP4B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -344,29 +344,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c14: i2c-bus at e {
++			cfam0_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -374,29 +374,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_i2c15: i2c-bus at f {
++			cfam0_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -405,19 +405,19 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -427,13 +427,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_spi1: spi at 20 {
++			cfam0_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -443,13 +443,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_spi2: spi at 40 {
++			cfam0_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -459,13 +459,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam0_spi3: spi at 60 {
++			cfam0_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -476,7 +476,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -490,7 +490,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		fsi_hub0: fsi at 3400 {
++		fsi_hub0: fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -500,46 +500,46 @@ index 0000000000000..68c941a194b64
 +};
 +
 +&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,p9-scom";
 +			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 {
 +				reg = <2>;	/* OMI45 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -547,29 +547,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c3: i2c-bus at 3 {
++			cfam1_i2c3: i2c-bus@3 {
 +				reg = <3>;	/* OMI67 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -577,29 +577,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c10: i2c-bus at a {
++			cfam1_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -607,29 +607,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c11: i2c-bus at b {
++			cfam1_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -637,29 +637,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c14: i2c-bus at e {
++			cfam1_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -667,29 +667,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c15: i2c-bus at f {
++			cfam1_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -697,29 +697,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c16: i2c-bus at 10 {
++			cfam1_i2c16: i2c-bus@10 {
 +				reg = <16>;	/* OP6A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -727,29 +727,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_i2c17: i2c-bus at 11 {
++			cfam1_i2c17: i2c-bus@11 {
 +				reg = <17>;	/* OP6B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -758,19 +758,19 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -780,13 +780,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_spi1: spi at 20 {
++			cfam1_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -796,13 +796,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_spi2: spi at 40 {
++			cfam1_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -812,13 +812,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam1_spi3: spi at 60 {
++			cfam1_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -829,7 +829,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -843,7 +843,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -852,46 +852,46 @@ index 0000000000000..68c941a194b64
 +		};
 +	};
 +
-+	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,p9-scom";
 +			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 {
 +				reg = <0>;	/* OM01 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -899,29 +899,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c1: i2c-bus at 1 {
++			cfam2_i2c1: i2c-bus@1 {
 +				reg = <1>;	/* OM23 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -929,29 +929,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c10: i2c-bus at a {
++			cfam2_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -959,29 +959,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c11: i2c-bus at b {
++			cfam2_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -989,29 +989,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c12: i2c-bus at c {
++			cfam2_i2c12: i2c-bus@c {
 +				reg = <12>;	/* OP4A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1019,29 +1019,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c13: i2c-bus at d {
++			cfam2_i2c13: i2c-bus@d {
 +				reg = <13>;	/* OP4B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1049,29 +1049,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c14: i2c-bus at e {
++			cfam2_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1079,29 +1079,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_i2c15: i2c-bus at f {
++			cfam2_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1110,19 +1110,19 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1132,13 +1132,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_spi1: spi at 20 {
++			cfam2_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1148,13 +1148,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_spi2: spi at 40 {
++			cfam2_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1164,13 +1164,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam2_spi3: spi at 60 {
++			cfam2_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1181,7 +1181,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -1195,7 +1195,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -1204,46 +1204,46 @@ index 0000000000000..68c941a194b64
 +		};
 +	};
 +
-+	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,p9-scom";
 +			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 {
 +				reg = <2>;	/* OM45 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1251,29 +1251,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c3: i2c-bus at 3 {
++			cfam3_i2c3: i2c-bus@3 {
 +				reg = <3>;	/* OM67 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1281,29 +1281,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c10: i2c-bus at a {
++			cfam3_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1311,29 +1311,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c11: i2c-bus at b {
++			cfam3_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1341,29 +1341,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c14: i2c-bus at e {
++			cfam3_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1371,29 +1371,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c15: i2c-bus at f {
++			cfam3_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1401,29 +1401,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c16: i2c-bus at 10 {
++			cfam3_i2c16: i2c-bus@10 {
 +				reg = <16>;	/* OP6A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1431,29 +1431,29 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_i2c17: i2c-bus at 11 {
++			cfam3_i2c17: i2c-bus@11 {
 +				reg = <17>;	/* OP6B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@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>;
 +						};
@@ -1462,19 +1462,19 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1484,13 +1484,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_spi1: spi at 20 {
++			cfam3_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1500,13 +1500,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_spi2: spi at 40 {
++			cfam3_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1516,13 +1516,13 @@ index 0000000000000..68c941a194b64
 +				};
 +			};
 +
-+			cfam3_spi3: spi at 60 {
++			cfam3_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -1533,7 +1533,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -1547,7 +1547,7 @@ index 0000000000000..68c941a194b64
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
diff --git a/a/content_digest b/N1/content_digest
index b061fdb..74ae56c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,22 @@
  "From\0Eddie James <eajames@linux.ibm.com>\0"
  "Subject\0[PATCH v6 13/20] ARM: dts: aspeed: Add IBM P11 FSI devices\0"
  "Date\0Wed, 22 May 2024 14:25:17 -0500\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0linux-fsi@lists.ozlabs.org\0"
+ "Cc\0eajames@linux.ibm.com"
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  ninad@linux.ibm.com
+  lakshmiy@us.ibm.com
+  linux-i2c@vger.kernel.org
+  linux-spi@vger.kernel.org
+  linux-aspeed@lists.ozlabs.org
+  andrew@codeconstruct.com.au
+  joel@jms.id.au
+  robh@kernel.org
+  conor+dt@kernel.org
+  krzk+dt@kernel.org
+  andi.shyti@kernel.org
+ " broonie@kernel.org\0"
  "\00:1\0"
  "b\0"
  "Add the P11 FSI device tree for use in upcoming BMC systems.\n"
@@ -154,46 +169,46 @@
  "+\tbus-frequency = <100000000>;\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,p9-scom\";\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\treg = <0>;\t/* OMI01 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom100: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom100: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo100: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo100: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -201,29 +216,29 @@
  "+\t\t\t\t};\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\treg = <1>;\t/* OMI23 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom101: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom101: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo101: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo101: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -231,29 +246,29 @@
  "+\t\t\t\t};\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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom110: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom110: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo110: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo110: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -261,29 +276,29 @@
  "+\t\t\t\t};\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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom111: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom111: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo111: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo111: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -291,29 +306,29 @@
  "+\t\t\t\t};\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\treg = <12>;\t/* OP4A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom112: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom112: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo112: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo112: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -321,29 +336,29 @@
  "+\t\t\t\t};\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\treg = <13>;\t/* OP4B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom113: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom113: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo113: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo113: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -351,29 +366,29 @@
  "+\t\t\t\t};\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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom114: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom114: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo114: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo114: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -381,29 +396,29 @@
  "+\t\t\t\t};\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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom115: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom115: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo115: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo115: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -412,19 +427,19 @@
  "+\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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -434,13 +449,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -450,13 +465,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -466,13 +481,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -483,7 +498,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"
  "+\n"
@@ -497,7 +512,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub0: fsi at 3400 {\n"
+ "+\t\tfsi_hub0: fsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -507,46 +522,46 @@
  "+};\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,p9-scom\";\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\treg = <2>;\t/* OMI45 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom202: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom202: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo202: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo202: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -554,29 +569,29 @@
  "+\t\t\t\t};\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\treg = <3>;\t/* OMI67 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom203: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom203: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo203: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo203: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -584,29 +599,29 @@
  "+\t\t\t\t};\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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom210: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom210: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo210: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo210: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -614,29 +629,29 @@
  "+\t\t\t\t};\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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom211: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom211: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo211: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo211: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -644,29 +659,29 @@
  "+\t\t\t\t};\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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom214: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom214: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo214: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo214: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -674,29 +689,29 @@
  "+\t\t\t\t};\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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom215: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom215: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo215: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo215: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -704,29 +719,29 @@
  "+\t\t\t\t};\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\treg = <16>;\t/* OP6A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom216: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom216: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo216: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo216: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -734,29 +749,29 @@
  "+\t\t\t\t};\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\treg = <17>;\t/* OP6B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom217: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom217: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo217: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo217: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -765,19 +780,19 @@
  "+\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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -787,13 +802,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -803,13 +818,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -819,13 +834,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -836,7 +851,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"
  "+\n"
@@ -850,7 +865,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -859,46 +874,46 @@
  "+\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,p9-scom\";\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\treg = <0>;\t/* OM01 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom300: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom300: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo300: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo300: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -906,29 +921,29 @@
  "+\t\t\t\t};\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\treg = <1>;\t/* OM23 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom301: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom301: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo301: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo301: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -936,29 +951,29 @@
  "+\t\t\t\t};\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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom310: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom310: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo310: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo310: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -966,29 +981,29 @@
  "+\t\t\t\t};\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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom311: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom311: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo311: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo311: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -996,29 +1011,29 @@
  "+\t\t\t\t};\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\treg = <12>;\t/* OP4A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom312: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom312: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo312: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo312: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1026,29 +1041,29 @@
  "+\t\t\t\t};\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\treg = <13>;\t/* OP4B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom313: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom313: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo313: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo313: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1056,29 +1071,29 @@
  "+\t\t\t\t};\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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom314: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom314: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo314: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo314: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1086,29 +1101,29 @@
  "+\t\t\t\t};\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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom315: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom315: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo315: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo315: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1117,19 +1132,19 @@
  "+\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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1139,13 +1154,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1155,13 +1170,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1171,13 +1186,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1188,7 +1203,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"
  "+\n"
@@ -1202,7 +1217,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -1211,46 +1226,46 @@
  "+\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,p9-scom\";\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\treg = <2>;\t/* OM45 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom402: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom402: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo402: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo402: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1258,29 +1273,29 @@
  "+\t\t\t\t};\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\treg = <3>;\t/* OM67 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom403: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom403: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo403: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo403: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1288,29 +1303,29 @@
  "+\t\t\t\t};\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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom410: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom410: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo410: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo410: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1318,29 +1333,29 @@
  "+\t\t\t\t};\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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom411: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom411: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo411: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo411: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1348,29 +1363,29 @@
  "+\t\t\t\t};\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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom414: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom414: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo414: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo414: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1378,29 +1393,29 @@
  "+\t\t\t\t};\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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom415: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom415: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo415: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo415: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1408,29 +1423,29 @@
  "+\t\t\t\t};\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\treg = <16>;\t/* OP6A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom416: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom416: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo416: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo416: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1438,29 +1453,29 @@
  "+\t\t\t\t};\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\treg = <17>;\t/* OP6B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\tscom417: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom417: scom@1000 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,i2cr-scom\";\n"
  "+\t\t\t\t\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\t\t\tsbefifo417: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo417: sbefifo@2400 {\n"
  "+\t\t\t\t\t\t\tcompatible = \"ibm,odyssey-sbefifo\";\n"
  "+\t\t\t\t\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t\t\t\t};\n"
@@ -1469,19 +1484,19 @@
  "+\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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1491,13 +1506,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1507,13 +1522,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1523,13 +1538,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,spi-fsi\";\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\taddress-width = <24>;\n"
@@ -1540,7 +1555,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"
  "+\n"
@@ -1554,7 +1569,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -1566,4 +1581,4 @@
  "-- \n"
  2.39.3
 
-f8c9be617d93aaf65069317f697b10ba556a3f98dbfd427dc93f3196a56f86fb
+c087d0ff5dc95f6c1981097eacd31fc3d3e1ebc30e4321e776a71ee1461416d2

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.