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

diff --git a/a/1.txt b/N1/1.txt
index 5d40da3..ae4018e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -146,46 +146,46 @@ index 0000000000000..f980bf7f74823
 +	status = "okay";
 +	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>;
 +						};
@@ -193,29 +193,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -223,29 +223,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -253,29 +253,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -283,29 +283,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -313,29 +313,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -343,29 +343,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -373,29 +373,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -404,19 +404,19 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		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>;
@@ -426,13 +426,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -442,13 +442,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -458,13 +458,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -475,7 +475,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -489,7 +489,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		fsi_hub0: fsi at 3400 {
++		fsi_hub0: fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -499,46 +499,46 @@ index 0000000000000..f980bf7f74823
 +};
 +
 +&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>;
 +						};
@@ -546,29 +546,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -576,29 +576,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -606,29 +606,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -636,29 +636,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -666,29 +666,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -696,29 +696,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -726,29 +726,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -757,19 +757,19 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		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>;
@@ -779,13 +779,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -795,13 +795,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -811,13 +811,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -828,7 +828,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -842,7 +842,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -851,46 +851,46 @@ index 0000000000000..f980bf7f74823
 +		};
 +	};
 +
-+	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>;
 +						};
@@ -898,29 +898,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -928,29 +928,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -958,29 +958,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -988,29 +988,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1018,29 +1018,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1048,29 +1048,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1078,29 +1078,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1109,19 +1109,19 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		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>;
@@ -1131,13 +1131,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -1147,13 +1147,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -1163,13 +1163,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -1180,7 +1180,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -1194,7 +1194,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -1203,46 +1203,46 @@ index 0000000000000..f980bf7f74823
 +		};
 +	};
 +
-+	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>;
 +						};
@@ -1250,29 +1250,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1280,29 +1280,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1310,29 +1310,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1340,29 +1340,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1370,29 +1370,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1400,29 +1400,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1430,29 +1430,29 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -1461,19 +1461,19 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		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>;
@@ -1483,13 +1483,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -1499,13 +1499,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -1515,13 +1515,13 @@ index 0000000000000..f980bf7f74823
 +				};
 +			};
 +
-+			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>;
@@ -1532,7 +1532,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -1546,7 +1546,7 @@ index 0000000000000..f980bf7f74823
 +			};
 +		};
 +
-+		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 3f2fecb..7b46f4f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,6 +3,14 @@
  "Subject\0[PATCH v5 1/4] ARM: dts: aspeed: Add IBM P11 FSI devices\0"
  "Date\0Tue, 14 May 2024 16:35:07 -0500\0"
  "To\0linux-aspeed@lists.ozlabs.org\0"
+ "Cc\0devicetree@vger.kernel.org"
+  andrew@codeconstruct.com.au
+  joel@jms.id.au
+  conor+dt@kernel.org
+  eajames@linux.ibm.com
+  krzk+dt@kernel.org
+  robh@kernel.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Add the P11 FSI device tree for use in upcoming BMC systems.\n"
@@ -153,46 +161,46 @@
  "+\tstatus = \"okay\";\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"
@@ -200,29 +208,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"
@@ -230,29 +238,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"
@@ -260,29 +268,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"
@@ -290,29 +298,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"
@@ -320,29 +328,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"
@@ -350,29 +358,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"
@@ -380,29 +388,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"
@@ -411,19 +419,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"
@@ -433,13 +441,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"
@@ -449,13 +457,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"
@@ -465,13 +473,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"
@@ -482,7 +490,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"
@@ -496,7 +504,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"
@@ -506,46 +514,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"
@@ -553,29 +561,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"
@@ -583,29 +591,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"
@@ -613,29 +621,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"
@@ -643,29 +651,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"
@@ -673,29 +681,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"
@@ -703,29 +711,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"
@@ -733,29 +741,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"
@@ -764,19 +772,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"
@@ -786,13 +794,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"
@@ -802,13 +810,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"
@@ -818,13 +826,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"
@@ -835,7 +843,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"
@@ -849,7 +857,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"
@@ -858,46 +866,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"
@@ -905,29 +913,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"
@@ -935,29 +943,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"
@@ -965,29 +973,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"
@@ -995,29 +1003,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"
@@ -1025,29 +1033,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"
@@ -1055,29 +1063,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"
@@ -1085,29 +1093,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"
@@ -1116,19 +1124,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"
@@ -1138,13 +1146,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"
@@ -1154,13 +1162,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"
@@ -1170,13 +1178,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"
@@ -1187,7 +1195,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"
@@ -1201,7 +1209,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"
@@ -1210,46 +1218,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"
@@ -1257,29 +1265,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"
@@ -1287,29 +1295,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"
@@ -1317,29 +1325,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"
@@ -1347,29 +1355,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"
@@ -1377,29 +1385,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"
@@ -1407,29 +1415,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"
@@ -1437,29 +1445,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"
@@ -1468,19 +1476,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"
@@ -1490,13 +1498,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"
@@ -1506,13 +1514,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"
@@ -1522,13 +1530,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"
@@ -1539,7 +1547,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"
@@ -1553,7 +1561,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"
@@ -1565,4 +1573,4 @@
  "-- \n"
  2.39.3
 
-0d4b196f84540b7b220c78188c989cf4d8dbad5ba59b7d38f0de88a2d9544b50
+0444e782a42af6b3b2d82f11856ac3db190c84bc949ef30e818e437d4e35f306

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.