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

diff --git a/a/1.txt b/N1/1.txt
index 7624988..e7b930f 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -201,7 +201,7 @@ index 0000000000000..d2aa961eea313
 +		stdout-path = &uart5;
 +	};
 +
-+	memory at 80000000 {
++	memory@80000000 {
 +		device_type = "memory";
 +		reg = <0x80000000 0x40000000>;
 +	};
@@ -211,12 +211,12 @@ index 0000000000000..d2aa961eea313
 +		#size-cells = <1>;
 +		ranges;
 +
-+		event_log: region at b3d00000 {
++		event_log: region@b3d00000 {
 +			reg = <0xb3d00000 0x100000>;
 +			no-map;
 +		};
 +
-+		ramoops at b3e00000 {
++		ramoops@b3e00000 {
 +			compatible = "ramoops";
 +			reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */
 +			record-size = <0x8000>;
@@ -227,13 +227,13 @@ index 0000000000000..d2aa961eea313
 +		};
 +
 +		/* LPC FW cycle bridge region requires natural alignment */
-+		flash_memory: region at b4000000 {
++		flash_memory: region@b4000000 {
 +			reg = <0xb4000000 0x04000000>; /* 64M */
 +			no-map;
 +		};
 +
 +		/* VGA region is dictated by hardware strapping */
-+		vga_memory: region at bf000000 {
++		vga_memory: region@bf000000 {
 +			compatible = "shared-dma-pool";
 +			reg = <0xbf000000 0x01000000>; /* 16M */
 +			no-map;
@@ -356,12 +356,12 @@ index 0000000000000..d2aa961eea313
 +&i2c0 {
 +	status = "okay";
 +
-+	eeprom at 51 {
++	eeprom@51 {
 +		compatible = "atmel,24c64";
 +		reg = <0x51>;
 +	};
 +
-+	led-controller at 62 {
++	led-controller@62 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x62>;
 +		#address-cells = <1>;
@@ -399,27 +399,27 @@ index 0000000000000..d2aa961eea313
 +&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>;
 +	};
@@ -428,7 +428,7 @@ index 0000000000000..d2aa961eea313
 +&i2c4 {
 +	status = "okay";
 +
-+	led-controller at 65 {
++	led-controller@65 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x65>;
 +		#address-cells = <1>;
@@ -449,24 +449,24 @@ index 0000000000000..d2aa961eea313
 +			"expander-cable-card5";
 +	};
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c4mux0chn0: i2c at 0 {
++		i2c4mux0chn0: i2c@0 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 52 {
++			eeprom@52 {
 +				compatible = "atmel,24c64";
 +				reg = <0x52>;
 +			};
 +
-+			led-controller at 62 {
++			led-controller@62 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x62>;
 +				#address-cells = <1>;
@@ -474,7 +474,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c01-cxp-top";
@@ -482,7 +482,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c01-cxp-bot";
@@ -492,17 +492,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c4mux0chn1: i2c at 1 {
++		i2c4mux0chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +
-+			led-controller at 60 {
++			led-controller@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -510,7 +510,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c02-cxp-top";
@@ -518,7 +518,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c02-cxp-bot";
@@ -528,17 +528,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c4mux0chn2: i2c at 2 {
++		i2c4mux0chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c64";
 +				reg = <0x51>;
 +			};
 +
-+			led-controller at 61 {
++			led-controller@61 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x61>;
 +				#address-cells = <1>;
@@ -546,7 +546,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c03-cxp-top";
@@ -554,7 +554,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c03-cxp-bot";
@@ -569,7 +569,7 @@ index 0000000000000..d2aa961eea313
 +&i2c5 {
 +	status = "okay";
 +
-+	led-controller at 66 {
++	led-controller@66 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x66>;
 +		#address-cells = <1>;
@@ -592,24 +592,24 @@ index 0000000000000..d2aa961eea313
 +			"expander-cable-card11";
 +	};
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c5mux0chn0: i2c at 0 {
++		i2c5mux0chn0: i2c@0 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +
-+			led-controller at 60 {
++			led-controller@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -617,7 +617,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c04-cxp-top";
@@ -625,7 +625,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c04-cxp-bot";
@@ -635,17 +635,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c5mux0chn1: i2c at 1 {
++		i2c5mux0chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c64";
 +				reg = <0x51>;
 +			};
 +
-+			led-controller at 61 {
++			led-controller@61 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x61>;
 +				#address-cells = <1>;
@@ -653,7 +653,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c05-cxp-top";
@@ -661,7 +661,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c05-cxp-bot";
@@ -671,17 +671,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c5mux0chn2: i2c at 2 {
++		i2c5mux0chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 52 {
++			eeprom@52 {
 +				compatible = "atmel,24c64";
 +				reg = <0x52>;
 +			};
 +
-+			led-controller at 62 {
++			led-controller@62 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x62>;
 +				#address-cells = <1>;
@@ -689,7 +689,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c06-cxp-top";
@@ -697,7 +697,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c06-cxp-bot";
@@ -707,17 +707,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c5mux0chn3: i2c at 3 {
++		i2c5mux0chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +
-+			led-controller at 63 {
++			led-controller@63 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x63>;
 +				#address-cells = <1>;
@@ -725,7 +725,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c07-cxp-top";
@@ -733,7 +733,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c07-cxp-bot";
@@ -748,24 +748,24 @@ index 0000000000000..d2aa961eea313
 +&i2c6 {
 +	status = "okay";
 +
-+	i2c-mux at 70 {
++	i2c-mux@70 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x70>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c6mux0chn0: i2c at 0 {
++		i2c6mux0chn0: i2c@0 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +
-+			led-controller at 60 {
++			led-controller@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -773,7 +773,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c08-cxp-top";
@@ -781,7 +781,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c08-cxp-bot";
@@ -791,17 +791,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c6mux0chn1: i2c at 1 {
++		i2c6mux0chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 52 {
++			eeprom@52 {
 +				compatible = "atmel,24c64";
 +				reg = <0x52>;
 +			};
 +
-+			led-controller at 62 {
++			led-controller@62 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x62>;
 +				#address-cells = <1>;
@@ -809,7 +809,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c09-cxp-top";
@@ -817,7 +817,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c09-cxp-bot";
@@ -827,17 +827,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c6mux0chn2: i2c at 2 {
++		i2c6mux0chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +
-+			led-controller at 63 {
++			led-controller@63 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x63>;
 +				#address-cells = <1>;
@@ -845,7 +845,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c10-cxp-top";
@@ -853,7 +853,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c10-cxp-bot";
@@ -863,17 +863,17 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c6mux0chn3: i2c at 3 {
++		i2c6mux0chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c64";
 +				reg = <0x51>;
 +			};
 +
-+			led-controller at 61 {
++			led-controller@61 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x61>;
 +				#address-cells = <1>;
@@ -881,7 +881,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c11-cxp-top";
@@ -889,7 +889,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c11-cxp-bot";
@@ -900,7 +900,7 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	led-controller at 65 {
++	led-controller@65 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x65>;
 +		#address-cells = <1>;
@@ -908,7 +908,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "pcieslot-c01";
@@ -916,7 +916,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "pcieslot-c02";
@@ -924,7 +924,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "pcieslot-c03";
@@ -932,7 +932,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "pcieslot-c04";
@@ -940,7 +940,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "pcieslot-c05";
@@ -948,7 +948,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "pcieslot-c06";
@@ -956,7 +956,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "pcieslot-c07";
@@ -964,7 +964,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "pcieslot-c08";
@@ -972,7 +972,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "pcieslot-c09";
@@ -980,7 +980,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "pcieslot-c10";
@@ -988,7 +988,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "pcieslot-c11";
@@ -1001,7 +1001,7 @@ index 0000000000000..d2aa961eea313
 +&i2c7 {
 +	status = "okay";
 +
-+	led-controller at 31 {
++	led-controller@31 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x31>;
 +		#address-cells = <1>;
@@ -1009,7 +1009,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm0";
@@ -1017,7 +1017,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm1";
@@ -1025,7 +1025,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm2";
@@ -1033,7 +1033,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm3";
@@ -1041,7 +1041,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm4";
@@ -1049,7 +1049,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm5";
@@ -1057,7 +1057,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm6";
@@ -1065,7 +1065,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm7";
@@ -1073,7 +1073,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm8";
@@ -1081,7 +1081,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm9";
@@ -1089,7 +1089,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm10";
@@ -1097,7 +1097,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm11";
@@ -1105,7 +1105,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm12";
@@ -1113,7 +1113,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm13";
@@ -1121,7 +1121,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm14";
@@ -1129,7 +1129,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm15";
@@ -1138,7 +1138,7 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	led-controller at 32 {
++	led-controller@32 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x32>;
 +		#address-cells = <1>;
@@ -1146,7 +1146,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm16";
@@ -1154,7 +1154,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm17";
@@ -1162,7 +1162,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm18";
@@ -1170,7 +1170,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm19";
@@ -1178,7 +1178,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm20";
@@ -1186,7 +1186,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm21";
@@ -1194,7 +1194,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm22";
@@ -1202,7 +1202,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm23";
@@ -1210,7 +1210,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm24";
@@ -1218,7 +1218,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm25";
@@ -1226,7 +1226,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm26";
@@ -1234,7 +1234,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm27";
@@ -1242,7 +1242,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm28";
@@ -1250,7 +1250,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm29";
@@ -1258,7 +1258,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm30";
@@ -1266,7 +1266,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm31";
@@ -1275,7 +1275,7 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	led-controller at 33 {
++	led-controller@33 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x33>;
 +		#address-cells = <1>;
@@ -1283,7 +1283,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm32";
@@ -1291,7 +1291,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm33";
@@ -1299,7 +1299,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm34";
@@ -1307,7 +1307,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm35";
@@ -1315,7 +1315,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm36";
@@ -1323,7 +1323,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm37";
@@ -1331,7 +1331,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm38";
@@ -1339,7 +1339,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm39";
@@ -1347,7 +1347,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm40";
@@ -1355,7 +1355,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm41";
@@ -1363,7 +1363,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm42";
@@ -1371,7 +1371,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm43";
@@ -1379,7 +1379,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm44";
@@ -1387,7 +1387,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm45";
@@ -1395,7 +1395,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm46";
@@ -1403,7 +1403,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm47";
@@ -1412,7 +1412,7 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	led-controller at 30 {
++	led-controller@30 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x30>;
 +		#address-cells = <1>;
@@ -1420,7 +1420,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm48";
@@ -1428,7 +1428,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm49";
@@ -1436,7 +1436,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm50";
@@ -1444,7 +1444,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm51";
@@ -1452,7 +1452,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm52";
@@ -1460,7 +1460,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm53";
@@ -1468,7 +1468,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm54";
@@ -1476,7 +1476,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm55";
@@ -1484,7 +1484,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm56";
@@ -1492,7 +1492,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm57";
@@ -1500,7 +1500,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm58";
@@ -1508,7 +1508,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm59";
@@ -1516,7 +1516,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm60";
@@ -1524,7 +1524,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm61";
@@ -1532,7 +1532,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm62";
@@ -1540,7 +1540,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm63";
@@ -1549,7 +1549,7 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	led-controller at 34 {
++	led-controller@34 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x34>;
 +		#address-cells = <1>;
@@ -1557,7 +1557,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "planar";
@@ -1565,7 +1565,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "tpm";
@@ -1573,7 +1573,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "cpu3-c61";
@@ -1581,7 +1581,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "cpu0-c14";
@@ -1589,7 +1589,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "opencapi-connector3";
@@ -1597,7 +1597,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "opencapi-connector4";
@@ -1605,7 +1605,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "opencapi-connector5";
@@ -1613,7 +1613,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "vrm4";
@@ -1621,7 +1621,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "vrm5";
@@ -1629,7 +1629,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "vrm6";
@@ -1637,7 +1637,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "vrm7";
@@ -1645,7 +1645,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "vrm12";
@@ -1653,7 +1653,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "vrm13";
@@ -1661,7 +1661,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "vrm14";
@@ -1669,7 +1669,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "vrm15";
@@ -1678,7 +1678,7 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	led-controller at 35 {
++	led-controller@35 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x35>;
 +		#address-cells = <1>;
@@ -1686,7 +1686,7 @@ index 0000000000000..d2aa961eea313
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "dasd-backplane";
@@ -1694,7 +1694,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "power-distribution";
@@ -1702,7 +1702,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "cpu1-c19";
@@ -1710,7 +1710,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "cpu2-c56";
@@ -1718,7 +1718,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "opencapi-connector0";
@@ -1726,7 +1726,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "opencapi-connector1";
@@ -1734,7 +1734,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "opencapi-connector2";
@@ -1742,7 +1742,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "vrm0";
@@ -1750,7 +1750,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "vrm1";
@@ -1758,7 +1758,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "vrm2";
@@ -1766,7 +1766,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "vrm3";
@@ -1774,7 +1774,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "vrm8";
@@ -1782,7 +1782,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "vrm9";
@@ -1790,7 +1790,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "vrm10";
@@ -1798,7 +1798,7 @@ index 0000000000000..d2aa961eea313
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "vrm11";
@@ -1811,27 +1811,27 @@ index 0000000000000..d2aa961eea313
 +&i2c8 {
 +	status = "okay";
 +
-+	pmic at 11 {
++	pmic@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>;
@@ -1839,13 +1839,13 @@ index 0000000000000..d2aa961eea313
 +		i2c-mux-idle-disconnect;
 +		reset-gpio = <&gpio0 ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>;
 +
-+		i2c8mux0chn0: i2c at 0 {
++		i2c8mux0chn0: i2c@0 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +		};
 +
-+		i2c8mux0chn1: i2c at 1 {
++		i2c8mux0chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
@@ -1856,22 +1856,22 @@ index 0000000000000..d2aa961eea313
 +&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>;
 +	};
@@ -1880,22 +1880,22 @@ index 0000000000000..d2aa961eea313
 +&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>;
 +	};
@@ -1904,22 +1904,22 @@ index 0000000000000..d2aa961eea313
 +&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>;
 +	};
@@ -1928,7 +1928,7 @@ index 0000000000000..d2aa961eea313
 +&i2c12 {
 +	status = "okay";
 +
-+	tpm at 2e {
++	tpm@2e {
 +		compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
 +		reg = <0x2e>;
 +		memory-region = <&event_log>;
@@ -1938,22 +1938,22 @@ index 0000000000000..d2aa961eea313
 +&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>;
 +	};
@@ -1963,51 +1963,51 @@ index 0000000000000..d2aa961eea313
 +	multi-master;
 +	status = "okay";
 +
-+	lcd-controller at 62 {
++	lcd-controller@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>;
 +		#size-cells = <0>;
 +		idle-state = <1>;
 +
-+		i2c14mux0chn0: i2c at 0 {
++		i2c14mux0chn0: i2c@0 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c64";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux0chn1: i2c at 1 {
++		i2c14mux0chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 51 {
++			eeprom@51 {
 +				compatible = "atmel,24c32";
 +				reg = <0x51>;
 +			};
 +		};
 +
-+		i2c14mux0chn2: i2c at 2 {
++		i2c14mux0chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +
-+			led-controller at 60 {
++			led-controller@60 {
 +				compatible = "nxp,pca9551";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -2015,7 +2015,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "front-sys-id0";
@@ -2023,7 +2023,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "front-check-log0";
@@ -2031,7 +2031,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 2 {
++				led@2 {
 +					reg = <2>;
 +					default-state = "keep";
 +					label = "front-enc-fault1";
@@ -2039,7 +2039,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 3 {
++				led@3 {
 +					reg = <3>;
 +					default-state = "keep";
 +					label = "front-sys-pwron0";
@@ -2049,19 +2049,19 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		i2c14mux0chn3: i2c at 3 {
++		i2c14mux0chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			pwm at 52 {
++			pwm@52 {
 +				compatible = "maxim,max31785a";
 +				reg = <0x52>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +			};
 +
-+			led-controller at 60 {
++			led-controller@60 {
 +				compatible = "nxp,pca9552";
 +				reg = <0x60>;
 +				#address-cells = <1>;
@@ -2069,7 +2069,7 @@ index 0000000000000..d2aa961eea313
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "nvme0";
@@ -2077,7 +2077,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "nvme1";
@@ -2085,7 +2085,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 2 {
++				led@2 {
 +					reg = <2>;
 +					default-state = "keep";
 +					label = "nvme2";
@@ -2093,7 +2093,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 3 {
++				led@3 {
 +					reg = <3>;
 +					default-state = "keep";
 +					label = "nvme3";
@@ -2101,7 +2101,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 4 {
++				led@4 {
 +					reg = <4>;
 +					default-state = "keep";
 +					label = "nvme4";
@@ -2109,7 +2109,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 5 {
++				led@5 {
 +					reg = <5>;
 +					default-state = "keep";
 +					label = "nvme5";
@@ -2117,7 +2117,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 6 {
++				led@6 {
 +					reg = <6>;
 +					default-state = "keep";
 +					label = "nvme6";
@@ -2125,7 +2125,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 7 {
++				led@7 {
 +					reg = <7>;
 +					default-state = "keep";
 +					label = "nvme7";
@@ -2133,7 +2133,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 8 {
++				led@8 {
 +					reg = <8>;
 +					default-state = "keep";
 +					label = "nvme8";
@@ -2141,7 +2141,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 9 {
++				led@9 {
 +					reg = <9>;
 +					default-state = "keep";
 +					label = "nvme9";
@@ -2149,7 +2149,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 10 {
++				led@10 {
 +					reg = <10>;
 +					default-state = "keep";
 +					label = "fan0";
@@ -2157,7 +2157,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 11 {
++				led@11 {
 +					reg = <11>;
 +					default-state = "keep";
 +					label = "fan1";
@@ -2165,7 +2165,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 12 {
++				led@12 {
 +					reg = <12>;
 +					default-state = "keep";
 +					label = "fan2";
@@ -2173,7 +2173,7 @@ index 0000000000000..d2aa961eea313
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 13 {
++				led@13 {
 +					reg = <13>;
 +					default-state = "keep";
 +					label = "fan3";
@@ -2182,7 +2182,7 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			pca0: led-controller at 61 {
++			pca0: led-controller@61 {
 +				compatible = "nxp,pca9552";
 +				#address-cells = <1>;
 +				#size-cells = <0>;
@@ -2202,52 +2202,52 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	i2c-mux at 71 {
++	i2c-mux@71 {
 +		compatible = "nxp,pca9546";
 +		reg = <0x71>;
 +		#address-cells = <1>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		i2c14mux1chn0: i2c at 0 {
++		i2c14mux1chn0: i2c@0 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux1chn1: i2c at 1 {
++		i2c14mux1chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux1chn2: i2c at 2 {
++		i2c14mux1chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
 +		};
 +
-+		i2c14mux1chn3: i2c at 3 {
++		i2c14mux1chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 50 {
++			eeprom@50 {
 +				compatible = "atmel,24c32";
 +				reg = <0x50>;
 +			};
@@ -2258,146 +2258,146 @@ index 0000000000000..d2aa961eea313
 +&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 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux0chn1: i2c at 1 {
++		i2c15mux0chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux0chn2: i2c at 2 {
++		i2c15mux0chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux0chn3: i2c at 3 {
++		i2c15mux0chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			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 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux1chn1: i2c at 1 {
++		i2c15mux1chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux1chn2: i2c at 2 {
++		i2c15mux1chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux1chn3: i2c at 3 {
++		i2c15mux1chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			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 {
 +			reg = <0>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux2chn1: i2c at 1 {
++		i2c15mux2chn1: i2c@1 {
 +			reg = <1>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +
-+			eeprom at 53 {
++			eeprom@53 {
 +				compatible = "atmel,24c64";
 +				reg = <0x53>;
 +			};
 +		};
 +
-+		i2c15mux2chn2: i2c at 2 {
++		i2c15mux2chn2: i2c@2 {
 +			reg = <2>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
 +		};
 +
-+		i2c15mux2chn3: i2c at 3 {
++		i2c15mux2chn3: i2c@3 {
 +			reg = <3>;
 +			#address-cells = <1>;
 +			#size-cells = <0>;
@@ -2502,46 +2502,46 @@ index 0000000000000..d2aa961eea313
 +};
 +
 +&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,p9-scom";
 +			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 {
 +				reg = <0>;	/* OM01 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2549,29 +2549,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c1: i2c-bus at 1 {
++			cfam4_i2c1: i2c-bus@1 {
 +				reg = <1>;	/* OM23 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2579,29 +2579,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c10: i2c-bus at a {
++			cfam4_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2609,29 +2609,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c11: i2c-bus at b {
++			cfam4_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2639,29 +2639,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c12: i2c-bus at c {
++			cfam4_i2c12: i2c-bus@c {
 +				reg = <12>;	/* OP4A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2669,29 +2669,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c13: i2c-bus at d {
++			cfam4_i2c13: i2c-bus@d {
 +				reg = <13>;	/* OP4B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2699,29 +2699,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c14: i2c-bus at e {
++			cfam4_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2729,29 +2729,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_i2c15: i2c-bus at f {
++			cfam4_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2760,19 +2760,19 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -2782,13 +2782,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_spi1: spi at 20 {
++			cfam4_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -2798,13 +2798,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_spi2: spi at 40 {
++			cfam4_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -2814,13 +2814,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam4_spi3: spi at 60 {
++			cfam4_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -2831,7 +2831,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -2845,7 +2845,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -2854,46 +2854,46 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	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,p9-scom";
 +			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 {
 +				reg = <2>;	/* OM45 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2901,29 +2901,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c3: i2c-bus at 3 {
++			cfam5_i2c3: i2c-bus@3 {
 +				reg = <3>;	/* OM67 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2931,29 +2931,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c10: i2c-bus at a {
++			cfam5_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2961,29 +2961,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c11: i2c-bus at b {
++			cfam5_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -2991,29 +2991,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c14: i2c-bus at e {
++			cfam5_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3021,29 +3021,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c15: i2c-bus at f {
++			cfam5_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3051,29 +3051,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c16: i2c-bus at 10 {
++			cfam5_i2c16: i2c-bus@10 {
 +				reg = <16>;	/* OP6A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3081,29 +3081,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_i2c17: i2c-bus at 11 {
++			cfam5_i2c17: i2c-bus@11 {
 +				reg = <17>;	/* OP6B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3112,19 +3112,19 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3134,13 +3134,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_spi1: spi at 20 {
++			cfam5_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3150,13 +3150,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_spi2: spi at 40 {
++			cfam5_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3166,13 +3166,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam5_spi3: spi at 60 {
++			cfam5_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3183,7 +3183,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -3197,7 +3197,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -3206,46 +3206,46 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	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,p9-scom";
 +			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 {
 +				reg = <0>;	/* OM01 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3253,29 +3253,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c1: i2c-bus at 1 {
++			cfam6_i2c1: i2c-bus@1 {
 +				reg = <1>;	/* OM23 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3283,29 +3283,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c10: i2c-bus at a {
++			cfam6_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3313,29 +3313,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c11: i2c-bus at b {
++			cfam6_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3343,29 +3343,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c12: i2c-bus at c {
++			cfam6_i2c12: i2c-bus@c {
 +				reg = <12>;	/* OP4A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3373,29 +3373,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c13: i2c-bus at d {
++			cfam6_i2c13: i2c-bus@d {
 +				reg = <13>;	/* OP4B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3403,29 +3403,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c14: i2c-bus at e {
++			cfam6_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3433,29 +3433,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_i2c15: i2c-bus at f {
++			cfam6_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3464,19 +3464,19 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3486,13 +3486,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_spi1: spi at 20 {
++			cfam6_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3502,13 +3502,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_spi2: spi at 40 {
++			cfam6_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3518,13 +3518,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam6_spi3: spi at 60 {
++			cfam6_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3535,7 +3535,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -3549,7 +3549,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -3558,46 +3558,46 @@ index 0000000000000..d2aa961eea313
 +		};
 +	};
 +
-+	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,p9-scom";
 +			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 {
 +				reg = <2>;	/* OM45 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3605,29 +3605,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c3: i2c-bus at 3 {
++			cfam7_i2c3: i2c-bus@3 {
 +				reg = <3>;	/* OM67 */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3635,29 +3635,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c10: i2c-bus at a {
++			cfam7_i2c10: i2c-bus@a {
 +				reg = <10>;	/* OP3A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3665,29 +3665,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c11: i2c-bus at b {
++			cfam7_i2c11: i2c-bus@b {
 +				reg = <11>;	/* OP3B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3695,29 +3695,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c14: i2c-bus at e {
++			cfam7_i2c14: i2c-bus@e {
 +				reg = <14>;	/* OP5A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3725,29 +3725,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c15: i2c-bus at f {
++			cfam7_i2c15: i2c-bus@f {
 +				reg = <15>;	/* OP5B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3755,29 +3755,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c16: i2c-bus at 10 {
++			cfam7_i2c16: i2c-bus@10 {
 +				reg = <16>;	/* OP6A */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3785,29 +3785,29 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_i2c17: i2c-bus at 11 {
++			cfam7_i2c17: i2c-bus@11 {
 +				reg = <17>;	/* OP6B */
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				fsi at 20 {
++				fsi@20 {
 +					compatible = "ibm,i2cr-fsi-master";
 +					reg = <0x20>;
 +					#address-cells = <2>;
 +					#size-cells = <0>;
 +
-+					cfam at 0,0 {
++					cfam@0,0 {
 +						reg = <0 0>;
 +						#address-cells = <1>;
 +						#size-cells = <1>;
 +						chip-id = <0>;
 +
-+						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>;
 +						};
@@ -3816,19 +3816,19 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		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,spi-fsi";
 +				reg = <0x0>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3838,13 +3838,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_spi1: spi at 20 {
++			cfam7_spi1: spi@20 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x20>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3854,13 +3854,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_spi2: spi at 40 {
++			cfam7_spi2: spi@40 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x40>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3870,13 +3870,13 @@ index 0000000000000..d2aa961eea313
 +				};
 +			};
 +
-+			cfam7_spi3: spi at 60 {
++			cfam7_spi3: spi@60 {
 +				compatible = "ibm,spi-fsi";
 +				reg = <0x60>;
 +				#address-cells = <1>;
 +				#size-cells = <0>;
 +
-+				eeprom at 0 {
++				eeprom@0 {
 +					compatible = "atmel,at25";
 +					reg = <0>;
 +					address-width = <24>;
@@ -3887,7 +3887,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -3901,7 +3901,7 @@ index 0000000000000..d2aa961eea313
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
diff --git a/a/content_digest b/N1/content_digest
index b576e48..132466f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,23 @@
  "ref\020240522192524.3286237-1-eajames@linux.ibm.com\0"
  "From\0Eddie James <eajames@linux.ibm.com>\0"
  "Subject\0[PATCH v6 16/20] ARM: dts: aspeed: Add IBM P11 Fuji BMC system\0"
- "Date\0Wed, 22 May 2024 19:26:47 -0000\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "Date\0Wed, 22 May 2024 14:25:20 -0500\0"
+ "To\0linux-fsi@lists.ozlabs.org\0"
+ "Cc\0eajames@linux.ibm.com"
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  ninad@linux.ibm.com
+  lakshmiy@us.ibm.com
+  linux-i2c@vger.kernel.org
+  linux-spi@vger.kernel.org
+  linux-aspeed@lists.ozlabs.org
+  andrew@codeconstruct.com.au
+  joel@jms.id.au
+  robh@kernel.org
+  conor+dt@kernel.org
+  krzk+dt@kernel.org
+  andi.shyti@kernel.org
+ " broonie@kernel.org\0"
  "\00:1\0"
  "b\0"
  "Add the device tree for the new BMC system. The Fuji is a P11\n"
@@ -208,7 +223,7 @@
  "+\t\tstdout-path = &uart5;\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 +233,12 @@
  "+\t\t#size-cells = <1>;\n"
  "+\t\tranges;\n"
  "+\n"
- "+\t\tevent_log: region at b3d00000 {\n"
+ "+\t\tevent_log: region@b3d00000 {\n"
  "+\t\t\treg = <0xb3d00000 0x100000>;\n"
  "+\t\t\tno-map;\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 +249,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\treg = <0xb4000000 0x04000000>; /* 64M */\n"
  "+\t\t\tno-map;\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\tcompatible = \"shared-dma-pool\";\n"
  "+\t\t\treg = <0xbf000000 0x01000000>; /* 16M */\n"
  "+\t\t\tno-map;\n"
@@ -363,12 +378,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"
- "+\tled-controller at 62 {\n"
+ "+\tled-controller@62 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x62>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -406,27 +421,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"
@@ -435,7 +450,7 @@
  "+&i2c4 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tled-controller at 65 {\n"
+ "+\tled-controller@65 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x65>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -456,24 +471,24 @@
  "+\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"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c4mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c4mux0chn0: i2c@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 62 {\n"
+ "+\t\t\tled-controller@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 +496,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c01-cxp-top\";\n"
@@ -489,7 +504,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c01-cxp-bot\";\n"
@@ -499,17 +514,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c4mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c4mux0chn1: i2c@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 60 {\n"
+ "+\t\t\tled-controller@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 +532,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c02-cxp-top\";\n"
@@ -525,7 +540,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c02-cxp-bot\";\n"
@@ -535,17 +550,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c4mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c4mux0chn2: i2c@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 61 {\n"
+ "+\t\t\tled-controller@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 +568,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c03-cxp-top\";\n"
@@ -561,7 +576,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c03-cxp-bot\";\n"
@@ -576,7 +591,7 @@
  "+&i2c5 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tled-controller at 66 {\n"
+ "+\tled-controller@66 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x66>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -599,24 +614,24 @@
  "+\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"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c5mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c5mux0chn0: i2c@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 60 {\n"
+ "+\t\t\tled-controller@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -624,7 +639,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c04-cxp-top\";\n"
@@ -632,7 +647,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c04-cxp-bot\";\n"
@@ -642,17 +657,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c5mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c5mux0chn1: i2c@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 61 {\n"
+ "+\t\t\tled-controller@61 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x61>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -660,7 +675,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c05-cxp-top\";\n"
@@ -668,7 +683,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c05-cxp-bot\";\n"
@@ -678,17 +693,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c5mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c5mux0chn2: i2c@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 62 {\n"
+ "+\t\t\tled-controller@62 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x62>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -696,7 +711,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c06-cxp-top\";\n"
@@ -704,7 +719,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c06-cxp-bot\";\n"
@@ -714,17 +729,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c5mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c5mux0chn3: i2c@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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"
  "+\n"
- "+\t\t\tled-controller at 63 {\n"
+ "+\t\t\tled-controller@63 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x63>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -732,7 +747,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c07-cxp-top\";\n"
@@ -740,7 +755,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c07-cxp-bot\";\n"
@@ -755,24 +770,24 @@
  "+&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"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\n"
- "+\t\ti2c6mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c6mux0chn0: i2c@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 60 {\n"
+ "+\t\t\tled-controller@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -780,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c08-cxp-top\";\n"
@@ -788,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c08-cxp-bot\";\n"
@@ -798,17 +813,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c6mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c6mux0chn1: i2c@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 62 {\n"
+ "+\t\t\tled-controller@62 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x62>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -816,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c09-cxp-top\";\n"
@@ -824,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c09-cxp-bot\";\n"
@@ -834,17 +849,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c6mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c6mux0chn2: i2c@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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"
  "+\n"
- "+\t\t\tled-controller at 63 {\n"
+ "+\t\t\tled-controller@63 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x63>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -852,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c10-cxp-top\";\n"
@@ -860,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c10-cxp-bot\";\n"
@@ -870,17 +885,17 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c6mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c6mux0chn3: i2c@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 61 {\n"
+ "+\t\t\tled-controller@61 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x61>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -888,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c11-cxp-top\";\n"
@@ -896,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c11-cxp-bot\";\n"
@@ -907,7 +922,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tled-controller at 65 {\n"
+ "+\tled-controller@65 {\n"
  "+\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\treg = <0x65>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -915,7 +930,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c01\";\n"
@@ -923,7 +938,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c02\";\n"
@@ -931,7 +946,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c03\";\n"
@@ -939,7 +954,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c04\";\n"
@@ -947,7 +962,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c05\";\n"
@@ -955,7 +970,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c06\";\n"
@@ -963,7 +978,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c07\";\n"
@@ -971,7 +986,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c08\";\n"
@@ -979,7 +994,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c09\";\n"
@@ -987,7 +1002,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c10\";\n"
@@ -995,7 +1010,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"pcieslot-c11\";\n"
@@ -1008,7 +1023,7 @@
  "+&i2c7 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tled-controller at 31 {\n"
+ "+\tled-controller@31 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x31>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1016,7 +1031,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm0\";\n"
@@ -1024,7 +1039,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm1\";\n"
@@ -1032,7 +1047,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm2\";\n"
@@ -1040,7 +1055,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm3\";\n"
@@ -1048,7 +1063,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm4\";\n"
@@ -1056,7 +1071,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm5\";\n"
@@ -1064,7 +1079,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm6\";\n"
@@ -1072,7 +1087,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm7\";\n"
@@ -1080,7 +1095,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm8\";\n"
@@ -1088,7 +1103,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm9\";\n"
@@ -1096,7 +1111,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm10\";\n"
@@ -1104,7 +1119,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm11\";\n"
@@ -1112,7 +1127,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm12\";\n"
@@ -1120,7 +1135,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm13\";\n"
@@ -1128,7 +1143,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm14\";\n"
@@ -1136,7 +1151,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm15\";\n"
@@ -1145,7 +1160,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tled-controller at 32 {\n"
+ "+\tled-controller@32 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x32>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1153,7 +1168,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm16\";\n"
@@ -1161,7 +1176,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm17\";\n"
@@ -1169,7 +1184,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm18\";\n"
@@ -1177,7 +1192,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm19\";\n"
@@ -1185,7 +1200,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm20\";\n"
@@ -1193,7 +1208,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm21\";\n"
@@ -1201,7 +1216,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm22\";\n"
@@ -1209,7 +1224,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm23\";\n"
@@ -1217,7 +1232,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm24\";\n"
@@ -1225,7 +1240,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm25\";\n"
@@ -1233,7 +1248,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm26\";\n"
@@ -1241,7 +1256,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm27\";\n"
@@ -1249,7 +1264,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm28\";\n"
@@ -1257,7 +1272,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm29\";\n"
@@ -1265,7 +1280,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm30\";\n"
@@ -1273,7 +1288,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm31\";\n"
@@ -1282,7 +1297,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tled-controller at 33 {\n"
+ "+\tled-controller@33 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x33>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1290,7 +1305,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm32\";\n"
@@ -1298,7 +1313,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm33\";\n"
@@ -1306,7 +1321,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm34\";\n"
@@ -1314,7 +1329,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm35\";\n"
@@ -1322,7 +1337,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm36\";\n"
@@ -1330,7 +1345,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm37\";\n"
@@ -1338,7 +1353,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm38\";\n"
@@ -1346,7 +1361,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm39\";\n"
@@ -1354,7 +1369,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm40\";\n"
@@ -1362,7 +1377,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm41\";\n"
@@ -1370,7 +1385,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm42\";\n"
@@ -1378,7 +1393,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm43\";\n"
@@ -1386,7 +1401,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm44\";\n"
@@ -1394,7 +1409,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm45\";\n"
@@ -1402,7 +1417,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm46\";\n"
@@ -1410,7 +1425,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm47\";\n"
@@ -1419,7 +1434,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tled-controller at 30 {\n"
+ "+\tled-controller@30 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x30>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1427,7 +1442,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm48\";\n"
@@ -1435,7 +1450,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm49\";\n"
@@ -1443,7 +1458,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm50\";\n"
@@ -1451,7 +1466,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm51\";\n"
@@ -1459,7 +1474,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm52\";\n"
@@ -1467,7 +1482,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm53\";\n"
@@ -1475,7 +1490,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm54\";\n"
@@ -1483,7 +1498,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 7 {\n"
+ "+\t\tled@7 {\n"
  "+\t\t\treg = <7>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm55\";\n"
@@ -1491,7 +1506,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm56\";\n"
@@ -1499,7 +1514,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm57\";\n"
@@ -1507,7 +1522,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm58\";\n"
@@ -1515,7 +1530,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm59\";\n"
@@ -1523,7 +1538,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm60\";\n"
@@ -1531,7 +1546,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm61\";\n"
@@ -1539,7 +1554,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm62\";\n"
@@ -1547,7 +1562,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"ddimm63\";\n"
@@ -1556,7 +1571,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tled-controller at 34 {\n"
+ "+\tled-controller@34 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x34>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1564,7 +1579,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"planar\";\n"
@@ -1572,7 +1587,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"tpm\";\n"
@@ -1580,7 +1595,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"cpu3-c61\";\n"
@@ -1588,7 +1603,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"cpu0-c14\";\n"
@@ -1596,7 +1611,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"opencapi-connector3\";\n"
@@ -1604,7 +1619,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"opencapi-connector4\";\n"
@@ -1612,7 +1627,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"opencapi-connector5\";\n"
@@ -1620,7 +1635,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm4\";\n"
@@ -1628,7 +1643,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm5\";\n"
@@ -1636,7 +1651,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm6\";\n"
@@ -1644,7 +1659,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm7\";\n"
@@ -1652,7 +1667,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm12\";\n"
@@ -1660,7 +1675,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm13\";\n"
@@ -1668,7 +1683,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm14\";\n"
@@ -1676,7 +1691,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm15\";\n"
@@ -1685,7 +1700,7 @@
  "+\t\t};\n"
  "+\t};\n"
  "+\n"
- "+\tled-controller at 35 {\n"
+ "+\tled-controller@35 {\n"
  "+\t\tcompatible = \"ibm,pca9552\";\n"
  "+\t\treg = <0x35>;\n"
  "+\t\t#address-cells = <1>;\n"
@@ -1693,7 +1708,7 @@
  "+\t\tgpio-controller;\n"
  "+\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\tled at 0 {\n"
+ "+\t\tled@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"dasd-backplane\";\n"
@@ -1701,7 +1716,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 1 {\n"
+ "+\t\tled@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"power-distribution\";\n"
@@ -1709,7 +1724,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 2 {\n"
+ "+\t\tled@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"cpu1-c19\";\n"
@@ -1717,7 +1732,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 3 {\n"
+ "+\t\tled@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"cpu2-c56\";\n"
@@ -1725,7 +1740,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 4 {\n"
+ "+\t\tled@4 {\n"
  "+\t\t\treg = <4>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"opencapi-connector0\";\n"
@@ -1733,7 +1748,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 5 {\n"
+ "+\t\tled@5 {\n"
  "+\t\t\treg = <5>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"opencapi-connector1\";\n"
@@ -1741,7 +1756,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 6 {\n"
+ "+\t\tled@6 {\n"
  "+\t\t\treg = <6>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"opencapi-connector2\";\n"
@@ -1749,7 +1764,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 8 {\n"
+ "+\t\tled@8 {\n"
  "+\t\t\treg = <8>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm0\";\n"
@@ -1757,7 +1772,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 9 {\n"
+ "+\t\tled@9 {\n"
  "+\t\t\treg = <9>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm1\";\n"
@@ -1765,7 +1780,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 10 {\n"
+ "+\t\tled@10 {\n"
  "+\t\t\treg = <10>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm2\";\n"
@@ -1773,7 +1788,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 11 {\n"
+ "+\t\tled@11 {\n"
  "+\t\t\treg = <11>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm3\";\n"
@@ -1781,7 +1796,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 12 {\n"
+ "+\t\tled@12 {\n"
  "+\t\t\treg = <12>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm8\";\n"
@@ -1789,7 +1804,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 13 {\n"
+ "+\t\tled@13 {\n"
  "+\t\t\treg = <13>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm9\";\n"
@@ -1797,7 +1812,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 14 {\n"
+ "+\t\tled@14 {\n"
  "+\t\t\treg = <14>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm10\";\n"
@@ -1805,7 +1820,7 @@
  "+\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tled at 15 {\n"
+ "+\t\tled@15 {\n"
  "+\t\t\treg = <15>;\n"
  "+\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\tlabel = \"vrm11\";\n"
@@ -1818,27 +1833,27 @@
  "+&i2c8 {\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tpmic at 11 {\n"
+ "+\tpmic@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"
@@ -1846,13 +1861,13 @@
  "+\t\ti2c-mux-idle-disconnect;\n"
  "+\t\treset-gpio = <&gpio0 ASPEED_GPIO(S, 5) GPIO_ACTIVE_LOW>;\n"
  "+\n"
- "+\t\ti2c8mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c8mux0chn0: i2c@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c8mux0chn1: i2c at 1 {\n"
+ "+\t\ti2c8mux0chn1: i2c@1 {\n"
  "+\t\t\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
@@ -1863,22 +1878,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"
@@ -1887,22 +1902,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"
@@ -1911,22 +1926,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"
@@ -1935,7 +1950,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"
@@ -1945,22 +1960,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"
@@ -1970,51 +1985,51 @@
  "+\tmulti-master;\n"
  "+\tstatus = \"okay\";\n"
  "+\n"
- "+\tlcd-controller at 62 {\n"
+ "+\tlcd-controller@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"
  "+\t\t#size-cells = <0>;\n"
  "+\t\tidle-state = <1>;\n"
  "+\n"
- "+\t\ti2c14mux0chn0: i2c at 0 {\n"
+ "+\t\ti2c14mux0chn0: i2c@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\tled-controller at 60 {\n"
+ "+\t\t\tled-controller@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9551\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -2022,7 +2037,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"front-sys-id0\";\n"
@@ -2030,7 +2045,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"front-check-log0\";\n"
@@ -2038,7 +2053,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\treg = <2>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"front-enc-fault1\";\n"
@@ -2046,7 +2061,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\treg = <3>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"front-sys-pwron0\";\n"
@@ -2056,19 +2071,19 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c14mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c14mux0chn3: i2c@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tpwm at 52 {\n"
+ "+\t\t\tpwm@52 {\n"
  "+\t\t\t\tcompatible = \"maxim,max31785a\";\n"
  "+\t\t\t\treg = <0x52>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tled-controller at 60 {\n"
+ "+\t\t\tled-controller@60 {\n"
  "+\t\t\t\tcompatible = \"nxp,pca9552\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
@@ -2076,7 +2091,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\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme0\";\n"
@@ -2084,7 +2099,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\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme1\";\n"
@@ -2092,7 +2107,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\treg = <2>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme2\";\n"
@@ -2100,7 +2115,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\treg = <3>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme3\";\n"
@@ -2108,7 +2123,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\treg = <4>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme4\";\n"
@@ -2116,7 +2131,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\treg = <5>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme5\";\n"
@@ -2124,7 +2139,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\treg = <6>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme6\";\n"
@@ -2132,7 +2147,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\treg = <7>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme7\";\n"
@@ -2140,7 +2155,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\treg = <8>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme8\";\n"
@@ -2148,7 +2163,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\treg = <9>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"nvme9\";\n"
@@ -2156,7 +2171,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\treg = <10>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"fan0\";\n"
@@ -2164,7 +2179,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\treg = <11>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"fan1\";\n"
@@ -2172,7 +2187,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\treg = <12>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"fan2\";\n"
@@ -2180,7 +2195,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\treg = <13>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"fan3\";\n"
@@ -2189,7 +2204,7 @@
  "+\t\t\t\t};\n"
  "+\t\t\t};\n"
  "+\n"
- "+\t\t\tpca0: led-controller at 61 {\n"
+ "+\t\t\tpca0: led-controller@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"
@@ -2209,52 +2224,52 @@
  "+\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\ti2c14mux1chn0: i2c at 0 {\n"
+ "+\t\ti2c14mux1chn0: i2c@0 {\n"
  "+\t\t\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\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"
@@ -2265,146 +2280,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\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\ti2c15mux0chn2: i2c at 2 {\n"
+ "+\t\ti2c15mux0chn2: i2c@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\ti2c15mux0chn3: i2c at 3 {\n"
+ "+\t\ti2c15mux0chn3: i2c@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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"
  "+\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\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\ti2c15mux1chn2: i2c at 2 {\n"
+ "+\t\ti2c15mux1chn2: i2c@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\ti2c15mux1chn3: i2c at 3 {\n"
+ "+\t\ti2c15mux1chn3: i2c@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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"
  "+\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\treg = <0>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\treg = <1>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <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\ti2c15mux2chn2: i2c at 2 {\n"
+ "+\t\ti2c15mux2chn2: i2c@2 {\n"
  "+\t\t\treg = <2>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c15mux2chn3: i2c at 3 {\n"
+ "+\t\ti2c15mux2chn3: i2c@3 {\n"
  "+\t\t\treg = <3>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
@@ -2509,46 +2524,46 @@
  "+};\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,p9-scom\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam4_i2c0: i2c-bus at 0 {\n"
+ "+\t\t\tcfam4_i2c0: i2c-bus@0 {\n"
  "+\t\t\t\treg = <0>;\t/* OM01 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2556,29 +2571,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\treg = <1>;\t/* OM23 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2586,29 +2601,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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2616,29 +2631,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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2646,29 +2661,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\treg = <12>;\t/* OP4A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2676,29 +2691,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\treg = <13>;\t/* OP4B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2706,29 +2721,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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2736,29 +2751,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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2767,19 +2782,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -2789,13 +2804,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -2805,13 +2820,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -2821,13 +2836,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -2838,7 +2853,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\n"
@@ -2852,7 +2867,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -2861,46 +2876,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,p9-scom\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam5_i2c2: i2c-bus at 2 {\n"
+ "+\t\t\tcfam5_i2c2: i2c-bus@2 {\n"
  "+\t\t\t\treg = <2>;\t/* OM45 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2908,29 +2923,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\treg = <3>;\t/* OM67 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2938,29 +2953,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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2968,29 +2983,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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -2998,29 +3013,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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3028,29 +3043,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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3058,29 +3073,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\treg = <16>;\t/* OP6A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3088,29 +3103,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\treg = <17>;\t/* OP6B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3119,19 +3134,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3141,13 +3156,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3157,13 +3172,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3173,13 +3188,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3190,7 +3205,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\n"
@@ -3204,7 +3219,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -3213,46 +3228,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,p9-scom\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam6_i2c0: i2c-bus at 0 {\n"
+ "+\t\t\tcfam6_i2c0: i2c-bus@0 {\n"
  "+\t\t\t\treg = <0>;\t/* OM01 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3260,29 +3275,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\treg = <1>;\t/* OM23 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3290,29 +3305,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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3320,29 +3335,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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3350,29 +3365,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\treg = <12>;\t/* OP4A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3380,29 +3395,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\treg = <13>;\t/* OP4B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3410,29 +3425,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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3440,29 +3455,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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3471,19 +3486,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3493,13 +3508,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3509,13 +3524,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3525,13 +3540,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3542,7 +3557,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\n"
@@ -3556,7 +3571,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -3565,46 +3580,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,p9-scom\";\n"
  "+\t\t\treg = <0x1000 0x400>;\n"
  "+\t\t};\n"
  "+\n"
- "+\t\ti2c at 1800 {\n"
+ "+\t\ti2c@1800 {\n"
  "+\t\t\tcompatible = \"ibm,i2c-fsi\";\n"
  "+\t\t\treg = <0x1800 0x400>;\n"
  "+\t\t\t#address-cells = <1>;\n"
  "+\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\tcfam7_i2c2: i2c-bus at 2 {\n"
+ "+\t\t\tcfam7_i2c2: i2c-bus@2 {\n"
  "+\t\t\t\treg = <2>;\t/* OM45 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3612,29 +3627,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\treg = <3>;\t/* OM67 */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3642,29 +3657,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\treg = <10>;\t/* OP3A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3672,29 +3687,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\treg = <11>;\t/* OP3B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3702,29 +3717,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\treg = <14>;\t/* OP5A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3732,29 +3747,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\treg = <15>;\t/* OP5B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3762,29 +3777,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\treg = <16>;\t/* OP6A */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3792,29 +3807,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\treg = <17>;\t/* OP6B */\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\tfsi at 20 {\n"
+ "+\t\t\t\tfsi@20 {\n"
  "+\t\t\t\t\tcompatible = \"ibm,i2cr-fsi-master\";\n"
  "+\t\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t\t#address-cells = <2>;\n"
  "+\t\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\t\tcfam at 0,0 {\n"
+ "+\t\t\t\t\tcfam@0,0 {\n"
  "+\t\t\t\t\t\treg = <0 0>;\n"
  "+\t\t\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t\t\t#size-cells = <1>;\n"
  "+\t\t\t\t\t\tchip-id = <0>;\n"
  "+\n"
- "+\t\t\t\t\t\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};\n"
@@ -3823,19 +3838,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x0>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3845,13 +3860,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x20>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3861,13 +3876,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x40>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3877,13 +3892,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,spi-fsi\";\n"
  "+\t\t\t\treg = <0x60>;\n"
  "+\t\t\t\t#address-cells = <1>;\n"
  "+\t\t\t\t#size-cells = <0>;\n"
  "+\n"
- "+\t\t\t\teeprom at 0 {\n"
+ "+\t\t\t\teeprom@0 {\n"
  "+\t\t\t\t\tcompatible = \"atmel,at25\";\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\taddress-width = <24>;\n"
@@ -3894,7 +3909,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tsbefifo at 2400 {\n"
+ "+\t\tsbefifo@2400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-sbefifo\";\n"
  "+\t\t\treg = <0x2400 0x400>;\n"
  "+\n"
@@ -3908,7 +3923,7 @@
  "+\t\t\t};\n"
  "+\t\t};\n"
  "+\n"
- "+\t\tfsi at 3400 {\n"
+ "+\t\tfsi@3400 {\n"
  "+\t\t\tcompatible = \"ibm,p9-fsi-controller\";\n"
  "+\t\t\treg = <0x3400 0x400>;\n"
  "+\t\t\t#address-cells = <2>;\n"
@@ -3920,4 +3935,4 @@
  "-- \n"
  2.39.3
 
-0baea3c13a99b30557ca5c6b089d6f78fc82d66198a3da5e36acbae0c2a6052b
+4106038e3bc197fa175ec81cd912de9d41b99571c273c902fca22e489dfd55fa

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.