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

diff --git a/a/1.txt b/N1/1.txt
index 953aad5..e7714cf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -203,7 +203,7 @@ index 000000000000..09d5deb86b12
 +		stdout-path = &uart5;
 +	};
 +
-+	memory at 80000000 {
++	memory@80000000 {
 +		device_type = "memory";
 +		reg = <0x80000000 0x40000000>;
 +	};
@@ -213,12 +213,12 @@ index 000000000000..09d5deb86b12
 +		#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>;
@@ -229,13 +229,13 @@ index 000000000000..09d5deb86b12
 +		};
 +
 +		/* 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;
@@ -355,12 +355,12 @@ index 000000000000..09d5deb86b12
 +&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>;
@@ -398,27 +398,27 @@ index 000000000000..09d5deb86b12
 +&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>;
 +	};
@@ -427,7 +427,7 @@ index 000000000000..09d5deb86b12
 +&i2c4 {
 +	status = "okay";
 +
-+	led-controller at 65 {
++	led-controller@65 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x65>;
 +		#address-cells = <1>;
@@ -448,24 +448,24 @@ index 000000000000..09d5deb86b12
 +			"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>;
@@ -473,7 +473,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c01-cxp-top";
@@ -481,7 +481,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c01-cxp-bot";
@@ -491,17 +491,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -509,7 +509,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c02-cxp-top";
@@ -517,7 +517,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c02-cxp-bot";
@@ -527,17 +527,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -545,7 +545,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c03-cxp-top";
@@ -553,7 +553,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c03-cxp-bot";
@@ -568,7 +568,7 @@ index 000000000000..09d5deb86b12
 +&i2c5 {
 +	status = "okay";
 +
-+	led-controller at 66 {
++	led-controller@66 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x66>;
 +		#address-cells = <1>;
@@ -591,24 +591,24 @@ index 000000000000..09d5deb86b12
 +			"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>;
@@ -616,7 +616,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c04-cxp-top";
@@ -624,7 +624,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c04-cxp-bot";
@@ -634,17 +634,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -652,7 +652,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c05-cxp-top";
@@ -660,7 +660,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c05-cxp-bot";
@@ -670,17 +670,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -688,7 +688,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c06-cxp-top";
@@ -696,7 +696,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c06-cxp-bot";
@@ -706,17 +706,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -724,7 +724,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c07-cxp-top";
@@ -732,7 +732,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c07-cxp-bot";
@@ -747,24 +747,24 @@ index 000000000000..09d5deb86b12
 +&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>;
@@ -772,7 +772,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c08-cxp-top";
@@ -780,7 +780,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c08-cxp-bot";
@@ -790,17 +790,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -808,7 +808,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c09-cxp-top";
@@ -816,7 +816,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c09-cxp-bot";
@@ -826,17 +826,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -844,7 +844,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c10-cxp-top";
@@ -852,7 +852,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c10-cxp-bot";
@@ -862,17 +862,17 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -880,7 +880,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "cablecard-c11-cxp-top";
@@ -888,7 +888,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "cablecard-c11-cxp-bot";
@@ -899,7 +899,7 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	led-controller at 65 {
++	led-controller@65 {
 +		compatible = "nxp,pca9552";
 +		reg = <0x65>;
 +		#address-cells = <1>;
@@ -907,7 +907,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "pcieslot-c01";
@@ -915,7 +915,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "pcieslot-c02";
@@ -923,7 +923,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "pcieslot-c03";
@@ -931,7 +931,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "pcieslot-c04";
@@ -939,7 +939,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "pcieslot-c05";
@@ -947,7 +947,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "pcieslot-c06";
@@ -955,7 +955,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "pcieslot-c07";
@@ -963,7 +963,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "pcieslot-c08";
@@ -971,7 +971,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "pcieslot-c09";
@@ -979,7 +979,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "pcieslot-c10";
@@ -987,7 +987,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "pcieslot-c11";
@@ -1000,7 +1000,7 @@ index 000000000000..09d5deb86b12
 +&i2c7 {
 +	status = "okay";
 +
-+	led-controller at 31 {
++	led-controller@31 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x31>;
 +		#address-cells = <1>;
@@ -1008,7 +1008,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm0";
@@ -1016,7 +1016,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm1";
@@ -1024,7 +1024,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm2";
@@ -1032,7 +1032,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm3";
@@ -1040,7 +1040,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm4";
@@ -1048,7 +1048,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm5";
@@ -1056,7 +1056,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm6";
@@ -1064,7 +1064,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm7";
@@ -1072,7 +1072,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm8";
@@ -1080,7 +1080,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm9";
@@ -1088,7 +1088,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm10";
@@ -1096,7 +1096,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm11";
@@ -1104,7 +1104,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm12";
@@ -1112,7 +1112,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm13";
@@ -1120,7 +1120,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm14";
@@ -1128,7 +1128,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm15";
@@ -1137,7 +1137,7 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	led-controller at 32 {
++	led-controller@32 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x32>;
 +		#address-cells = <1>;
@@ -1145,7 +1145,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm16";
@@ -1153,7 +1153,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm17";
@@ -1161,7 +1161,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm18";
@@ -1169,7 +1169,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm19";
@@ -1177,7 +1177,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm20";
@@ -1185,7 +1185,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm21";
@@ -1193,7 +1193,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm22";
@@ -1201,7 +1201,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm23";
@@ -1209,7 +1209,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm24";
@@ -1217,7 +1217,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm25";
@@ -1225,7 +1225,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm26";
@@ -1233,7 +1233,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm27";
@@ -1241,7 +1241,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm28";
@@ -1249,7 +1249,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm29";
@@ -1257,7 +1257,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm30";
@@ -1265,7 +1265,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm31";
@@ -1274,7 +1274,7 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	led-controller at 33 {
++	led-controller@33 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x33>;
 +		#address-cells = <1>;
@@ -1282,7 +1282,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm32";
@@ -1290,7 +1290,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm33";
@@ -1298,7 +1298,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm34";
@@ -1306,7 +1306,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm35";
@@ -1314,7 +1314,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm36";
@@ -1322,7 +1322,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm37";
@@ -1330,7 +1330,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm38";
@@ -1338,7 +1338,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm39";
@@ -1346,7 +1346,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm40";
@@ -1354,7 +1354,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm41";
@@ -1362,7 +1362,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm42";
@@ -1370,7 +1370,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm43";
@@ -1378,7 +1378,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm44";
@@ -1386,7 +1386,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm45";
@@ -1394,7 +1394,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm46";
@@ -1402,7 +1402,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm47";
@@ -1411,7 +1411,7 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	led-controller at 30 {
++	led-controller@30 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x30>;
 +		#address-cells = <1>;
@@ -1419,7 +1419,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "ddimm48";
@@ -1427,7 +1427,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "ddimm49";
@@ -1435,7 +1435,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "ddimm50";
@@ -1443,7 +1443,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "ddimm51";
@@ -1451,7 +1451,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "ddimm52";
@@ -1459,7 +1459,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "ddimm53";
@@ -1467,7 +1467,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "ddimm54";
@@ -1475,7 +1475,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 7 {
++		led@7 {
 +			reg = <7>;
 +			default-state = "keep";
 +			label = "ddimm55";
@@ -1483,7 +1483,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "ddimm56";
@@ -1491,7 +1491,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "ddimm57";
@@ -1499,7 +1499,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "ddimm58";
@@ -1507,7 +1507,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "ddimm59";
@@ -1515,7 +1515,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "ddimm60";
@@ -1523,7 +1523,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "ddimm61";
@@ -1531,7 +1531,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "ddimm62";
@@ -1539,7 +1539,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "ddimm63";
@@ -1548,7 +1548,7 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	led-controller at 34 {
++	led-controller@34 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x34>;
 +		#address-cells = <1>;
@@ -1556,7 +1556,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "planar";
@@ -1564,7 +1564,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "tpm";
@@ -1572,7 +1572,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "cpu3-c61";
@@ -1580,7 +1580,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "cpu0-c14";
@@ -1588,7 +1588,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "opencapi-connector3";
@@ -1596,7 +1596,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "opencapi-connector4";
@@ -1604,7 +1604,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "opencapi-connector5";
@@ -1612,7 +1612,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "vrm4";
@@ -1620,7 +1620,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "vrm5";
@@ -1628,7 +1628,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "vrm6";
@@ -1636,7 +1636,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "vrm7";
@@ -1644,7 +1644,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "vrm12";
@@ -1652,7 +1652,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "vrm13";
@@ -1660,7 +1660,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "vrm14";
@@ -1668,7 +1668,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "vrm15";
@@ -1677,7 +1677,7 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	led-controller at 35 {
++	led-controller@35 {
 +		compatible = "ibm,pca9552";
 +		reg = <0x35>;
 +		#address-cells = <1>;
@@ -1685,7 +1685,7 @@ index 000000000000..09d5deb86b12
 +		gpio-controller;
 +		#gpio-cells = <2>;
 +
-+		led at 0 {
++		led@0 {
 +			reg = <0>;
 +			default-state = "keep";
 +			label = "dasd-backplane";
@@ -1693,7 +1693,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 1 {
++		led@1 {
 +			reg = <1>;
 +			default-state = "keep";
 +			label = "power-distribution";
@@ -1701,7 +1701,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 2 {
++		led@2 {
 +			reg = <2>;
 +			default-state = "keep";
 +			label = "cpu1-c19";
@@ -1709,7 +1709,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 3 {
++		led@3 {
 +			reg = <3>;
 +			default-state = "keep";
 +			label = "cpu2-c56";
@@ -1717,7 +1717,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 4 {
++		led@4 {
 +			reg = <4>;
 +			default-state = "keep";
 +			label = "opencapi-connector0";
@@ -1725,7 +1725,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 5 {
++		led@5 {
 +			reg = <5>;
 +			default-state = "keep";
 +			label = "opencapi-connector1";
@@ -1733,7 +1733,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 6 {
++		led@6 {
 +			reg = <6>;
 +			default-state = "keep";
 +			label = "opencapi-connector2";
@@ -1741,7 +1741,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 8 {
++		led@8 {
 +			reg = <8>;
 +			default-state = "keep";
 +			label = "vrm0";
@@ -1749,7 +1749,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 9 {
++		led@9 {
 +			reg = <9>;
 +			default-state = "keep";
 +			label = "vrm1";
@@ -1757,7 +1757,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 10 {
++		led@10 {
 +			reg = <10>;
 +			default-state = "keep";
 +			label = "vrm2";
@@ -1765,7 +1765,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 11 {
++		led@11 {
 +			reg = <11>;
 +			default-state = "keep";
 +			label = "vrm3";
@@ -1773,7 +1773,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 12 {
++		led@12 {
 +			reg = <12>;
 +			default-state = "keep";
 +			label = "vrm8";
@@ -1781,7 +1781,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 13 {
++		led@13 {
 +			reg = <13>;
 +			default-state = "keep";
 +			label = "vrm9";
@@ -1789,7 +1789,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 14 {
++		led@14 {
 +			reg = <14>;
 +			default-state = "keep";
 +			label = "vrm10";
@@ -1797,7 +1797,7 @@ index 000000000000..09d5deb86b12
 +			type = <PCA955X_TYPE_LED>;
 +		};
 +
-+		led at 15 {
++		led@15 {
 +			reg = <15>;
 +			default-state = "keep";
 +			label = "vrm11";
@@ -1810,40 +1810,40 @@ index 000000000000..09d5deb86b12
 +&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>;
 +		#size-cells = <0>;
 +		i2c-mux-idle-disconnect;
 +
-+		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>;
@@ -1854,22 +1854,22 @@ index 000000000000..09d5deb86b12
 +&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>;
 +	};
@@ -1878,22 +1878,22 @@ index 000000000000..09d5deb86b12
 +&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>;
 +	};
@@ -1902,22 +1902,22 @@ index 000000000000..09d5deb86b12
 +&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>;
 +	};
@@ -1926,7 +1926,7 @@ index 000000000000..09d5deb86b12
 +&i2c12 {
 +	status = "okay";
 +
-+	tpm at 2e {
++	tpm@2e {
 +		compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
 +		reg = <0x2e>;
 +		memory-region = <&event_log>;
@@ -1936,22 +1936,22 @@ index 000000000000..09d5deb86b12
 +&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>;
 +	};
@@ -1961,51 +1961,51 @@ index 000000000000..09d5deb86b12
 +	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>;
@@ -2013,7 +2013,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "front-sys-id0";
@@ -2021,7 +2021,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "front-check-log0";
@@ -2029,7 +2029,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 2 {
++				led@2 {
 +					reg = <2>;
 +					default-state = "keep";
 +					label = "front-enc-fault1";
@@ -2037,7 +2037,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 3 {
++				led@3 {
 +					reg = <3>;
 +					default-state = "keep";
 +					label = "front-sys-pwron0";
@@ -2047,19 +2047,19 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -2067,7 +2067,7 @@ index 000000000000..09d5deb86b12
 +				gpio-controller;
 +				#gpio-cells = <2>;
 +
-+				led at 0 {
++				led@0 {
 +					reg = <0>;
 +					default-state = "keep";
 +					label = "nvme0";
@@ -2075,7 +2075,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 1 {
++				led@1 {
 +					reg = <1>;
 +					default-state = "keep";
 +					label = "nvme1";
@@ -2083,7 +2083,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 2 {
++				led@2 {
 +					reg = <2>;
 +					default-state = "keep";
 +					label = "nvme2";
@@ -2091,7 +2091,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 3 {
++				led@3 {
 +					reg = <3>;
 +					default-state = "keep";
 +					label = "nvme3";
@@ -2099,7 +2099,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 4 {
++				led@4 {
 +					reg = <4>;
 +					default-state = "keep";
 +					label = "nvme4";
@@ -2107,7 +2107,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 5 {
++				led@5 {
 +					reg = <5>;
 +					default-state = "keep";
 +					label = "nvme5";
@@ -2115,7 +2115,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 6 {
++				led@6 {
 +					reg = <6>;
 +					default-state = "keep";
 +					label = "nvme6";
@@ -2123,7 +2123,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 7 {
++				led@7 {
 +					reg = <7>;
 +					default-state = "keep";
 +					label = "nvme7";
@@ -2131,7 +2131,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 8 {
++				led@8 {
 +					reg = <8>;
 +					default-state = "keep";
 +					label = "nvme8";
@@ -2139,7 +2139,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 9 {
++				led@9 {
 +					reg = <9>;
 +					default-state = "keep";
 +					label = "nvme9";
@@ -2147,7 +2147,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 10 {
++				led@10 {
 +					reg = <10>;
 +					default-state = "keep";
 +					label = "fan0";
@@ -2155,7 +2155,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 11 {
++				led@11 {
 +					reg = <11>;
 +					default-state = "keep";
 +					label = "fan1";
@@ -2163,7 +2163,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 12 {
++				led@12 {
 +					reg = <12>;
 +					default-state = "keep";
 +					label = "fan2";
@@ -2171,7 +2171,7 @@ index 000000000000..09d5deb86b12
 +					type = <PCA955X_TYPE_LED>;
 +				};
 +
-+				led at 13 {
++				led@13 {
 +					reg = <13>;
 +					default-state = "keep";
 +					label = "fan3";
@@ -2180,7 +2180,7 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			pca0: led-controller at 61 {
++			pca0: led-controller@61 {
 +				compatible = "nxp,pca9552";
 +				#address-cells = <1>;
 +				#size-cells = <0>;
@@ -2200,52 +2200,52 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	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>;
 +			};
@@ -2256,146 +2256,146 @@ index 000000000000..09d5deb86b12
 +&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>;
@@ -2500,46 +2500,46 @@ index 000000000000..09d5deb86b12
 +};
 +
 +&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>;
 +						};
@@ -2547,29 +2547,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2577,29 +2577,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2607,29 +2607,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2637,29 +2637,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2667,29 +2667,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2697,29 +2697,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2727,29 +2727,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2758,19 +2758,19 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -2780,13 +2780,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -2796,13 +2796,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -2812,13 +2812,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -2829,7 +2829,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -2843,7 +2843,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -2852,46 +2852,46 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	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>;
 +						};
@@ -2899,29 +2899,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2929,29 +2929,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2959,29 +2959,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -2989,29 +2989,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3019,29 +3019,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3049,29 +3049,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3079,29 +3079,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3110,19 +3110,19 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -3132,13 +3132,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3148,13 +3148,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3164,13 +3164,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3181,7 +3181,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -3195,7 +3195,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -3204,46 +3204,46 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	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>;
 +						};
@@ -3251,29 +3251,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3281,29 +3281,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3311,29 +3311,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3341,29 +3341,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3371,29 +3371,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3401,29 +3401,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3431,29 +3431,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3462,19 +3462,19 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -3484,13 +3484,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3500,13 +3500,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3516,13 +3516,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3533,7 +3533,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -3547,7 +3547,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		fsi at 3400 {
++		fsi@3400 {
 +			compatible = "ibm,p9-fsi-controller";
 +			reg = <0x3400 0x400>;
 +			#address-cells = <2>;
@@ -3556,46 +3556,46 @@ index 000000000000..09d5deb86b12
 +		};
 +	};
 +
-+	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>;
 +						};
@@ -3603,29 +3603,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3633,29 +3633,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3663,29 +3663,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3693,29 +3693,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3723,29 +3723,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3753,29 +3753,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3783,29 +3783,29 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
 +						};
@@ -3814,19 +3814,19 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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>;
@@ -3836,13 +3836,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3852,13 +3852,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3868,13 +3868,13 @@ index 000000000000..09d5deb86b12
 +				};
 +			};
 +
-+			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>;
@@ -3885,7 +3885,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		sbefifo at 2400 {
++		sbefifo@2400 {
 +			compatible = "ibm,p9-sbefifo";
 +			reg = <0x2400 0x400>;
 +
@@ -3899,7 +3899,7 @@ index 000000000000..09d5deb86b12
 +			};
 +		};
 +
-+		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 f0539f6..27e574c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,21 @@
  "ref\020240429210131.373487-1-eajames@linux.ibm.com\0"
  "From\0Eddie James <eajames@linux.ibm.com>\0"
  "Subject\0[PATCH v4 14/17] ARM: dts: aspeed: Add IBM P11 Fuji BMC system\0"
- "Date\0Mon, 29 Apr 2024 21:02:03 -0000\0"
+ "Date\0Mon, 29 Apr 2024 16:01:28 -0500\0"
  "To\0linux-aspeed@lists.ozlabs.org\0"
+ "Cc\0eajames@linux.ibm.com"
+  devicetree@vger.kernel.org
+  linux-kernel@vger.kernel.org
+  linux-fsi@lists.ozlabs.org
+  linux-spi@vger.kernel.org
+  linux-i2c@vger.kernel.org
+  lakshmiy@us.ibm.com
+  robh@kernel.org
+  krzk+dt@kernel.org
+  conor+dt@kernel.org
+  joel@jms.id.au
+  andrew@codeconstruct.com.au
+ " andi.shyti@kernel.org\0"
  "\00:1\0"
  "b\0"
  "Add the device tree for the new BMC system. The Fuji is a P11\n"
@@ -210,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"
@@ -220,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"
@@ -236,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"
@@ -362,12 +375,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"
@@ -405,27 +418,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"
@@ -434,7 +447,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"
@@ -455,24 +468,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"
@@ -480,7 +493,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c01-cxp-top\";\n"
@@ -488,7 +501,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c01-cxp-bot\";\n"
@@ -498,17 +511,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"
@@ -516,7 +529,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c02-cxp-top\";\n"
@@ -524,7 +537,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c02-cxp-bot\";\n"
@@ -534,17 +547,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"
@@ -552,7 +565,7 @@
  "+\t\t\t\tgpio-controller;\n"
  "+\t\t\t\t#gpio-cells = <2>;\n"
  "+\n"
- "+\t\t\t\tled at 0 {\n"
+ "+\t\t\t\tled@0 {\n"
  "+\t\t\t\t\treg = <0>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c03-cxp-top\";\n"
@@ -560,7 +573,7 @@
  "+\t\t\t\t\ttype = <PCA955X_TYPE_LED>;\n"
  "+\t\t\t\t};\n"
  "+\n"
- "+\t\t\t\tled at 1 {\n"
+ "+\t\t\t\tled@1 {\n"
  "+\t\t\t\t\treg = <1>;\n"
  "+\t\t\t\t\tdefault-state = \"keep\";\n"
  "+\t\t\t\t\tlabel = \"cablecard-c03-cxp-bot\";\n"
@@ -575,7 +588,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"
@@ -598,24 +611,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"
@@ -623,7 +636,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"
@@ -631,7 +644,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"
@@ -641,17 +654,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"
@@ -659,7 +672,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"
@@ -667,7 +680,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"
@@ -677,17 +690,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"
@@ -695,7 +708,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"
@@ -703,7 +716,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"
@@ -713,17 +726,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"
@@ -731,7 +744,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"
@@ -739,7 +752,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"
@@ -754,24 +767,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"
@@ -779,7 +792,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"
@@ -787,7 +800,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"
@@ -797,17 +810,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"
@@ -815,7 +828,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"
@@ -823,7 +836,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"
@@ -833,17 +846,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"
@@ -851,7 +864,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"
@@ -859,7 +872,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"
@@ -869,17 +882,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"
@@ -887,7 +900,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"
@@ -895,7 +908,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"
@@ -906,7 +919,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"
@@ -914,7 +927,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"
@@ -922,7 +935,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"
@@ -930,7 +943,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"
@@ -938,7 +951,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"
@@ -946,7 +959,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"
@@ -954,7 +967,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"
@@ -962,7 +975,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"
@@ -970,7 +983,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"
@@ -978,7 +991,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"
@@ -986,7 +999,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"
@@ -994,7 +1007,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"
@@ -1007,7 +1020,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"
@@ -1015,7 +1028,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"
@@ -1023,7 +1036,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"
@@ -1031,7 +1044,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"
@@ -1039,7 +1052,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"
@@ -1047,7 +1060,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"
@@ -1055,7 +1068,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"
@@ -1063,7 +1076,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"
@@ -1071,7 +1084,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"
@@ -1079,7 +1092,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"
@@ -1087,7 +1100,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"
@@ -1095,7 +1108,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"
@@ -1103,7 +1116,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"
@@ -1111,7 +1124,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"
@@ -1119,7 +1132,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"
@@ -1127,7 +1140,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"
@@ -1135,7 +1148,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"
@@ -1144,7 +1157,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"
@@ -1152,7 +1165,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"
@@ -1160,7 +1173,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"
@@ -1168,7 +1181,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"
@@ -1176,7 +1189,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"
@@ -1184,7 +1197,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"
@@ -1192,7 +1205,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"
@@ -1200,7 +1213,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"
@@ -1208,7 +1221,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"
@@ -1216,7 +1229,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"
@@ -1224,7 +1237,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"
@@ -1232,7 +1245,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"
@@ -1240,7 +1253,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"
@@ -1248,7 +1261,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"
@@ -1256,7 +1269,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"
@@ -1264,7 +1277,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"
@@ -1272,7 +1285,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"
@@ -1281,7 +1294,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"
@@ -1289,7 +1302,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"
@@ -1297,7 +1310,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"
@@ -1305,7 +1318,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"
@@ -1313,7 +1326,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"
@@ -1321,7 +1334,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"
@@ -1329,7 +1342,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"
@@ -1337,7 +1350,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"
@@ -1345,7 +1358,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"
@@ -1353,7 +1366,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"
@@ -1361,7 +1374,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"
@@ -1369,7 +1382,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"
@@ -1377,7 +1390,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"
@@ -1385,7 +1398,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"
@@ -1393,7 +1406,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"
@@ -1401,7 +1414,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"
@@ -1409,7 +1422,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"
@@ -1418,7 +1431,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"
@@ -1426,7 +1439,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"
@@ -1434,7 +1447,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"
@@ -1442,7 +1455,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"
@@ -1450,7 +1463,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"
@@ -1458,7 +1471,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"
@@ -1466,7 +1479,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"
@@ -1474,7 +1487,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"
@@ -1482,7 +1495,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"
@@ -1490,7 +1503,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"
@@ -1498,7 +1511,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"
@@ -1506,7 +1519,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"
@@ -1514,7 +1527,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"
@@ -1522,7 +1535,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"
@@ -1530,7 +1543,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"
@@ -1538,7 +1551,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"
@@ -1546,7 +1559,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"
@@ -1555,7 +1568,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"
@@ -1563,7 +1576,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"
@@ -1571,7 +1584,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"
@@ -1579,7 +1592,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"
@@ -1587,7 +1600,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"
@@ -1595,7 +1608,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"
@@ -1603,7 +1616,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"
@@ -1611,7 +1624,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"
@@ -1619,7 +1632,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"
@@ -1627,7 +1640,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"
@@ -1635,7 +1648,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"
@@ -1643,7 +1656,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"
@@ -1651,7 +1664,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"
@@ -1659,7 +1672,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"
@@ -1667,7 +1680,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"
@@ -1675,7 +1688,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"
@@ -1684,7 +1697,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"
@@ -1692,7 +1705,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"
@@ -1700,7 +1713,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"
@@ -1708,7 +1721,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"
@@ -1716,7 +1729,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"
@@ -1724,7 +1737,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"
@@ -1732,7 +1745,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"
@@ -1740,7 +1753,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"
@@ -1748,7 +1761,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"
@@ -1756,7 +1769,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"
@@ -1764,7 +1777,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"
@@ -1772,7 +1785,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"
@@ -1780,7 +1793,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"
@@ -1788,7 +1801,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"
@@ -1796,7 +1809,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"
@@ -1804,7 +1817,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"
@@ -1817,40 +1830,40 @@
  "+&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"
  "+\t\t#size-cells = <0>;\n"
  "+\t\ti2c-mux-idle-disconnect;\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"
@@ -1861,22 +1874,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"
@@ -1885,22 +1898,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"
@@ -1909,22 +1922,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"
@@ -1933,7 +1946,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"
@@ -1943,22 +1956,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"
@@ -1968,51 +1981,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"
@@ -2020,7 +2033,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"
@@ -2028,7 +2041,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"
@@ -2036,7 +2049,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"
@@ -2044,7 +2057,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"
@@ -2054,19 +2067,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"
@@ -2074,7 +2087,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"
@@ -2082,7 +2095,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"
@@ -2090,7 +2103,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"
@@ -2098,7 +2111,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"
@@ -2106,7 +2119,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"
@@ -2114,7 +2127,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"
@@ -2122,7 +2135,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"
@@ -2130,7 +2143,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"
@@ -2138,7 +2151,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"
@@ -2146,7 +2159,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"
@@ -2154,7 +2167,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"
@@ -2162,7 +2175,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"
@@ -2170,7 +2183,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"
@@ -2178,7 +2191,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"
@@ -2187,7 +2200,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"
@@ -2207,52 +2220,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"
@@ -2263,146 +2276,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"
@@ -2507,46 +2520,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"
@@ -2554,29 +2567,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"
@@ -2584,29 +2597,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"
@@ -2614,29 +2627,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"
@@ -2644,29 +2657,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"
@@ -2674,29 +2687,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"
@@ -2704,29 +2717,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"
@@ -2734,29 +2747,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"
@@ -2765,19 +2778,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"
@@ -2787,13 +2800,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"
@@ -2803,13 +2816,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"
@@ -2819,13 +2832,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"
@@ -2836,7 +2849,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"
@@ -2850,7 +2863,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"
@@ -2859,46 +2872,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"
@@ -2906,29 +2919,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"
@@ -2936,29 +2949,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"
@@ -2966,29 +2979,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"
@@ -2996,29 +3009,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"
@@ -3026,29 +3039,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"
@@ -3056,29 +3069,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"
@@ -3086,29 +3099,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"
@@ -3117,19 +3130,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"
@@ -3139,13 +3152,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"
@@ -3155,13 +3168,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"
@@ -3171,13 +3184,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"
@@ -3188,7 +3201,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"
@@ -3202,7 +3215,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"
@@ -3211,46 +3224,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"
@@ -3258,29 +3271,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"
@@ -3288,29 +3301,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"
@@ -3318,29 +3331,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"
@@ -3348,29 +3361,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"
@@ -3378,29 +3391,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"
@@ -3408,29 +3421,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"
@@ -3438,29 +3451,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"
@@ -3469,19 +3482,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"
@@ -3491,13 +3504,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"
@@ -3507,13 +3520,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"
@@ -3523,13 +3536,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"
@@ -3540,7 +3553,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"
@@ -3554,7 +3567,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"
@@ -3563,46 +3576,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"
@@ -3610,29 +3623,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"
@@ -3640,29 +3653,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"
@@ -3670,29 +3683,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"
@@ -3700,29 +3713,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"
@@ -3730,29 +3743,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"
@@ -3760,29 +3773,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"
@@ -3790,29 +3803,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"
@@ -3821,19 +3834,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"
@@ -3843,13 +3856,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"
@@ -3859,13 +3872,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"
@@ -3875,13 +3888,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"
@@ -3892,7 +3905,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"
@@ -3906,7 +3919,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"
@@ -3918,4 +3931,4 @@
  "-- \n"
  2.39.3
 
-fbdca0f525db6359cb63dd6cc8a257b37312a9f1c88250b43c838b1fb59d2c4f
+454a5bfdb932b332c301fed80895046ed71deef6f6e329d49aa77fd9df3fed55

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.