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

diff --git a/a/1.txt b/N1/1.txt
index 67143b5..3bb5b0e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -201,7 +201,7 @@ index 000000000000..dc41fa815761
 +		bootargs = "console=ttyS4,115200n8";
 +	};
 +
-+	memory at 80000000 {
++	memory@80000000 {
 +		device_type = "memory";
 +		reg = <0x80000000 0x40000000>;
 +	};
@@ -211,12 +211,12 @@ index 000000000000..dc41fa815761
 +		#size-cells = <1>;
 +		ranges;
 +
-+		event_log: tcg_event_log at b3d00000 {
++		event_log: tcg_event_log@b3d00000 {
 +			no-map;
 +			reg = <0xb3d00000 0x100000>;
 +		};
 +
-+		ramoops at b3e00000 {
++		ramoops@b3e00000 {
 +			compatible = "ramoops";
 +			reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */
 +			record-size = <0x8000>;
@@ -227,13 +227,13 @@ index 000000000000..dc41fa815761
 +		};
 +
 +		/* LPC FW cycle bridge region requires natural alignment */
-+		flash_memory: region at b4000000 {
++		flash_memory: region@b4000000 {
 +			no-map;
 +			reg = <0xb4000000 0x04000000>; /* 64M */
 +		};
 +
 +		/* VGA region is dictated by hardware strapping */
-+		vga_memory: region at bf000000 {
++		vga_memory: region@bf000000 {
 +			no-map;
 +			compatible = "shared-dma-pool";
 +			reg = <0xbf000000 0x01000000>; /* 16M */
@@ -353,12 +353,12 @@ index 000000000000..dc41fa815761
 +&i2c0 {
 +	status = "okay";
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c64";
 +		reg = <0x51>;
 +	};
 +
-+	pca1: pca9552 at 62 {
++	pca1: pca9552@62 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x62>;
 +		#address-cells = <1>;
@@ -397,27 +397,27 @@ index 000000000000..dc41fa815761
 +&i2c3 {
 +	status = "okay";
 +
-+	eeprom at 54 {
++	eeprom@54 {
 +		compatible = "atmel,24c128";
 +		reg = <0x54>;
 +	};
 +
-+	power-supply at 68 {
++	power-supply@68 {
 +		compatible = "ibm,cffps";
 +		reg = <0x68>;
 +	};
 +
-+	power-supply at 69 {
++	power-supply@69 {
 +		compatible = "ibm,cffps";
 +		reg = <0x69>;
 +	};
 +
-+	power-supply at 6b {
++	power-supply@6b {
 +		compatible = "ibm,cffps";
 +		reg = <0x6b>;
 +	};
 +
-+	power-supply at 6d {
++	power-supply@6d {
 +		compatible = "ibm,cffps";
 +		reg = <0x6d>;
 +	};
@@ -426,7 +426,7 @@ index 000000000000..dc41fa815761
 +&i2c4 {
 +	status = "okay";
 +
-+	pca2: pca9552 at 65 {
++	pca2: pca9552@65 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x65>;
 +		#address-cells = <1>;
@@ -448,7 +448,7 @@ index 000000000000..dc41fa815761
 +			"expander-cable-card5";
 +	};
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
@@ -456,16 +456,16 @@ index 000000000000..dc41fa815761
 +		status = "okay";
 +		i2c-mux-idle-disconnect;
 +
-+		i2c4mux0chn0: i2c at 0 {
++		i2c4mux0chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
-+			eeprom at 52 {
++			eeprom@52 {
 +				compatible = "atmel,24c64";
 +				reg = <0x52>;
 +			};
 +
-+			pca_cable_card_c01: pca9551 at 62 {
++			pca_cable_card_c01: pca9551@62 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x62>;
 +				#address-cells = <1>;
@@ -474,7 +474,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c01-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -482,7 +482,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c01-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -492,16 +492,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c4mux0chn1: i2c at 1 {
++		i2c4mux0chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +
-+			pca_cable_card_c02: pca9551 at 60 {
++			pca_cable_card_c02: pca9551@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -510,7 +510,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c02-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -518,7 +518,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c02-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -528,16 +528,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c4mux0chn2: i2c at 2 {
++		i2c4mux0chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c64";
 +				reg = <0x51>;
 +			};
 +
-+			pca_cable_card_c03: pca9551 at 61 {
++			pca_cable_card_c03: pca9551@61 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x61>;
 +				#address-cells = <1>;
@@ -546,7 +546,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c03-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -554,7 +554,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c03-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -569,7 +569,7 @@ index 000000000000..dc41fa815761
 +&i2c5 {
 +	status = "okay";
 +
-+	pca3: pca9552 at 66 {
++	pca3: pca9552@66 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x66>;
 +		#address-cells = <1>;
@@ -593,7 +593,7 @@ index 000000000000..dc41fa815761
 +			"expander-cable-card11";
 +	};
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
@@ -601,16 +601,16 @@ index 000000000000..dc41fa815761
 +		status = "okay";
 +		i2c-mux-idle-disconnect;
 +
-+		i2c5mux0chn0: i2c at 0 {
++		i2c5mux0chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +
-+			pca_cable_card_c04: pca9551 at 60 {
++			pca_cable_card_c04: pca9551@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -619,7 +619,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c04-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -627,7 +627,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c04-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -637,16 +637,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c5mux0chn1: i2c at 1 {
++		i2c5mux0chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c64";
 +				reg = <0x51>;
 +			};
 +
-+			pca_cable_card_c05: pca9551 at 61 {
++			pca_cable_card_c05: pca9551@61 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x61>;
 +				#address-cells = <1>;
@@ -655,7 +655,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c05-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -663,7 +663,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c05-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -673,16 +673,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c5mux0chn2: i2c at 2 {
++		i2c5mux0chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
-+			eeprom at 52 {
++			eeprom@52 {
 +				compatible = "atmel,24c64";
 +				reg = <0x52>;
 +			};
 +
-+			pca_cable_card_c06: pca9551 at 62 {
++			pca_cable_card_c06: pca9551@62 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x62>;
 +				#address-cells = <1>;
@@ -691,7 +691,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c06-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -699,7 +699,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c06-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -709,16 +709,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c5mux0chn3: i2c at 3 {
++		i2c5mux0chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +
-+			pca_cable_card_c07: pca9551 at 63 {
++			pca_cable_card_c07: pca9551@63 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x63>;
 +				#address-cells = <1>;
@@ -727,7 +727,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c07-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -735,7 +735,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c07-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -750,7 +750,7 @@ index 000000000000..dc41fa815761
 +&i2c6 {
 +	status = "okay";
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
@@ -758,16 +758,16 @@ index 000000000000..dc41fa815761
 +		status = "okay";
 +		i2c-mux-idle-disconnect;
 +
-+		i2c6mux0chn0: i2c at 0 {
++		i2c6mux0chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
-+			eeprom at 50 {
++			eeprom@50 {
 +			compatible = "atmel,24c64";
 +			reg = <0x50>;
 +			};
 +
-+			pca_cable_card_c08: pca9551 at 60 {
++			pca_cable_card_c08: pca9551@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -776,7 +776,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c08-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -784,7 +784,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c08-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -794,16 +794,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c6mux0chn1: i2c at 1 {
++		i2c6mux0chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
-+			eeprom at 52 {
++			eeprom@52 {
 +				compatible = "atmel,24c64";
 +				reg = <0x52>;
 +			};
 +
-+			pca_cable_card_c09: pca9551 at 62 {
++			pca_cable_card_c09: pca9551@62 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x62>;
 +				#address-cells = <1>;
@@ -812,7 +812,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c09-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -820,7 +820,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c09-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -830,16 +830,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c6mux0chn2: i2c at 2 {
++		i2c6mux0chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +
-+			pca_cable_card_c10: pca9551 at 63 {
++			pca_cable_card_c10: pca9551@63 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x63>;
 +				#address-cells = <1>;
@@ -848,7 +848,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c10-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -856,7 +856,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c10-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -866,16 +866,16 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c6mux0chn3: i2c at 3 {
++		i2c6mux0chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c64";
 +				reg = <0x51>;
 +			};
 +
-+			pca_cable_card_c11: pca9551 at 61 {
++			pca_cable_card_c11: pca9551@61 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x61>;
 +				#address-cells = <1>;
@@ -884,7 +884,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "cablecard-c11-cxp-top";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -892,7 +892,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "cablecard-c11-cxp-bot";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -903,7 +903,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	pca_pcie_slot: pca9552 at 65 {
++	pca_pcie_slot: pca9552@65 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x65>;
 +		#address-cells = <1>;
@@ -912,7 +912,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 1 {
++		led@1 {
 +			label = "pcieslot-c01";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -920,7 +920,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "pcieslot-c02";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -928,7 +928,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "pcieslot-c03";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -936,7 +936,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "pcieslot-c04";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -944,7 +944,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "pcieslot-c05";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -952,7 +952,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "pcieslot-c06";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -960,7 +960,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			label = "pcieslot-c07";
 +			reg = <7>;
 +			retain-state-shutdown;
@@ -968,7 +968,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "pcieslot-c08";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -976,7 +976,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "pcieslot-c09";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -984,7 +984,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "pcieslot-c10";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -992,7 +992,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "pcieslot-c11";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1005,7 +1005,7 @@ index 000000000000..dc41fa815761
 +&i2c7 {
 +	status = "okay";
 +
-+	pic0_dimm: pca9552 at 31 {
++	pic0_dimm: pca9552@31 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x31>;
 +		#address-cells = <1>;
@@ -1014,7 +1014,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			label = "ddimm0";
 +			reg = <0>;
 +			retain-state-shutdown;
@@ -1022,7 +1022,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			label = "ddimm1";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -1030,7 +1030,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "ddimm2";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -1038,7 +1038,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "ddimm3";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -1046,7 +1046,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "ddimm4";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -1054,7 +1054,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "ddimm5";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -1062,7 +1062,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "ddimm6";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -1070,7 +1070,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			label = "ddimm7";
 +			reg = <7>;
 +			retain-state-shutdown;
@@ -1078,7 +1078,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "ddimm8";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -1086,7 +1086,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "ddimm9";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -1094,7 +1094,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "ddimm10";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -1102,7 +1102,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "ddimm11";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1110,7 +1110,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			label = "ddimm12";
 +			reg = <12>;
 +			retain-state-shutdown;
@@ -1118,7 +1118,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			label = "ddimm13";
 +			reg = <13>;
 +			retain-state-shutdown;
@@ -1126,7 +1126,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			label = "ddimm14";
 +			reg = <14>;
 +			retain-state-shutdown;
@@ -1134,7 +1134,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			label = "ddimm15";
 +			reg = <15>;
 +			retain-state-shutdown;
@@ -1143,7 +1143,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	pic1_dimm: pca9552 at 32 {
++	pic1_dimm: pca9552@32 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x32>;
 +		#address-cells = <1>;
@@ -1152,7 +1152,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			label = "ddimm16";
 +			reg = <0>;
 +			retain-state-shutdown;
@@ -1160,7 +1160,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			label = "ddimm17";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -1168,7 +1168,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "ddimm18";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -1176,7 +1176,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "ddimm19";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -1184,7 +1184,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "ddimm20";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -1192,7 +1192,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "ddimm21";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -1200,7 +1200,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "ddimm22";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -1208,7 +1208,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			label = "ddimm23";
 +			reg = <7>;
 +			retain-state-shutdown;
@@ -1216,7 +1216,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "ddimm24";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -1224,7 +1224,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "ddimm25";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -1232,7 +1232,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "ddimm26";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -1240,7 +1240,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "ddimm27";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1248,7 +1248,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			label = "ddimm28";
 +			reg = <12>;
 +			retain-state-shutdown;
@@ -1256,7 +1256,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			label = "ddimm29";
 +			reg = <13>;
 +			retain-state-shutdown;
@@ -1264,7 +1264,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			label = "ddimm30";
 +			reg = <14>;
 +			retain-state-shutdown;
@@ -1272,7 +1272,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			label = "ddimm31";
 +			reg = <15>;
 +			retain-state-shutdown;
@@ -1281,7 +1281,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	pic2_dimm: pca9552 at 33 {
++	pic2_dimm: pca9552@33 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x33>;
 +		#address-cells = <1>;
@@ -1290,7 +1290,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			label = "ddimm32";
 +			reg = <0>;
 +			retain-state-shutdown;
@@ -1298,7 +1298,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			label = "ddimm33";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -1306,7 +1306,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "ddimm34";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -1314,7 +1314,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "ddimm35";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -1322,7 +1322,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "ddimm36";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -1330,7 +1330,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "ddimm37";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -1338,7 +1338,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "ddimm38";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -1346,7 +1346,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			label = "ddimm39";
 +			reg = <7>;
 +			retain-state-shutdown;
@@ -1354,7 +1354,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "ddimm40";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -1362,7 +1362,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "ddimm41";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -1370,7 +1370,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "ddimm42";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -1378,7 +1378,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "ddimm43";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1386,7 +1386,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			label = "ddimm44";
 +			reg = <12>;
 +			retain-state-shutdown;
@@ -1394,7 +1394,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			label = "ddimm45";
 +			reg = <13>;
 +			retain-state-shutdown;
@@ -1402,7 +1402,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			label = "ddimm46";
 +			reg = <14>;
 +			retain-state-shutdown;
@@ -1410,7 +1410,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			label = "ddimm47";
 +			reg = <15>;
 +			retain-state-shutdown;
@@ -1419,7 +1419,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	pic3_dimm: pca9552 at 30 {
++	pic3_dimm: pca9552@30 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x30>;
 +		#address-cells = <1>;
@@ -1428,7 +1428,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			label = "ddimm48";
 +			reg = <0>;
 +			retain-state-shutdown;
@@ -1436,7 +1436,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			label = "ddimm49";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -1444,7 +1444,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "ddimm50";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -1452,7 +1452,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "ddimm51";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -1460,7 +1460,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "ddimm52";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -1468,7 +1468,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "ddimm53";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -1476,7 +1476,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "ddimm54";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -1484,7 +1484,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			label = "ddimm55";
 +			reg = <7>;
 +			retain-state-shutdown;
@@ -1492,7 +1492,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "ddimm56";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -1500,7 +1500,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "ddimm57";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -1508,7 +1508,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "ddimm58";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -1516,7 +1516,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "ddimm59";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1524,7 +1524,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			label = "ddimm60";
 +			reg = <12>;
 +			retain-state-shutdown;
@@ -1532,7 +1532,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			label = "ddimm61";
 +			reg = <13>;
 +			retain-state-shutdown;
@@ -1540,7 +1540,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			label = "ddimm62";
 +			reg = <14>;
 +			retain-state-shutdown;
@@ -1548,7 +1548,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			label = "ddimm63";
 +			reg = <15>;
 +			retain-state-shutdown;
@@ -1557,7 +1557,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	pic0_vrm_misc: pca9552 at 34 {
++	pic0_vrm_misc: pca9552@34 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x34>;
 +		#address-cells = <1>;
@@ -1566,7 +1566,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			label = "planar";
 +			reg = <0>;
 +			retain-state-shutdown;
@@ -1574,7 +1574,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			label = "tpm";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -1582,7 +1582,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "cpu3-c61";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -1590,7 +1590,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "cpu0-c14";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -1598,7 +1598,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "opencapi-connector3";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -1606,7 +1606,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "opencapi-connector4";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -1614,7 +1614,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "opencapi-connector5";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -1622,7 +1622,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "vrm4";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -1630,7 +1630,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "vrm5";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -1638,7 +1638,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "vrm6";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -1646,7 +1646,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "vrm7";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1654,7 +1654,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			label = "vrm12";
 +			reg = <12>;
 +			retain-state-shutdown;
@@ -1662,7 +1662,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			label = "vrm13";
 +			reg = <13>;
 +			retain-state-shutdown;
@@ -1670,7 +1670,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			label = "vrm14";
 +			reg = <14>;
 +			retain-state-shutdown;
@@ -1678,7 +1678,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			label = "vrm15";
 +			reg = <15>;
 +			retain-state-shutdown;
@@ -1687,7 +1687,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	pic1_vrm_misc: pca9552 at 35 {
++	pic1_vrm_misc: pca9552@35 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x35>;
 +		#address-cells = <1>;
@@ -1696,7 +1696,7 @@ index 000000000000..dc41fa815761
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			label = "dasd-backplane";
 +			reg = <0>;
 +			retain-state-shutdown;
@@ -1704,7 +1704,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			label = "power-distribution";
 +			reg = <1>;
 +			retain-state-shutdown;
@@ -1712,7 +1712,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			label = "cpu1-c19";
 +			reg = <2>;
 +			retain-state-shutdown;
@@ -1720,7 +1720,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			label = "cpu2-c56";
 +			reg = <3>;
 +			retain-state-shutdown;
@@ -1728,7 +1728,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			label = "opencapi-connector0";
 +			reg = <4>;
 +			retain-state-shutdown;
@@ -1736,7 +1736,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			label = "opencapi-connector1";
 +			reg = <5>;
 +			retain-state-shutdown;
@@ -1744,7 +1744,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			label = "opencapi-connector2";
 +			reg = <6>;
 +			retain-state-shutdown;
@@ -1752,7 +1752,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			label = "vrm0";
 +			reg = <8>;
 +			retain-state-shutdown;
@@ -1760,7 +1760,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			label = "vrm1";
 +			reg = <9>;
 +			retain-state-shutdown;
@@ -1768,7 +1768,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			label = "vrm2";
 +			reg = <10>;
 +			retain-state-shutdown;
@@ -1776,7 +1776,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			label = "vrm3";
 +			reg = <11>;
 +			retain-state-shutdown;
@@ -1784,7 +1784,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			label = "vrm8";
 +			reg = <12>;
 +			retain-state-shutdown;
@@ -1792,7 +1792,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			label = "vrm9";
 +			reg = <13>;
 +			retain-state-shutdown;
@@ -1800,7 +1800,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			label = "vrm10";
 +			reg = <14>;
 +			retain-state-shutdown;
@@ -1808,7 +1808,7 @@ index 000000000000..dc41fa815761
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			label = "vrm11";
 +			reg = <15>;
 +			retain-state-shutdown;
@@ -1821,27 +1821,27 @@ index 000000000000..dc41fa815761
 +&i2c8 {
 +	status = "okay";
 +
-+	ucd90320 at 11 {
++	ucd90320@11 {
 +		compatible = "ti,ucd90320";
 +		reg = <0x11>;
 +	};
 +
-+	rtc at 32 {
++	rtc@32 {
 +		compatible = "epson,rx8900";
 +		reg = <0x32>;
 +	};
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c64";
 +		reg = <0x51>;
 +	};
 +
-+	eeprom at 50 {
++	eeprom@50 {
 +		compatible = "atmel,24c128";
 +		reg = <0x50>;
 +	};
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
@@ -1849,13 +1849,13 @@ index 000000000000..dc41fa815761
 +		status = "okay";
 +		i2c-mux-idle-disconnect;
 +
-+		i2c8mux0chn0: i2c at 0 {
++		i2c8mux0chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
 +		};
 +
-+		i2c8mux0chn1: i2c at 1 {
++		i2c8mux0chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
@@ -1866,22 +1866,22 @@ index 000000000000..dc41fa815761
 +&i2c9 {
 +	status = "okay";
 +
-+	eeprom at 50 {
++	eeprom@50 {
 +		compatible = "atmel,24c128";
 +		reg = <0x50>;
 +	};
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c128";
 +		reg = <0x51>;
 +	};
 +
-+	eeprom at 53 {
++	eeprom@53 {
 +		compatible = "atmel,24c128";
 +		reg = <0x53>;
 +	};
 +
-+	eeprom at 52 {
++	eeprom@52 {
 +		compatible = "atmel,24c128";
 +		reg = <0x52>;
 +	};
@@ -1890,22 +1890,22 @@ index 000000000000..dc41fa815761
 +&i2c10 {
 +	status = "okay";
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c128";
 +		reg = <0x51>;
 +	};
 +
-+	eeprom at 50 {
++	eeprom@50 {
 +		compatible = "atmel,24c128";
 +		reg = <0x50>;
 +	};
 +
-+	eeprom at 53 {
++	eeprom@53 {
 +		compatible = "atmel,24c128";
 +		reg = <0x53>;
 +	};
 +
-+	eeprom at 52 {
++	eeprom@52 {
 +		compatible = "atmel,24c128";
 +		reg = <0x52>;
 +	};
@@ -1914,22 +1914,22 @@ index 000000000000..dc41fa815761
 +&i2c11 {
 +	status = "okay";
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c128";
 +		reg = <0x51>;
 +	};
 +
-+	eeprom at 50 {
++	eeprom@50 {
 +		compatible = "atmel,24c128";
 +		reg = <0x50>;
 +	};
 +
-+	eeprom at 53 {
++	eeprom@53 {
 +		compatible = "atmel,24c128";
 +		reg = <0x53>;
 +	};
 +
-+	eeprom at 52 {
++	eeprom@52 {
 +		compatible = "atmel,24c128";
 +		reg = <0x52>;
 +	};
@@ -1938,7 +1938,7 @@ index 000000000000..dc41fa815761
 +&i2c12 {
 +	status = "okay";
 +
-+	tpm at 2e {
++	tpm@2e {
 +		compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
 +		reg = <0x2e>;
 +		memory-region = <&event_log>;
@@ -1948,22 +1948,22 @@ index 000000000000..dc41fa815761
 +&i2c13 {
 +	status = "okay";
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c128";
 +		reg = <0x51>;
 +	};
 +
-+	eeprom at 50 {
++	eeprom@50 {
 +		compatible = "atmel,24c128";
 +		reg = <0x50>;
 +	};
 +
-+	eeprom at 53 {
++	eeprom@53 {
 +		compatible = "atmel,24c128";
 +		reg = <0x53>;
 +	};
 +
-+	eeprom at 52 {
++	eeprom@52 {
 +		compatible = "atmel,24c128";
 +		reg = <0x52>;
 +	};
@@ -1973,12 +1973,12 @@ index 000000000000..dc41fa815761
 +	multi-master;
 +	status = "okay";
 +
-+	ibm-panel at 62 {
++	ibm-panel@62 {
 +		compatible = "ibm,op-panel";
 +		reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>;
 +	};
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
@@ -1986,36 +1986,36 @@ index 000000000000..dc41fa815761
 +		status = "okay";
 +		idle-state = <1>;
 +
-+		i2c14mux0chn0: i2c at 0 {
++		i2c14mux0chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux0chn1: i2c at 1 {
++		i2c14mux0chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c32";
 +				reg = <0x51>;
 +			};
 +		};
 +
-+		i2c14mux0chn2: i2c at 2 {
++		i2c14mux0chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +
-+			pca_oppanel: pca9551 at 60 {
++			pca_oppanel: pca9551@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -2024,7 +2024,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "front-sys-id0";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -2032,7 +2032,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "front-check-log0";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -2040,7 +2040,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 2 {
++				led@2 {
 +					label = "front-enc-fault1";
 +					reg = <2>;
 +					retain-state-shutdown;
@@ -2048,7 +2048,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 3 {
++				led@3 {
 +					label = "front-sys-pwron0";
 +					reg = <3>;
 +					retain-state-shutdown;
@@ -2058,19 +2058,19 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		i2c14mux0chn3: i2c at 3 {
++		i2c14mux0chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
 +
-+			max31785 at 52 {
++			max31785@52 {
 +				compatible = "maxim,max31785a";
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0x52>;
 +			};
 +
-+			pca_fan_nvme: pca9552 at 60 {
++			pca_fan_nvme: pca9552@60 {
 +				compatible = "nxp,pca9552";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -2079,7 +2079,7 @@ index 000000000000..dc41fa815761
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					label = "nvme0";
 +					reg = <0>;
 +					retain-state-shutdown;
@@ -2087,7 +2087,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					label = "nvme1";
 +					reg = <1>;
 +					retain-state-shutdown;
@@ -2095,7 +2095,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 2 {
++				led@2 {
 +					label = "nvme2";
 +					reg = <2>;
 +					retain-state-shutdown;
@@ -2103,7 +2103,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 3 {
++				led@3 {
 +					label = "nvme3";
 +					reg = <3>;
 +					retain-state-shutdown;
@@ -2111,7 +2111,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 4 {
++				led@4 {
 +					label = "nvme4";
 +					reg = <4>;
 +					retain-state-shutdown;
@@ -2119,7 +2119,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 5 {
++				led@5 {
 +					label = "nvme5";
 +					reg = <5>;
 +					retain-state-shutdown;
@@ -2127,7 +2127,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 6 {
++				led@6 {
 +					label = "nvme6";
 +					reg = <6>;
 +					retain-state-shutdown;
@@ -2135,7 +2135,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 7 {
++				led@7 {
 +					label = "nvme7";
 +					reg = <7>;
 +					retain-state-shutdown;
@@ -2143,7 +2143,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 8 {
++				led@8 {
 +					label = "nvme8";
 +					reg = <8>;
 +					retain-state-shutdown;
@@ -2151,7 +2151,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 9 {
++				led@9 {
 +					label = "nvme9";
 +					reg = <9>;
 +					retain-state-shutdown;
@@ -2159,7 +2159,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 10 {
++				led@10 {
 +					label = "fan0";
 +					reg = <10>;
 +					retain-state-shutdown;
@@ -2167,7 +2167,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 11 {
++				led@11 {
 +					label = "fan1";
 +					reg = <11>;
 +					retain-state-shutdown;
@@ -2175,7 +2175,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 12 {
++				led@12 {
 +					label = "fan2";
 +					reg = <12>;
 +					retain-state-shutdown;
@@ -2183,7 +2183,7 @@ index 000000000000..dc41fa815761
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 13 {
++				led@13 {
 +					label = "fan3";
 +					reg = <13>;
 +					retain-state-shutdown;
@@ -2192,7 +2192,7 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			pca0: pca9552 at 61 {
++			pca0: pca9552@61 {
 +				compatible = "nxp,pca9552";
 +				#address-cells = <1>;
 +				#size-cells = <0>;
@@ -2213,7 +2213,7 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	i2c-mux at 71 {
++	i2c-mux@71 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x71>;
 +		#address-cells = <1>;
@@ -2221,41 +2221,41 @@ index 000000000000..dc41fa815761
 +		status = "okay";
 +		i2c-mux-idle-disconnect;
 +
-+		i2c14mux1chn0: i2c at 0 {
++		i2c14mux1chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux1chn1: i2c at 1 {
++		i2c14mux1chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux1chn2: i2c at 2 {
++		i2c14mux1chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux1chn3: i2c at 3 {
++		i2c14mux1chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
@@ -2266,146 +2266,146 @@ index 000000000000..dc41fa815761
 +&i2c15 {
 +	status = "okay";
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c15mux0chn0: i2c at 0 {
++		i2c15mux0chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux0chn1: i2c at 1 {
++		i2c15mux0chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux0chn2: i2c at 2 {
++		i2c15mux0chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux0chn3: i2c at 3 {
++		i2c15mux0chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +	};
 +
-+	i2c-mux at 71 {
++	i2c-mux@71 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x71>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c15mux1chn0: i2c at 0 {
++		i2c15mux1chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux1chn1: i2c at 1 {
++		i2c15mux1chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux1chn2: i2c at 2 {
++		i2c15mux1chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux1chn3: i2c at 3 {
++		i2c15mux1chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +	};
 +
-+	i2c-mux at 72 {
++	i2c-mux@72 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x72>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c15mux2chn0: i2c at 0 {
++		i2c15mux2chn0: i2c@0 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux2chn1: i2c at 1 {
++		i2c15mux2chn1: i2c@1 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <1>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux2chn2: i2c at 2 {
++		i2c15mux2chn2: i2c@2 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <2>;
 +		};
 +
-+		i2c15mux2chn3: i2c at 3 {
++		i2c15mux2chn3: i2c@3 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +			reg = <3>;
@@ -2512,46 +2512,46 @@ index 000000000000..dc41fa815761
 +#include "ibm-power11-quad.dtsi"
 +
 +&fsi_hub0 {
-+	cfam at 4,0 { /* DCM2_C0 */
++	cfam@4,0 { /* DCM2_C0 */
 +		reg = <4 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <4>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam4_i2c0: i2c-bus at 0 {
++			cfam4_i2c0: i2c-bus@0 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0>;	/* OM01 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom500: scom at 1000 {
++						scom500: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo500: sbefifo at 2400 {
++						sbefifo500: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2561,29 +2561,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c1: i2c-bus at 1 {
++			cfam4_i2c1: i2c-bus@1 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <1>;	/* OM23 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom501: scom at 1000 {
++						scom501: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo501: sbefifo at 2400 {
++						sbefifo501: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2593,29 +2593,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c10: i2c-bus at a {
++			cfam4_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom510: scom at 1000 {
++						scom510: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo510: sbefifo at 2400 {
++						sbefifo510: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2625,29 +2625,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c11: i2c-bus at b {
++			cfam4_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom511: scom at 1000 {
++						scom511: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo511: sbefifo at 2400 {
++						sbefifo511: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2657,29 +2657,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c12: i2c-bus at c {
++			cfam4_i2c12: i2c-bus@c {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <12>;	/* OP4A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom512: scom at 1000 {
++						scom512: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo512: sbefifo at 2400 {
++						sbefifo512: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2689,29 +2689,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c13: i2c-bus at d {
++			cfam4_i2c13: i2c-bus@d {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <13>;	/* OP4B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom513: scom at 1000 {
++						scom513: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo513: sbefifo at 2400 {
++						sbefifo513: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2721,29 +2721,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c14: i2c-bus at e {
++			cfam4_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom514: scom at 1000 {
++						scom514: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo514: sbefifo at 2400 {
++						sbefifo514: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2753,29 +2753,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_i2c15: i2c-bus at f {
++			cfam4_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom515: scom at 1000 {
++						scom515: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo515: sbefifo at 2400 {
++						sbefifo515: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2786,19 +2786,19 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam4_spi0: spi at 0 {
++			cfam4_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -2808,13 +2808,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_spi1: spi at 20 {
++			cfam4_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -2824,13 +2824,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_spi2: spi at 40 {
++			cfam4_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -2840,13 +2840,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam4_spi3: spi at 60 {
++			cfam4_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -2857,7 +2857,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -2873,7 +2873,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi_hub4: hub at 3400 {
++		fsi_hub4: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -2883,46 +2883,46 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	cfam at 5,0 { /* DCM2_C1 */
++	cfam@5,0 { /* DCM2_C1 */
 +		reg = <5 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <5>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam5_i2c2: i2c-bus at 2 {
++			cfam5_i2c2: i2c-bus@2 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <2>;	/* OM45 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom602: scom at 1000 {
++						scom602: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo602: sbefifo at 2400 {
++						sbefifo602: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2932,29 +2932,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c3: i2c-bus at 3 {
++			cfam5_i2c3: i2c-bus@3 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <3>;	/* OM67 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom603: scom at 1000 {
++						scom603: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo603: sbefifo at 2400 {
++						sbefifo603: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2964,29 +2964,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c10: i2c-bus at a {
++			cfam5_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom610: scom at 1000 {
++						scom610: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo610: sbefifo at 2400 {
++						sbefifo610: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -2996,29 +2996,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c11: i2c-bus at b {
++			cfam5_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom611: scom at 1000 {
++						scom611: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo611: sbefifo at 2400 {
++						sbefifo611: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3028,29 +3028,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c14: i2c-bus at e {
++			cfam5_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom614: scom at 1000 {
++						scom614: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo614: sbefifo at 2400 {
++						sbefifo614: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3060,29 +3060,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c15: i2c-bus at f {
++			cfam5_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom615: scom at 1000 {
++						scom615: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo615: sbefifo at 2400 {
++						sbefifo615: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3092,29 +3092,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c16: i2c-bus at 10 {
++			cfam5_i2c16: i2c-bus@10 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <16>;	/* OP6A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom616: scom at 1000 {
++						scom616: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo616: sbefifo at 2400 {
++						sbefifo616: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3124,29 +3124,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_i2c17: i2c-bus at 11 {
++			cfam5_i2c17: i2c-bus@11 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <17>;	/* OP6B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom617: scom at 1000 {
++						scom617: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo617: sbefifo at 2400 {
++						sbefifo617: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3157,19 +3157,19 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam5_spi0: spi at 0 {
++			cfam5_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3179,13 +3179,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_spi1: spi at 20 {
++			cfam5_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3195,13 +3195,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_spi2: spi at 40 {
++			cfam5_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3211,13 +3211,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam5_spi3: spi at 60 {
++			cfam5_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3228,7 +3228,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -3244,7 +3244,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi_hub5: hub at 3400 {
++		fsi_hub5: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -3254,46 +3254,46 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	cfam at 6,0 { /* DCM3_C0 */
++	cfam@6,0 { /* DCM3_C0 */
 +		reg = <6 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <6>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam6_i2c0: i2c-bus at 0 {
++			cfam6_i2c0: i2c-bus@0 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <0>;	/* OM01 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom700: scom at 1000 {
++						scom700: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo700: sbefifo at 2400 {
++						sbefifo700: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3303,29 +3303,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c1: i2c-bus at 1 {
++			cfam6_i2c1: i2c-bus@1 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <1>;	/* OM23 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom701: scom at 1000 {
++						scom701: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo701: sbefifo at 2400 {
++						sbefifo701: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3335,29 +3335,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c10: i2c-bus at a {
++			cfam6_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom710: scom at 1000 {
++						scom710: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo710: sbefifo at 2400 {
++						sbefifo710: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3367,29 +3367,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c11: i2c-bus at b {
++			cfam6_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom711: scom at 1000 {
++						scom711: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo711: sbefifo at 2400 {
++						sbefifo711: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3399,29 +3399,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c12: i2c-bus at c {
++			cfam6_i2c12: i2c-bus@c {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <12>;	/* OP4A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom712: scom at 1000 {
++						scom712: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo712: sbefifo at 2400 {
++						sbefifo712: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3431,29 +3431,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c13: i2c-bus at d {
++			cfam6_i2c13: i2c-bus@d {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <13>;	/* OP4B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom713: scom at 1000 {
++						scom713: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo713: sbefifo at 2400 {
++						sbefifo713: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3463,29 +3463,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c14: i2c-bus at e {
++			cfam6_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom714: scom at 1000 {
++						scom714: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo714: sbefifo at 2400 {
++						sbefifo714: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3495,29 +3495,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_i2c15: i2c-bus at f {
++			cfam6_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom715: scom at 1000 {
++						scom715: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo715: sbefifo at 2400 {
++						sbefifo715: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3528,19 +3528,19 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam6_spi0: spi at 0 {
++			cfam6_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3550,13 +3550,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_spi1: spi at 20 {
++			cfam6_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3566,13 +3566,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_spi2: spi at 40 {
++			cfam6_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3582,13 +3582,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam6_spi3: spi at 60 {
++			cfam6_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3599,7 +3599,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -3615,7 +3615,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi_hub6: hub at 3400 {
++		fsi_hub6: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -3625,46 +3625,46 @@ index 000000000000..dc41fa815761
 +		};
 +	};
 +
-+	cfam at 7,0 { /* DCM3_C1 */
++	cfam@7,0 { /* DCM3_C1 */
 +		reg = <7 0>;
 +		#address-cells = <1>;
 +		#size-cells = <1>;
 +		chip-id = <7>;
 +
-+		scom at 1000 {
++		scom@1000 {
 +			compatible = "ibm,fsi2pib";
 +			reg = <0x1000 0x400>;
 +		};
 +
-+		i2c at 1800 {
++		i2c@1800 {
 +			compatible = "ibm,i2c-fsi";
 +			reg = <0x1800 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam7_i2c2: i2c-bus at 2 {
++			cfam7_i2c2: i2c-bus@2 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <2>;	/* OM45 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom802: scom at 1000 {
++						scom802: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo802: sbefifo at 2400 {
++						sbefifo802: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3674,29 +3674,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c3: i2c-bus at 3 {
++			cfam7_i2c3: i2c-bus@3 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <3>;	/* OM67 */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom803: scom at 1000 {
++						scom803: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo803: sbefifo at 2400 {
++						sbefifo803: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3706,29 +3706,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c10: i2c-bus at a {
++			cfam7_i2c10: i2c-bus@a {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <10>;	/* OP3A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom810: scom at 1000 {
++						scom810: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo810: sbefifo at 2400 {
++						sbefifo810: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3738,29 +3738,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c11: i2c-bus at b {
++			cfam7_i2c11: i2c-bus@b {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <11>;	/* OP3B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom811: scom at 1000 {
++						scom811: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo811: sbefifo at 2400 {
++						sbefifo811: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3770,29 +3770,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c14: i2c-bus at e {
++			cfam7_i2c14: i2c-bus@e {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <14>;	/* OP5A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom814: scom at 1000 {
++						scom814: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo814: sbefifo at 2400 {
++						sbefifo814: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3802,29 +3802,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c15: i2c-bus at f {
++			cfam7_i2c15: i2c-bus@f {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <15>;	/* OP5B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom815: scom at 1000 {
++						scom815: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo815: sbefifo at 2400 {
++						sbefifo815: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3834,29 +3834,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c16: i2c-bus at 10 {
++			cfam7_i2c16: i2c-bus@10 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <16>;	/* OP6A */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom816: scom at 1000 {
++						scom816: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo816: sbefifo at 2400 {
++						sbefifo816: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3866,29 +3866,29 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_i2c17: i2c-bus at 11 {
++			cfam7_i2c17: i2c-bus@11 {
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +				reg = <17>;	/* OP6B */
 +
-+				fsi-i2cr at 20 {
++				fsi-i2cr@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						scom817: scom at 1000 {
++						scom817: scom@1000 {
 +							compatible = "ibm,i2cr-scom";
 +							reg = <0x1000 0x400>;
 +						};
 +
-+						sbefifo817: sbefifo at 2400 {
++						sbefifo817: sbefifo@2400 {
 +							compatible = "ibm,odyssey-sbefifo";
 +							reg = <0x2400 0x400>;
 +							#address-cells = <1>;
@@ -3899,19 +3899,19 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi2spi at 1c00 {
++		fsi2spi@1c00 {
 +			compatible = "ibm,fsi2spi";
 +			reg = <0x1c00 0x400>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			cfam7_spi0: spi at 0 {
++			cfam7_spi0: spi@0 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3921,13 +3921,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_spi1: spi at 20 {
++			cfam7_spi1: spi@20 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3937,13 +3937,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_spi2: spi at 40 {
++			cfam7_spi2: spi@40 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3953,13 +3953,13 @@ index 000000000000..dc41fa815761
 +				};
 +			};
 +
-+			cfam7_spi3: spi at 60 {
++			cfam7_spi3: spi@60 {
 +				compatible = "ibm,p10-spi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					size = <0x80000>;
@@ -3970,7 +3970,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +			#address-cells = <1>;
@@ -3986,7 +3986,7 @@ index 000000000000..dc41fa815761
 +			};
 +		};
 +
-+		fsi_hub7: hub at 3400 {
++		fsi_hub7: hub@3400 {
 +			compatible = "ibm,hub-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
diff --git a/a/content_digest b/N1/content_digest
index f62c0be..7999a46 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,20 @@
  "ref\020240425213701.655540-1-eajames@linux.ibm.com\0"
  "From\0Eddie James <eajames@linux.ibm.com>\0"
  "Subject\0[PATCH v3 14/14] ARM: dts: aspeed: Add IBM P11 Fuji BMC system\0"
- "Date\0Thu, 25 Apr 2024 21:37:32 -0000\0"
+ "Date\0Thu, 25 Apr 2024 16:37:01 -0500\0"
  "To\0linux-aspeed@lists.ozlabs.org\0"
+ "Cc\0eajames@linux.ibm.com"
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  linux-fsi@lists.ozlabs.org
+  linux-spi@vger.kernel.org
+  linux-i2c@vger.kernel.org
+  lakshmiy@us.ibm.com
+  robh@kernel.org
+  krzk+dt@kernel.org
+  conor+dt@kernel.org
+  joel@jms.id.au
+ " andrew@codeconstruct.com.au\0"
  "\00:1\0"
  "b\0"
  "Add the device tree for the new BMC system. The Fuji is a P11\n"
@@ -208,7 +220,7 @@
  "+\t\tbootargs = \"console=ttyS4,115200n8\";\n"
  "+\t};\n"
  "+\n"
- "+\tmemory at 80000000 {\n"
+ "+\tmemory@80000000 {\n"
  "+\t\tdevice_type = \"memory\";\n"
  "+\t\treg = <0x80000000 0x40000000>;\n"
  "+\t};\n"
@@ -218,12 +230,12 @@
  "+\t\t#size-cells = <1>;\n"
  "+\t\tranges;\n"
  "+\n"
- "+\t\tevent_log: tcg_event_log at b3d00000 {\n"
+ "+\t\tevent_log: tcg_event_log@b3d00000 {\n"
  "+\t\t\tno-map;\n"
  "+\t\t\treg = <0xb3d00000 0x100000>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tramoops at b3e00000 {\n"
+ "+\t\tramoops@b3e00000 {\n"
  "+\t\t\tcompatible = \"ramoops\";\n"
  "+\t\t\treg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */\n"
  "+\t\t\trecord-size = <0x8000>;\n"
@@ -234,13 +246,13 @@
  "+\t\t};\n"
  "+\n"
  "+\t\t/* LPC FW cycle bridge region requires natural alignment */\n"
- "+\t\tflash_memory: region at b4000000 {\n"
+ "+\t\tflash_memory: region@b4000000 {\n"
  "+\t\t\tno-map;\n"
  "+\t\t\treg = <0xb4000000 0x04000000>; /* 64M */\n"
  "+\t\t};\n"
  "+\n"
  "+\t\t/* VGA region is dictated by hardware strapping */\n"
- "+\t\tvga_memory: region at bf000000 {\n"
+ "+\t\tvga_memory: region@bf000000 {\n"
  "+\t\t\tno-map;\n"
  "+\t\t\tcompatible = \"shared-dma-pool\";\n"
  "+\t\t\treg = <0xbf000000 0x01000000>; /* 16M */\n"
@@ -360,12 +372,12 @@
  "+&i2c0 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\teeprom at 51 {\n"
+ "+\teeprom@51 {\n"
  "+\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\treg = <0x51>;\n"
  "+\t};\n"
  "+\n"
- "+\tpca1: pca9552 at 62 {\n"
+ "+\tpca1: pca9552@62 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x62>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -404,27 +416,27 @@
  "+&i2c3 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\teeprom at 54 {\n"
+ "+\teeprom@54 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x54>;\n"
  "+\t};\n"
  "+\n"
- "+\tpower-supply at 68 {\n"
+ "+\tpower-supply@68 {\n"
  "+\t\tcompatible = \"ibm,cffps\";\n"
  "+\t\treg = <0x68>;\n"
  "+\t};\n"
  "+\n"
- "+\tpower-supply at 69 {\n"
+ "+\tpower-supply@69 {\n"
  "+\t\tcompatible = \"ibm,cffps\";\n"
  "+\t\treg = <0x69>;\n"
  "+\t};\n"
  "+\n"
- "+\tpower-supply at 6b {\n"
+ "+\tpower-supply@6b {\n"
  "+\t\tcompatible = \"ibm,cffps\";\n"
  "+\t\treg = <0x6b>;\n"
  "+\t};\n"
  "+\n"
- "+\tpower-supply at 6d {\n"
+ "+\tpower-supply@6d {\n"
  "+\t\tcompatible = \"ibm,cffps\";\n"
  "+\t\treg = <0x6d>;\n"
  "+\t};\n"
@@ -433,7 +445,7 @@
  "+&i2c4 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tpca2: pca9552 at 65 {\n"
+ "+\tpca2: pca9552@65 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x65>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -455,7 +467,7 @@
  "+\t\t\t\"expander-cable-card5\";\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 70 {\n"
+ "+\ti2c-mux@70 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x70>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -463,16 +475,16 @@
  "+\t\tstatus = \"okay\";\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c4mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c4mux0chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
- "+\t\t\teeprom at 52 {\n"
+ "+\t\t\teeprom@52 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x52>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c01: pca9551 at 62 {\n"
+ "+\t\t\tpca_cable_card_c01: pca9551@62 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x62>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -481,7 +493,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c01-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -489,7 +501,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c01-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -499,16 +511,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c4mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c4mux0chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c02: pca9551 at 60 {\n"
+ "+\t\t\tpca_cable_card_c02: pca9551@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -517,7 +529,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c02-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -525,7 +537,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c02-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -535,16 +547,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c4mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c4mux0chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
- "+\t\t\teeprom at 51 {\n"
+ "+\t\t\teeprom@51 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x51>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c03: pca9551 at 61 {\n"
+ "+\t\t\tpca_cable_card_c03: pca9551@61 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x61>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -553,7 +565,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c03-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -561,7 +573,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c03-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -576,7 +588,7 @@
  "+&i2c5 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tpca3: pca9552 at 66 {\n"
+ "+\tpca3: pca9552@66 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x66>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -600,7 +612,7 @@
  "+\t\t\t\"expander-cable-card11\";\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 70 {\n"
+ "+\ti2c-mux@70 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x70>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -608,16 +620,16 @@
  "+\t\tstatus = \"okay\";\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c5mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c5mux0chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c04: pca9551 at 60 {\n"
+ "+\t\t\tpca_cable_card_c04: pca9551@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -626,7 +638,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c04-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -634,7 +646,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c04-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -644,16 +656,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c5mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c5mux0chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
- "+\t\t\teeprom at 51 {\n"
+ "+\t\t\teeprom@51 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x51>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c05: pca9551 at 61 {\n"
+ "+\t\t\tpca_cable_card_c05: pca9551@61 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x61>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -662,7 +674,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c05-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -670,7 +682,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c05-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -680,16 +692,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c5mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c5mux0chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
- "+\t\t\teeprom at 52 {\n"
+ "+\t\t\teeprom@52 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x52>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c06: pca9551 at 62 {\n"
+ "+\t\t\tpca_cable_card_c06: pca9551@62 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x62>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -698,7 +710,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c06-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -706,7 +718,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c06-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -716,16 +728,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c5mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c5mux0chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c07: pca9551 at 63 {\n"
+ "+\t\t\tpca_cable_card_c07: pca9551@63 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x63>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -734,7 +746,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c07-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -742,7 +754,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c07-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -757,7 +769,7 @@
  "+&i2c6 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\ti2c-mux at 70 {\n"
+ "+\ti2c-mux@70 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x70>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -765,16 +777,16 @@
  "+\t\tstatus = \"okay\";\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c6mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c6mux0chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c08: pca9551 at 60 {\n"
+ "+\t\t\tpca_cable_card_c08: pca9551@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -783,7 +795,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c08-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -791,7 +803,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c08-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -801,16 +813,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c6mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c6mux0chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
- "+\t\t\teeprom at 52 {\n"
+ "+\t\t\teeprom@52 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x52>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c09: pca9551 at 62 {\n"
+ "+\t\t\tpca_cable_card_c09: pca9551@62 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x62>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -819,7 +831,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c09-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -827,7 +839,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c09-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -837,16 +849,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c6mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c6mux0chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c10: pca9551 at 63 {\n"
+ "+\t\t\tpca_cable_card_c10: pca9551@63 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x63>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -855,7 +867,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c10-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -863,7 +875,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c10-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -873,16 +885,16 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c6mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c6mux0chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
- "+\t\t\teeprom at 51 {\n"
+ "+\t\t\teeprom@51 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x51>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_cable_card_c11: pca9551 at 61 {\n"
+ "+\t\t\tpca_cable_card_c11: pca9551@61 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x61>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -891,7 +903,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c11-cxp-top\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -899,7 +911,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"cablecard-c11-cxp-bot\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -910,7 +922,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tpca_pcie_slot: pca9552 at 65 {\n"
+ "+\tpca_pcie_slot: pca9552@65 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x65>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -919,7 +931,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"pcieslot-c01\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -927,7 +939,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"pcieslot-c02\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -935,7 +947,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"pcieslot-c03\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -943,7 +955,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"pcieslot-c04\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -951,7 +963,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"pcieslot-c05\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -959,7 +971,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"pcieslot-c06\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -967,7 +979,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\tlabel = \"pcieslot-c07\";\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -975,7 +987,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"pcieslot-c08\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -983,7 +995,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"pcieslot-c09\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -991,7 +1003,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"pcieslot-c10\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -999,7 +1011,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"pcieslot-c11\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1012,7 +1024,7 @@
  "+&i2c7 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tpic0_dimm: pca9552 at 31 {\n"
+ "+\tpic0_dimm: pca9552@31 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x31>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1021,7 +1033,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\tlabel = \"ddimm0\";\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1029,7 +1041,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"ddimm1\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1037,7 +1049,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"ddimm2\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1045,7 +1057,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"ddimm3\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1053,7 +1065,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"ddimm4\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1061,7 +1073,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"ddimm5\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1069,7 +1081,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"ddimm6\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1077,7 +1089,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\tlabel = \"ddimm7\";\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1085,7 +1097,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"ddimm8\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1093,7 +1105,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"ddimm9\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1101,7 +1113,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"ddimm10\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1109,7 +1121,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"ddimm11\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1117,7 +1129,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\tlabel = \"ddimm12\";\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1125,7 +1137,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\tlabel = \"ddimm13\";\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1133,7 +1145,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\tlabel = \"ddimm14\";\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1141,7 +1153,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\tlabel = \"ddimm15\";\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1150,7 +1162,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tpic1_dimm: pca9552 at 32 {\n"
+ "+\tpic1_dimm: pca9552@32 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x32>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1159,7 +1171,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\tlabel = \"ddimm16\";\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1167,7 +1179,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"ddimm17\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1175,7 +1187,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"ddimm18\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1183,7 +1195,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"ddimm19\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1191,7 +1203,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"ddimm20\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1199,7 +1211,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"ddimm21\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1207,7 +1219,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"ddimm22\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1215,7 +1227,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\tlabel = \"ddimm23\";\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1223,7 +1235,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"ddimm24\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1231,7 +1243,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"ddimm25\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1239,7 +1251,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"ddimm26\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1247,7 +1259,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"ddimm27\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1255,7 +1267,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\tlabel = \"ddimm28\";\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1263,7 +1275,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\tlabel = \"ddimm29\";\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1271,7 +1283,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\tlabel = \"ddimm30\";\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1279,7 +1291,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\tlabel = \"ddimm31\";\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1288,7 +1300,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tpic2_dimm: pca9552 at 33 {\n"
+ "+\tpic2_dimm: pca9552@33 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x33>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1297,7 +1309,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\tlabel = \"ddimm32\";\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1305,7 +1317,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"ddimm33\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1313,7 +1325,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"ddimm34\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1321,7 +1333,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"ddimm35\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1329,7 +1341,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"ddimm36\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1337,7 +1349,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"ddimm37\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1345,7 +1357,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"ddimm38\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1353,7 +1365,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\tlabel = \"ddimm39\";\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1361,7 +1373,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"ddimm40\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1369,7 +1381,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"ddimm41\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1377,7 +1389,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"ddimm42\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1385,7 +1397,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"ddimm43\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1393,7 +1405,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\tlabel = \"ddimm44\";\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1401,7 +1413,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\tlabel = \"ddimm45\";\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1409,7 +1421,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\tlabel = \"ddimm46\";\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1417,7 +1429,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\tlabel = \"ddimm47\";\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1426,7 +1438,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tpic3_dimm: pca9552 at 30 {\n"
+ "+\tpic3_dimm: pca9552@30 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x30>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1435,7 +1447,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\tlabel = \"ddimm48\";\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1443,7 +1455,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"ddimm49\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1451,7 +1463,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"ddimm50\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1459,7 +1471,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"ddimm51\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1467,7 +1479,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"ddimm52\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1475,7 +1487,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"ddimm53\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1483,7 +1495,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"ddimm54\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1491,7 +1503,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\tlabel = \"ddimm55\";\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1499,7 +1511,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"ddimm56\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1507,7 +1519,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"ddimm57\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1515,7 +1527,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"ddimm58\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1523,7 +1535,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"ddimm59\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1531,7 +1543,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\tlabel = \"ddimm60\";\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1539,7 +1551,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\tlabel = \"ddimm61\";\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1547,7 +1559,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\tlabel = \"ddimm62\";\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1555,7 +1567,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\tlabel = \"ddimm63\";\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1564,7 +1576,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tpic0_vrm_misc: pca9552 at 34 {\n"
+ "+\tpic0_vrm_misc: pca9552@34 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x34>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1573,7 +1585,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\tlabel = \"planar\";\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1581,7 +1593,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"tpm\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1589,7 +1601,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"cpu3-c61\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1597,7 +1609,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"cpu0-c14\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1605,7 +1617,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"opencapi-connector3\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1613,7 +1625,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"opencapi-connector4\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1621,7 +1633,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"opencapi-connector5\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1629,7 +1641,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"vrm4\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1637,7 +1649,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"vrm5\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1645,7 +1657,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"vrm6\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1653,7 +1665,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"vrm7\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1661,7 +1673,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\tlabel = \"vrm12\";\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1669,7 +1681,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\tlabel = \"vrm13\";\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1677,7 +1689,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\tlabel = \"vrm14\";\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1685,7 +1697,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\tlabel = \"vrm15\";\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1694,7 +1706,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tpic1_vrm_misc: pca9552 at 35 {\n"
+ "+\tpic1_vrm_misc: pca9552@35 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x35>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1703,7 +1715,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\tlabel = \"dasd-backplane\";\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1711,7 +1723,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\tlabel = \"power-distribution\";\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1719,7 +1731,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\tlabel = \"cpu1-c19\";\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1727,7 +1739,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\tlabel = \"cpu2-c56\";\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1735,7 +1747,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\tlabel = \"opencapi-connector0\";\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1743,7 +1755,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\tlabel = \"opencapi-connector1\";\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1751,7 +1763,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\tlabel = \"opencapi-connector2\";\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1759,7 +1771,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\tlabel = \"vrm0\";\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1767,7 +1779,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\tlabel = \"vrm1\";\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1775,7 +1787,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\tlabel = \"vrm2\";\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1783,7 +1795,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\tlabel = \"vrm3\";\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1791,7 +1803,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\tlabel = \"vrm8\";\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1799,7 +1811,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\tlabel = \"vrm9\";\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1807,7 +1819,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\tlabel = \"vrm10\";\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1815,7 +1827,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\tlabel = \"vrm11\";\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tretain-state-shutdown;\n"
@@ -1828,27 +1840,27 @@
  "+&i2c8 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tucd90320 at 11 {\n"
+ "+\tucd90320@11 {\n"
  "+\t\tcompatible = \"ti,ucd90320\";\n"
  "+\t\treg = <0x11>;\n"
  "+\t};\n"
  "+\n"
- "+\trtc at 32 {\n"
+ "+\trtc@32 {\n"
  "+\t\tcompatible = \"epson,rx8900\";\n"
  "+\t\treg = <0x32>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 51 {\n"
+ "+\teeprom@51 {\n"
  "+\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\treg = <0x51>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 50 {\n"
+ "+\teeprom@50 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x50>;\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 70 {\n"
+ "+\ti2c-mux@70 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x70>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1856,13 +1868,13 @@
  "+\t\tstatus = \"okay\";\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c8mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c8mux0chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c8mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c8mux0chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
@@ -1873,22 +1885,22 @@
  "+&i2c9 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\teeprom at 50 {\n"
+ "+\teeprom@50 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x50>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 51 {\n"
+ "+\teeprom@51 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x51>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 53 {\n"
+ "+\teeprom@53 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x53>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 52 {\n"
+ "+\teeprom@52 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x52>;\n"
  "+\t};\n"
@@ -1897,22 +1909,22 @@
  "+&i2c10 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\teeprom at 51 {\n"
+ "+\teeprom@51 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x51>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 50 {\n"
+ "+\teeprom@50 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x50>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 53 {\n"
+ "+\teeprom@53 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x53>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 52 {\n"
+ "+\teeprom@52 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x52>;\n"
  "+\t};\n"
@@ -1921,22 +1933,22 @@
  "+&i2c11 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\teeprom at 51 {\n"
+ "+\teeprom@51 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x51>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 50 {\n"
+ "+\teeprom@50 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x50>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 53 {\n"
+ "+\teeprom@53 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x53>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 52 {\n"
+ "+\teeprom@52 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x52>;\n"
  "+\t};\n"
@@ -1945,7 +1957,7 @@
  "+&i2c12 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\ttpm at 2e {\n"
+ "+\ttpm@2e {\n"
  "+\t\tcompatible = \"nuvoton,npct75x\", \"tcg,tpm-tis-i2c\";\n"
  "+\t\treg = <0x2e>;\n"
  "+\t\tmemory-region = <&event_log>;\n"
@@ -1955,22 +1967,22 @@
  "+&i2c13 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\teeprom at 51 {\n"
+ "+\teeprom@51 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x51>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 50 {\n"
+ "+\teeprom@50 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x50>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 53 {\n"
+ "+\teeprom@53 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x53>;\n"
  "+\t};\n"
  "+\n"
- "+\teeprom at 52 {\n"
+ "+\teeprom@52 {\n"
  "+\t\tcompatible = \"atmel,24c128\";\n"
  "+\t\treg = <0x52>;\n"
  "+\t};\n"
@@ -1980,12 +1992,12 @@
  "+\tmulti-master;\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tibm-panel at 62 {\n"
+ "+\tibm-panel@62 {\n"
  "+\t\tcompatible = \"ibm,op-panel\";\n"
  "+\t\treg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>;\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 70 {\n"
+ "+\ti2c-mux@70 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x70>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1993,36 +2005,36 @@
  "+\t\tstatus = \"okay\";\n"
  "+\t\tidle-state = <1>;\n"
  "+\n"
- "+\t\ti2c14mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c14mux0chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c14mux0chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
- "+\t\t\teeprom at 51 {\n"
+ "+\t\t\teeprom@51 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c32\";\n"
  "+\t\t\t\treg = <0x51>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c14mux0chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c32\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_oppanel: pca9551 at 60 {\n"
+ "+\t\t\tpca_oppanel: pca9551@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -2031,7 +2043,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"front-sys-id0\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2039,7 +2051,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"front-check-log0\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2047,7 +2059,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 2 {\n"
+ "+\t\t\t\tled@2 {\n"
  "+\t\t\t\t\tlabel = \"front-enc-fault1\";\n"
  "+\t\t\t\t\treg = <2>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2055,7 +2067,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 3 {\n"
+ "+\t\t\t\tled@3 {\n"
  "+\t\t\t\t\tlabel = \"front-sys-pwron0\";\n"
  "+\t\t\t\t\treg = <3>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2065,19 +2077,19 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c14mux0chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
  "+\n"
- "+\t\t\tmax31785 at 52 {\n"
+ "+\t\t\tmax31785@52 {\n"
  "+\t\t\t\tcompatible = \"maxim,max31785a\";\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <0x52>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca_fan_nvme: pca9552 at 60 {\n"
+ "+\t\t\tpca_fan_nvme: pca9552@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -2086,7 +2098,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\tlabel = \"nvme0\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2094,7 +2106,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\tlabel = \"nvme1\";\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2102,7 +2114,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 2 {\n"
+ "+\t\t\t\tled@2 {\n"
  "+\t\t\t\t\tlabel = \"nvme2\";\n"
  "+\t\t\t\t\treg = <2>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2110,7 +2122,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 3 {\n"
+ "+\t\t\t\tled@3 {\n"
  "+\t\t\t\t\tlabel = \"nvme3\";\n"
  "+\t\t\t\t\treg = <3>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2118,7 +2130,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 4 {\n"
+ "+\t\t\t\tled@4 {\n"
  "+\t\t\t\t\tlabel = \"nvme4\";\n"
  "+\t\t\t\t\treg = <4>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2126,7 +2138,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 5 {\n"
+ "+\t\t\t\tled@5 {\n"
  "+\t\t\t\t\tlabel = \"nvme5\";\n"
  "+\t\t\t\t\treg = <5>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2134,7 +2146,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 6 {\n"
+ "+\t\t\t\tled@6 {\n"
  "+\t\t\t\t\tlabel = \"nvme6\";\n"
  "+\t\t\t\t\treg = <6>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2142,7 +2154,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 7 {\n"
+ "+\t\t\t\tled@7 {\n"
  "+\t\t\t\t\tlabel = \"nvme7\";\n"
  "+\t\t\t\t\treg = <7>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2150,7 +2162,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 8 {\n"
+ "+\t\t\t\tled@8 {\n"
  "+\t\t\t\t\tlabel = \"nvme8\";\n"
  "+\t\t\t\t\treg = <8>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2158,7 +2170,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 9 {\n"
+ "+\t\t\t\tled@9 {\n"
  "+\t\t\t\t\tlabel = \"nvme9\";\n"
  "+\t\t\t\t\treg = <9>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2166,7 +2178,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 10 {\n"
+ "+\t\t\t\tled@10 {\n"
  "+\t\t\t\t\tlabel = \"fan0\";\n"
  "+\t\t\t\t\treg = <10>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2174,7 +2186,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 11 {\n"
+ "+\t\t\t\tled@11 {\n"
  "+\t\t\t\t\tlabel = \"fan1\";\n"
  "+\t\t\t\t\treg = <11>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2182,7 +2194,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 12 {\n"
+ "+\t\t\t\tled@12 {\n"
  "+\t\t\t\t\tlabel = \"fan2\";\n"
  "+\t\t\t\t\treg = <12>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2190,7 +2202,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 13 {\n"
+ "+\t\t\t\tled@13 {\n"
  "+\t\t\t\t\tlabel = \"fan3\";\n"
  "+\t\t\t\t\treg = <13>;\n"
  "+\t\t\t\t\tretain-state-shutdown;\n"
@@ -2199,7 +2211,7 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca0: pca9552 at 61 {\n"
+ "+\t\t\tpca0: pca9552@61 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
@@ -2220,7 +2232,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 71 {\n"
+ "+\ti2c-mux@71 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x71>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -2228,41 +2240,41 @@
  "+\t\tstatus = \"okay\";\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c14mux1chn0: i2c at 0 {\n"
+ "+\t\ti2c14mux1chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c32\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux1chn1: i2c at 1 {\n"
+ "+\t\ti2c14mux1chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c32\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux1chn2: i2c at 2 {\n"
+ "+\t\ti2c14mux1chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c32\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux1chn3: i2c at 3 {\n"
+ "+\t\ti2c14mux1chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
- "+\t\t\teeprom at 50 {\n"
+ "+\t\t\teeprom@50 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c32\";\n"
  "+\t\t\t\treg = <0x50>;\n"
  "+\t\t\t};\n"
@@ -2273,146 +2285,146 @@
  "+&i2c15 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\ti2c-mux at 70 {\n"
+ "+\ti2c-mux@70 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x70>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c15mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c15mux0chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c15mux0chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c15mux0chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c15mux0chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 71 {\n"
+ "+\ti2c-mux@71 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x71>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c15mux1chn0: i2c at 0 {\n"
+ "+\t\ti2c15mux1chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux1chn1: i2c at 1 {\n"
+ "+\t\ti2c15mux1chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux1chn2: i2c at 2 {\n"
+ "+\t\ti2c15mux1chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux1chn3: i2c at 3 {\n"
+ "+\t\ti2c15mux1chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\ti2c-mux at 72 {\n"
+ "+\ti2c-mux@72 {\n"
  "+\t\tcompatible = \"nxp,pca9546\";\n"
  "+\t\treg = <0x72>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c15mux2chn0: i2c at 0 {\n"
+ "+\t\ti2c15mux2chn0: i2c@0 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <0>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux2chn1: i2c at 1 {\n"
+ "+\t\ti2c15mux2chn1: i2c@1 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <1>;\n"
  "+\n"
- "+\t\t\teeprom at 53 {\n"
+ "+\t\t\teeprom@53 {\n"
  "+\t\t\t\tcompatible = \"atmel,24c64\";\n"
  "+\t\t\t\treg = <0x53>;\n"
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux2chn2: i2c at 2 {\n"
+ "+\t\ti2c15mux2chn2: i2c@2 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux2chn3: i2c at 3 {\n"
+ "+\t\ti2c15mux2chn3: i2c@3 {\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t\treg = <3>;\n"
@@ -2519,46 +2531,46 @@
  "+#include \"ibm-power11-quad.dtsi\"\n"
  "+\n"
  "+&fsi_hub0 {\n"
- "+\tcfam at 4,0 { /* DCM2_C0 */\n"
+ "+\tcfam@4,0 { /* DCM2_C0 */\n"
  "+\t\treg = <4 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <4>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam4_i2c0: i2c-bus at 0 {\n"
+ "+\t\t\tcfam4_i2c0: i2c-bus@0 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <0>;\t/* OM01 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom500: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom500: 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\tsbefifo500: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo500: 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\t#address-cells = <1>;\n"
@@ -2568,29 +2580,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c1: i2c-bus at 1 {\n"
+ "+\t\t\tcfam4_i2c1: i2c-bus@1 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <1>;\t/* OM23 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom501: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom501: 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\tsbefifo501: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo501: 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\t#address-cells = <1>;\n"
@@ -2600,29 +2612,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam4_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom510: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom510: 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\tsbefifo510: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo510: 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\t#address-cells = <1>;\n"
@@ -2632,29 +2644,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam4_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom511: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom511: 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\tsbefifo511: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo511: 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\t#address-cells = <1>;\n"
@@ -2664,29 +2676,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c12: i2c-bus at c {\n"
+ "+\t\t\tcfam4_i2c12: i2c-bus@c {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <12>;\t/* OP4A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom512: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom512: 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\tsbefifo512: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo512: 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\t#address-cells = <1>;\n"
@@ -2696,29 +2708,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c13: i2c-bus at d {\n"
+ "+\t\t\tcfam4_i2c13: i2c-bus@d {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <13>;\t/* OP4B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom513: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom513: 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\tsbefifo513: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo513: 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\t#address-cells = <1>;\n"
@@ -2728,29 +2740,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam4_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom514: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom514: 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\tsbefifo514: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo514: 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\t#address-cells = <1>;\n"
@@ -2760,29 +2772,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam4_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom515: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom515: 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\tsbefifo515: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo515: 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\t#address-cells = <1>;\n"
@@ -2793,19 +2805,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\tcfam4_spi0: spi at 0 {\n"
+ "+\t\t\tcfam4_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -2815,13 +2827,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_spi1: spi at 20 {\n"
+ "+\t\t\tcfam4_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -2831,13 +2843,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_spi2: spi at 40 {\n"
+ "+\t\t\tcfam4_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -2847,13 +2859,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam4_spi3: spi at 60 {\n"
+ "+\t\t\tcfam4_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -2864,7 +2876,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -2880,7 +2892,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub4: hub at 3400 {\n"
+ "+\t\tfsi_hub4: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -2890,46 +2902,46 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tcfam at 5,0 { /* DCM2_C1 */\n"
+ "+\tcfam@5,0 { /* DCM2_C1 */\n"
  "+\t\treg = <5 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <5>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam5_i2c2: i2c-bus at 2 {\n"
+ "+\t\t\tcfam5_i2c2: i2c-bus@2 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <2>;\t/* OM45 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom602: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom602: 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\tsbefifo602: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo602: 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\t#address-cells = <1>;\n"
@@ -2939,29 +2951,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c3: i2c-bus at 3 {\n"
+ "+\t\t\tcfam5_i2c3: i2c-bus@3 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <3>;\t/* OM67 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom603: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom603: 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\tsbefifo603: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo603: 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\t#address-cells = <1>;\n"
@@ -2971,29 +2983,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam5_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom610: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom610: 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\tsbefifo610: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo610: 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\t#address-cells = <1>;\n"
@@ -3003,29 +3015,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam5_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom611: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom611: 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\tsbefifo611: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo611: 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\t#address-cells = <1>;\n"
@@ -3035,29 +3047,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam5_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom614: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom614: 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\tsbefifo614: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo614: 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\t#address-cells = <1>;\n"
@@ -3067,29 +3079,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam5_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom615: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom615: 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\tsbefifo615: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo615: 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\t#address-cells = <1>;\n"
@@ -3099,29 +3111,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c16: i2c-bus at 10 {\n"
+ "+\t\t\tcfam5_i2c16: i2c-bus@10 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <16>;\t/* OP6A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom616: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom616: 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\tsbefifo616: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo616: 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\t#address-cells = <1>;\n"
@@ -3131,29 +3143,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_i2c17: i2c-bus at 11 {\n"
+ "+\t\t\tcfam5_i2c17: i2c-bus@11 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <17>;\t/* OP6B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom617: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom617: 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\tsbefifo617: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo617: 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\t#address-cells = <1>;\n"
@@ -3164,19 +3176,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\tcfam5_spi0: spi at 0 {\n"
+ "+\t\t\tcfam5_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3186,13 +3198,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_spi1: spi at 20 {\n"
+ "+\t\t\tcfam5_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3202,13 +3214,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_spi2: spi at 40 {\n"
+ "+\t\t\tcfam5_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3218,13 +3230,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam5_spi3: spi at 60 {\n"
+ "+\t\t\tcfam5_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3235,7 +3247,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -3251,7 +3263,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub5: hub at 3400 {\n"
+ "+\t\tfsi_hub5: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -3261,46 +3273,46 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tcfam at 6,0 { /* DCM3_C0 */\n"
+ "+\tcfam@6,0 { /* DCM3_C0 */\n"
  "+\t\treg = <6 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <6>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam6_i2c0: i2c-bus at 0 {\n"
+ "+\t\t\tcfam6_i2c0: i2c-bus@0 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <0>;\t/* OM01 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom700: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom700: 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\tsbefifo700: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo700: 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\t#address-cells = <1>;\n"
@@ -3310,29 +3322,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c1: i2c-bus at 1 {\n"
+ "+\t\t\tcfam6_i2c1: i2c-bus@1 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <1>;\t/* OM23 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom701: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom701: 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\tsbefifo701: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo701: 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\t#address-cells = <1>;\n"
@@ -3342,29 +3354,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam6_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom710: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom710: 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\tsbefifo710: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo710: 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\t#address-cells = <1>;\n"
@@ -3374,29 +3386,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam6_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom711: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom711: 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\tsbefifo711: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo711: 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\t#address-cells = <1>;\n"
@@ -3406,29 +3418,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c12: i2c-bus at c {\n"
+ "+\t\t\tcfam6_i2c12: i2c-bus@c {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <12>;\t/* OP4A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom712: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom712: 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\tsbefifo712: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo712: 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\t#address-cells = <1>;\n"
@@ -3438,29 +3450,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c13: i2c-bus at d {\n"
+ "+\t\t\tcfam6_i2c13: i2c-bus@d {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <13>;\t/* OP4B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom713: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom713: 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\tsbefifo713: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo713: 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\t#address-cells = <1>;\n"
@@ -3470,29 +3482,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam6_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom714: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom714: 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\tsbefifo714: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo714: 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\t#address-cells = <1>;\n"
@@ -3502,29 +3514,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam6_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom715: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom715: 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\tsbefifo715: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo715: 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\t#address-cells = <1>;\n"
@@ -3535,19 +3547,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\tcfam6_spi0: spi at 0 {\n"
+ "+\t\t\tcfam6_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3557,13 +3569,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_spi1: spi at 20 {\n"
+ "+\t\t\tcfam6_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3573,13 +3585,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_spi2: spi at 40 {\n"
+ "+\t\t\tcfam6_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3589,13 +3601,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam6_spi3: spi at 60 {\n"
+ "+\t\t\tcfam6_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3606,7 +3618,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -3622,7 +3634,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub6: hub at 3400 {\n"
+ "+\t\tfsi_hub6: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -3632,46 +3644,46 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tcfam at 7,0 { /* DCM3_C1 */\n"
+ "+\tcfam@7,0 { /* DCM3_C1 */\n"
  "+\t\treg = <7 0>;\n"
  "+\t\t#address-cells = <1>;\n"
  "+\t\t#size-cells = <1>;\n"
  "+\t\tchip-id = <7>;\n"
  "+\n"
- "+\t\tscom at 1000 {\n"
+ "+\t\tscom@1000 {\n"
  "+\t\t\tcompatible = \"ibm,fsi2pib\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam7_i2c2: i2c-bus at 2 {\n"
+ "+\t\t\tcfam7_i2c2: i2c-bus@2 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <2>;\t/* OM45 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom802: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom802: 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\tsbefifo802: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo802: 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\t#address-cells = <1>;\n"
@@ -3681,29 +3693,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c3: i2c-bus at 3 {\n"
+ "+\t\t\tcfam7_i2c3: i2c-bus@3 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <3>;\t/* OM67 */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom803: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom803: 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\tsbefifo803: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo803: 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\t#address-cells = <1>;\n"
@@ -3713,29 +3725,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c10: i2c-bus at a {\n"
+ "+\t\t\tcfam7_i2c10: i2c-bus@a {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <10>;\t/* OP3A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom810: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom810: 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\tsbefifo810: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo810: 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\t#address-cells = <1>;\n"
@@ -3745,29 +3757,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c11: i2c-bus at b {\n"
+ "+\t\t\tcfam7_i2c11: i2c-bus@b {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <11>;\t/* OP3B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom811: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom811: 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\tsbefifo811: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo811: 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\t#address-cells = <1>;\n"
@@ -3777,29 +3789,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c14: i2c-bus at e {\n"
+ "+\t\t\tcfam7_i2c14: i2c-bus@e {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <14>;\t/* OP5A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom814: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom814: 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\tsbefifo814: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo814: 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\t#address-cells = <1>;\n"
@@ -3809,29 +3821,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c15: i2c-bus at f {\n"
+ "+\t\t\tcfam7_i2c15: i2c-bus@f {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <15>;\t/* OP5B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom815: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom815: 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\tsbefifo815: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo815: 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\t#address-cells = <1>;\n"
@@ -3841,29 +3853,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c16: i2c-bus at 10 {\n"
+ "+\t\t\tcfam7_i2c16: i2c-bus@10 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <16>;\t/* OP6A */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom816: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom816: 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\tsbefifo816: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo816: 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\t#address-cells = <1>;\n"
@@ -3873,29 +3885,29 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_i2c17: i2c-bus at 11 {\n"
+ "+\t\t\tcfam7_i2c17: i2c-bus@11 {\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t\treg = <17>;\t/* OP6B */\n"
  "+\n"
- "+\t\t\t\tfsi-i2cr at 20 {\n"
+ "+\t\t\t\tfsi-i2cr@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\tscom817: scom at 1000 {\n"
+ "+\t\t\t\t\t\tscom817: 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\tsbefifo817: sbefifo at 2400 {\n"
+ "+\t\t\t\t\t\tsbefifo817: 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\t#address-cells = <1>;\n"
@@ -3906,19 +3918,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\tcfam7_spi0: spi at 0 {\n"
+ "+\t\t\tcfam7_spi0: spi@0 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3928,13 +3940,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_spi1: spi at 20 {\n"
+ "+\t\t\tcfam7_spi1: spi@20 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3944,13 +3956,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_spi2: spi at 40 {\n"
+ "+\t\t\tcfam7_spi2: spi@40 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3960,13 +3972,13 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tcfam7_spi3: spi at 60 {\n"
+ "+\t\t\tcfam7_spi3: spi@60 {\n"
  "+\t\t\t\tcompatible = \"ibm,p10-spi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tsize = <0x80000>;\n"
@@ -3977,7 +3989,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
@@ -3993,7 +4005,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi_hub7: hub at 3400 {\n"
+ "+\t\tfsi_hub7: hub@3400 {\n"
  "+\t\t\tcompatible = \"ibm,hub-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -4023,4 +4035,4 @@
  "-- \n"
  2.39.3
 
-1626f764c088c2c5d6ebd7380517a464405e2b5ae6abc2f83e27999982767400
+4954dd816d25b89cf0f4ed598491232e750ba09c8a35c2233311be4f0e52f89a

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.