All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <20240531193115.3814887-1-robh@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 5afda9a..4bb8843 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -11,129 +11,129 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/
 index 857cb26ed6d7..c669ec202085 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
-@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller at 0 {
+@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller@0 {
  		interrupt-controller;
  	};
  
--	i2c0: i2c-bus at 40 {
-+	i2c0: i2c at 40 {
+-	i2c0: i2c-bus@40 {
++	i2c0: i2c@40 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -478,7 +478,7 @@ i2c0: i2c-bus at 40 {
+@@ -478,7 +478,7 @@ i2c0: i2c-bus@40 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c1: i2c-bus at 80 {
-+	i2c1: i2c at 80 {
+-	i2c1: i2c-bus@80 {
++	i2c1: i2c@80 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -493,7 +493,7 @@ i2c1: i2c-bus at 80 {
+@@ -493,7 +493,7 @@ i2c1: i2c-bus@80 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c2: i2c-bus at c0 {
-+	i2c2: i2c at c0 {
+-	i2c2: i2c-bus@c0 {
++	i2c2: i2c@c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -509,7 +509,7 @@ i2c2: i2c-bus at c0 {
+@@ -509,7 +509,7 @@ i2c2: i2c-bus@c0 {
  		status = "disabled";
  	};
  
--	i2c3: i2c-bus at 100 {
-+	i2c3: i2c at 100 {
+-	i2c3: i2c-bus@100 {
++	i2c3: i2c@100 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -525,7 +525,7 @@ i2c3: i2c-bus at 100 {
+@@ -525,7 +525,7 @@ i2c3: i2c-bus@100 {
  		status = "disabled";
  	};
  
--	i2c4: i2c-bus at 140 {
-+	i2c4: i2c at 140 {
+-	i2c4: i2c-bus@140 {
++	i2c4: i2c@140 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -541,7 +541,7 @@ i2c4: i2c-bus at 140 {
+@@ -541,7 +541,7 @@ i2c4: i2c-bus@140 {
  		status = "disabled";
  	};
  
--	i2c5: i2c-bus at 180 {
-+	i2c5: i2c at 180 {
+-	i2c5: i2c-bus@180 {
++	i2c5: i2c@180 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -557,7 +557,7 @@ i2c5: i2c-bus at 180 {
+@@ -557,7 +557,7 @@ i2c5: i2c-bus@180 {
  		status = "disabled";
  	};
  
--	i2c6: i2c-bus at 1c0 {
-+	i2c6: i2c at 1c0 {
+-	i2c6: i2c-bus@1c0 {
++	i2c6: i2c@1c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -573,7 +573,7 @@ i2c6: i2c-bus at 1c0 {
+@@ -573,7 +573,7 @@ i2c6: i2c-bus@1c0 {
  		status = "disabled";
  	};
  
--	i2c7: i2c-bus at 300 {
-+	i2c7: i2c at 300 {
+-	i2c7: i2c-bus@300 {
++	i2c7: i2c@300 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -589,7 +589,7 @@ i2c7: i2c-bus at 300 {
+@@ -589,7 +589,7 @@ i2c7: i2c-bus@300 {
  		status = "disabled";
  	};
  
--	i2c8: i2c-bus at 340 {
-+	i2c8: i2c at 340 {
+-	i2c8: i2c-bus@340 {
++	i2c8: i2c@340 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -605,7 +605,7 @@ i2c8: i2c-bus at 340 {
+@@ -605,7 +605,7 @@ i2c8: i2c-bus@340 {
  		status = "disabled";
  	};
  
--	i2c9: i2c-bus at 380 {
-+	i2c9: i2c at 380 {
+-	i2c9: i2c-bus@380 {
++	i2c9: i2c@380 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -621,7 +621,7 @@ i2c9: i2c-bus at 380 {
+@@ -621,7 +621,7 @@ i2c9: i2c-bus@380 {
  		status = "disabled";
  	};
  
--	i2c10: i2c-bus at 3c0 {
-+	i2c10: i2c at 3c0 {
+-	i2c10: i2c-bus@3c0 {
++	i2c10: i2c@3c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -637,7 +637,7 @@ i2c10: i2c-bus at 3c0 {
+@@ -637,7 +637,7 @@ i2c10: i2c-bus@3c0 {
  		status = "disabled";
  	};
  
--	i2c11: i2c-bus at 400 {
-+	i2c11: i2c at 400 {
+-	i2c11: i2c-bus@400 {
++	i2c11: i2c@400 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -653,7 +653,7 @@ i2c11: i2c-bus at 400 {
+@@ -653,7 +653,7 @@ i2c11: i2c-bus@400 {
  		status = "disabled";
  	};
  
--	i2c12: i2c-bus at 440 {
-+	i2c12: i2c at 440 {
+-	i2c12: i2c-bus@440 {
++	i2c12: i2c@440 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -669,7 +669,7 @@ i2c12: i2c-bus at 440 {
+@@ -669,7 +669,7 @@ i2c12: i2c-bus@440 {
  		status = "disabled";
  	};
  
--	i2c13: i2c-bus at 480 {
-+	i2c13: i2c at 480 {
+-	i2c13: i2c-bus@480 {
++	i2c13: i2c@480 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
@@ -141,129 +141,129 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/
 index e6f3cf3c721e..6e05cbcce49c 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
-@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller at 0 {
+@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller@0 {
  		interrupt-controller;
  	};
  
--	i2c0: i2c-bus at 40 {
-+	i2c0: i2c at 40 {
+-	i2c0: i2c-bus@40 {
++	i2c0: i2c@40 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -607,7 +607,7 @@ i2c0: i2c-bus at 40 {
+@@ -607,7 +607,7 @@ i2c0: i2c-bus@40 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c1: i2c-bus at 80 {
-+	i2c1: i2c at 80 {
+-	i2c1: i2c-bus@80 {
++	i2c1: i2c@80 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -622,7 +622,7 @@ i2c1: i2c-bus at 80 {
+@@ -622,7 +622,7 @@ i2c1: i2c-bus@80 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c2: i2c-bus at c0 {
-+	i2c2: i2c at c0 {
+-	i2c2: i2c-bus@c0 {
++	i2c2: i2c@c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -638,7 +638,7 @@ i2c2: i2c-bus at c0 {
+@@ -638,7 +638,7 @@ i2c2: i2c-bus@c0 {
  		status = "disabled";
  	};
  
--	i2c3: i2c-bus at 100 {
-+	i2c3: i2c at 100 {
+-	i2c3: i2c-bus@100 {
++	i2c3: i2c@100 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -654,7 +654,7 @@ i2c3: i2c-bus at 100 {
+@@ -654,7 +654,7 @@ i2c3: i2c-bus@100 {
  		status = "disabled";
  	};
  
--	i2c4: i2c-bus at 140 {
-+	i2c4: i2c at 140 {
+-	i2c4: i2c-bus@140 {
++	i2c4: i2c@140 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -670,7 +670,7 @@ i2c4: i2c-bus at 140 {
+@@ -670,7 +670,7 @@ i2c4: i2c-bus@140 {
  		status = "disabled";
  	};
  
--	i2c5: i2c-bus at 180 {
-+	i2c5: i2c at 180 {
+-	i2c5: i2c-bus@180 {
++	i2c5: i2c@180 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -686,7 +686,7 @@ i2c5: i2c-bus at 180 {
+@@ -686,7 +686,7 @@ i2c5: i2c-bus@180 {
  		status = "disabled";
  	};
  
--	i2c6: i2c-bus at 1c0 {
-+	i2c6: i2c at 1c0 {
+-	i2c6: i2c-bus@1c0 {
++	i2c6: i2c@1c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -702,7 +702,7 @@ i2c6: i2c-bus at 1c0 {
+@@ -702,7 +702,7 @@ i2c6: i2c-bus@1c0 {
  		status = "disabled";
  	};
  
--	i2c7: i2c-bus at 300 {
-+	i2c7: i2c at 300 {
+-	i2c7: i2c-bus@300 {
++	i2c7: i2c@300 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -718,7 +718,7 @@ i2c7: i2c-bus at 300 {
+@@ -718,7 +718,7 @@ i2c7: i2c-bus@300 {
  		status = "disabled";
  	};
  
--	i2c8: i2c-bus at 340 {
-+	i2c8: i2c at 340 {
+-	i2c8: i2c-bus@340 {
++	i2c8: i2c@340 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -734,7 +734,7 @@ i2c8: i2c-bus at 340 {
+@@ -734,7 +734,7 @@ i2c8: i2c-bus@340 {
  		status = "disabled";
  	};
  
--	i2c9: i2c-bus at 380 {
-+	i2c9: i2c at 380 {
+-	i2c9: i2c-bus@380 {
++	i2c9: i2c@380 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -750,7 +750,7 @@ i2c9: i2c-bus at 380 {
+@@ -750,7 +750,7 @@ i2c9: i2c-bus@380 {
  		status = "disabled";
  	};
  
--	i2c10: i2c-bus at 3c0 {
-+	i2c10: i2c at 3c0 {
+-	i2c10: i2c-bus@3c0 {
++	i2c10: i2c@3c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -766,7 +766,7 @@ i2c10: i2c-bus at 3c0 {
+@@ -766,7 +766,7 @@ i2c10: i2c-bus@3c0 {
  		status = "disabled";
  	};
  
--	i2c11: i2c-bus at 400 {
-+	i2c11: i2c at 400 {
+-	i2c11: i2c-bus@400 {
++	i2c11: i2c@400 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -782,7 +782,7 @@ i2c11: i2c-bus at 400 {
+@@ -782,7 +782,7 @@ i2c11: i2c-bus@400 {
  		status = "disabled";
  	};
  
--	i2c12: i2c-bus at 440 {
-+	i2c12: i2c at 440 {
+-	i2c12: i2c-bus@440 {
++	i2c12: i2c@440 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -798,7 +798,7 @@ i2c12: i2c-bus at 440 {
+@@ -798,7 +798,7 @@ i2c12: i2c-bus@440 {
  		status = "disabled";
  	};
  
--	i2c13: i2c-bus at 480 {
-+	i2c13: i2c at 480 {
+-	i2c13: i2c-bus@480 {
++	i2c13: i2c@480 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
@@ -271,149 +271,155 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/
 index 7fb421153596..0c00882f111a 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
-@@ -905,7 +905,7 @@ udma: dma-controller at 1e79e000 {
+@@ -905,7 +905,7 @@ udma: dma-controller@1e79e000 {
  #include "aspeed-g6-pinctrl.dtsi"
  
  &i2c {
--	i2c0: i2c-bus at 80 {
-+	i2c0: i2c at 80 {
+-	i2c0: i2c-bus@80 {
++	i2c0: i2c@80 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x80 0x80>;
-@@ -919,7 +919,7 @@ i2c0: i2c-bus at 80 {
+@@ -919,7 +919,7 @@ i2c0: i2c-bus@80 {
  		status = "disabled";
  	};
  
--	i2c1: i2c-bus at 100 {
-+	i2c1: i2c at 100 {
+-	i2c1: i2c-bus@100 {
++	i2c1: i2c@100 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x100 0x80>;
-@@ -933,7 +933,7 @@ i2c1: i2c-bus at 100 {
+@@ -933,7 +933,7 @@ i2c1: i2c-bus@100 {
  		status = "disabled";
  	};
  
--	i2c2: i2c-bus at 180 {
-+	i2c2: i2c at 180 {
+-	i2c2: i2c-bus@180 {
++	i2c2: i2c@180 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x180 0x80>;
-@@ -947,7 +947,7 @@ i2c2: i2c-bus at 180 {
+@@ -947,7 +947,7 @@ i2c2: i2c-bus@180 {
  		status = "disabled";
  	};
  
--	i2c3: i2c-bus at 200 {
-+	i2c3: i2c at 200 {
+-	i2c3: i2c-bus@200 {
++	i2c3: i2c@200 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x200 0x80>;
-@@ -961,7 +961,7 @@ i2c3: i2c-bus at 200 {
+@@ -961,7 +961,7 @@ i2c3: i2c-bus@200 {
  		status = "disabled";
  	};
  
--	i2c4: i2c-bus at 280 {
-+	i2c4: i2c at 280 {
+-	i2c4: i2c-bus@280 {
++	i2c4: i2c@280 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x280 0x80>;
-@@ -975,7 +975,7 @@ i2c4: i2c-bus at 280 {
+@@ -975,7 +975,7 @@ i2c4: i2c-bus@280 {
  		status = "disabled";
  	};
  
--	i2c5: i2c-bus at 300 {
-+	i2c5: i2c at 300 {
+-	i2c5: i2c-bus@300 {
++	i2c5: i2c@300 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x300 0x80>;
-@@ -989,7 +989,7 @@ i2c5: i2c-bus at 300 {
+@@ -989,7 +989,7 @@ i2c5: i2c-bus@300 {
  		status = "disabled";
  	};
  
--	i2c6: i2c-bus at 380 {
-+	i2c6: i2c at 380 {
+-	i2c6: i2c-bus@380 {
++	i2c6: i2c@380 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x380 0x80>;
-@@ -1003,7 +1003,7 @@ i2c6: i2c-bus at 380 {
+@@ -1003,7 +1003,7 @@ i2c6: i2c-bus@380 {
  		status = "disabled";
  	};
  
--	i2c7: i2c-bus at 400 {
-+	i2c7: i2c at 400 {
+-	i2c7: i2c-bus@400 {
++	i2c7: i2c@400 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x400 0x80>;
-@@ -1017,7 +1017,7 @@ i2c7: i2c-bus at 400 {
+@@ -1017,7 +1017,7 @@ i2c7: i2c-bus@400 {
  		status = "disabled";
  	};
  
--	i2c8: i2c-bus at 480 {
-+	i2c8: i2c at 480 {
+-	i2c8: i2c-bus@480 {
++	i2c8: i2c@480 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x480 0x80>;
-@@ -1031,7 +1031,7 @@ i2c8: i2c-bus at 480 {
+@@ -1031,7 +1031,7 @@ i2c8: i2c-bus@480 {
  		status = "disabled";
  	};
  
--	i2c9: i2c-bus at 500 {
-+	i2c9: i2c at 500 {
+-	i2c9: i2c-bus@500 {
++	i2c9: i2c@500 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x500 0x80>;
-@@ -1045,7 +1045,7 @@ i2c9: i2c-bus at 500 {
+@@ -1045,7 +1045,7 @@ i2c9: i2c-bus@500 {
  		status = "disabled";
  	};
  
--	i2c10: i2c-bus at 580 {
-+	i2c10: i2c at 580 {
+-	i2c10: i2c-bus@580 {
++	i2c10: i2c@580 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x580 0x80>;
-@@ -1059,7 +1059,7 @@ i2c10: i2c-bus at 580 {
+@@ -1059,7 +1059,7 @@ i2c10: i2c-bus@580 {
  		status = "disabled";
  	};
  
--	i2c11: i2c-bus at 600 {
-+	i2c11: i2c at 600 {
+-	i2c11: i2c-bus@600 {
++	i2c11: i2c@600 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x600 0x80>;
-@@ -1073,7 +1073,7 @@ i2c11: i2c-bus at 600 {
+@@ -1073,7 +1073,7 @@ i2c11: i2c-bus@600 {
  		status = "disabled";
  	};
  
--	i2c12: i2c-bus at 680 {
-+	i2c12: i2c at 680 {
+-	i2c12: i2c-bus@680 {
++	i2c12: i2c@680 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x680 0x80>;
-@@ -1087,7 +1087,7 @@ i2c12: i2c-bus at 680 {
+@@ -1087,7 +1087,7 @@ i2c12: i2c-bus@680 {
  		status = "disabled";
  	};
  
--	i2c13: i2c-bus at 700 {
-+	i2c13: i2c at 700 {
+-	i2c13: i2c-bus@700 {
++	i2c13: i2c@700 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x700 0x80>;
-@@ -1101,7 +1101,7 @@ i2c13: i2c-bus at 700 {
+@@ -1101,7 +1101,7 @@ i2c13: i2c-bus@700 {
  		status = "disabled";
  	};
  
--	i2c14: i2c-bus at 780 {
-+	i2c14: i2c at 780 {
+-	i2c14: i2c-bus@780 {
++	i2c14: i2c@780 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x780 0x80>;
-@@ -1115,7 +1115,7 @@ i2c14: i2c-bus at 780 {
+@@ -1115,7 +1115,7 @@ i2c14: i2c-bus@780 {
  		status = "disabled";
  	};
  
--	i2c15: i2c-bus at 800 {
-+	i2c15: i2c at 800 {
+-	i2c15: i2c-bus@800 {
++	i2c15: i2c@800 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x800 0x80>;
 -- 
 2.43.0
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index 7ad4ac7..a9e5cac 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,14 @@
  "From\0Rob Herring (Arm) <robh@kernel.org>\0"
  "Subject\0[PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name\0"
  "Date\0Fri, 31 May 2024 14:31:14 -0500\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0Krzysztof Kozlowski <krzk+dt@kernel.org>"
+  Conor Dooley <conor+dt@kernel.org>
+  Joel Stanley <joel@jms.id.au>
+ " Andrew Jeffery <andrew@codeconstruct.com.au>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-arm-kernel@lists.infradead.org
+  linux-aspeed@lists.ozlabs.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "The standard node name for I2C buses is 'i2c'.\n"
@@ -17,129 +24,129 @@
  "index 857cb26ed6d7..c669ec202085 100644\n"
  "--- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi\n"
  "+++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi\n"
- "@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller at 0 {\n"
+ "@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller@0 {\n"
  " \t\tinterrupt-controller;\n"
  " \t};\n"
  " \n"
- "-\ti2c0: i2c-bus at 40 {\n"
- "+\ti2c0: i2c at 40 {\n"
+ "-\ti2c0: i2c-bus@40 {\n"
+ "+\ti2c0: i2c@40 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -478,7 +478,7 @@ i2c0: i2c-bus at 40 {\n"
+ "@@ -478,7 +478,7 @@ i2c0: i2c-bus@40 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c1: i2c-bus at 80 {\n"
- "+\ti2c1: i2c at 80 {\n"
+ "-\ti2c1: i2c-bus@80 {\n"
+ "+\ti2c1: i2c@80 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -493,7 +493,7 @@ i2c1: i2c-bus at 80 {\n"
+ "@@ -493,7 +493,7 @@ i2c1: i2c-bus@80 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c2: i2c-bus at c0 {\n"
- "+\ti2c2: i2c at c0 {\n"
+ "-\ti2c2: i2c-bus@c0 {\n"
+ "+\ti2c2: i2c@c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -509,7 +509,7 @@ i2c2: i2c-bus at c0 {\n"
+ "@@ -509,7 +509,7 @@ i2c2: i2c-bus@c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c3: i2c-bus at 100 {\n"
- "+\ti2c3: i2c at 100 {\n"
+ "-\ti2c3: i2c-bus@100 {\n"
+ "+\ti2c3: i2c@100 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -525,7 +525,7 @@ i2c3: i2c-bus at 100 {\n"
+ "@@ -525,7 +525,7 @@ i2c3: i2c-bus@100 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c4: i2c-bus at 140 {\n"
- "+\ti2c4: i2c at 140 {\n"
+ "-\ti2c4: i2c-bus@140 {\n"
+ "+\ti2c4: i2c@140 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -541,7 +541,7 @@ i2c4: i2c-bus at 140 {\n"
+ "@@ -541,7 +541,7 @@ i2c4: i2c-bus@140 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c5: i2c-bus at 180 {\n"
- "+\ti2c5: i2c at 180 {\n"
+ "-\ti2c5: i2c-bus@180 {\n"
+ "+\ti2c5: i2c@180 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -557,7 +557,7 @@ i2c5: i2c-bus at 180 {\n"
+ "@@ -557,7 +557,7 @@ i2c5: i2c-bus@180 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c6: i2c-bus at 1c0 {\n"
- "+\ti2c6: i2c at 1c0 {\n"
+ "-\ti2c6: i2c-bus@1c0 {\n"
+ "+\ti2c6: i2c@1c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -573,7 +573,7 @@ i2c6: i2c-bus at 1c0 {\n"
+ "@@ -573,7 +573,7 @@ i2c6: i2c-bus@1c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c7: i2c-bus at 300 {\n"
- "+\ti2c7: i2c at 300 {\n"
+ "-\ti2c7: i2c-bus@300 {\n"
+ "+\ti2c7: i2c@300 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -589,7 +589,7 @@ i2c7: i2c-bus at 300 {\n"
+ "@@ -589,7 +589,7 @@ i2c7: i2c-bus@300 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c8: i2c-bus at 340 {\n"
- "+\ti2c8: i2c at 340 {\n"
+ "-\ti2c8: i2c-bus@340 {\n"
+ "+\ti2c8: i2c@340 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -605,7 +605,7 @@ i2c8: i2c-bus at 340 {\n"
+ "@@ -605,7 +605,7 @@ i2c8: i2c-bus@340 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c9: i2c-bus at 380 {\n"
- "+\ti2c9: i2c at 380 {\n"
+ "-\ti2c9: i2c-bus@380 {\n"
+ "+\ti2c9: i2c@380 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -621,7 +621,7 @@ i2c9: i2c-bus at 380 {\n"
+ "@@ -621,7 +621,7 @@ i2c9: i2c-bus@380 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c10: i2c-bus at 3c0 {\n"
- "+\ti2c10: i2c at 3c0 {\n"
+ "-\ti2c10: i2c-bus@3c0 {\n"
+ "+\ti2c10: i2c@3c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -637,7 +637,7 @@ i2c10: i2c-bus at 3c0 {\n"
+ "@@ -637,7 +637,7 @@ i2c10: i2c-bus@3c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c11: i2c-bus at 400 {\n"
- "+\ti2c11: i2c at 400 {\n"
+ "-\ti2c11: i2c-bus@400 {\n"
+ "+\ti2c11: i2c@400 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -653,7 +653,7 @@ i2c11: i2c-bus at 400 {\n"
+ "@@ -653,7 +653,7 @@ i2c11: i2c-bus@400 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c12: i2c-bus at 440 {\n"
- "+\ti2c12: i2c at 440 {\n"
+ "-\ti2c12: i2c-bus@440 {\n"
+ "+\ti2c12: i2c@440 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -669,7 +669,7 @@ i2c12: i2c-bus at 440 {\n"
+ "@@ -669,7 +669,7 @@ i2c12: i2c-bus@440 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c13: i2c-bus at 480 {\n"
- "+\ti2c13: i2c at 480 {\n"
+ "-\ti2c13: i2c-bus@480 {\n"
+ "+\ti2c13: i2c@480 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
@@ -147,129 +154,129 @@
  "index e6f3cf3c721e..6e05cbcce49c 100644\n"
  "--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi\n"
  "+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi\n"
- "@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller at 0 {\n"
+ "@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller@0 {\n"
  " \t\tinterrupt-controller;\n"
  " \t};\n"
  " \n"
- "-\ti2c0: i2c-bus at 40 {\n"
- "+\ti2c0: i2c at 40 {\n"
+ "-\ti2c0: i2c-bus@40 {\n"
+ "+\ti2c0: i2c@40 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -607,7 +607,7 @@ i2c0: i2c-bus at 40 {\n"
+ "@@ -607,7 +607,7 @@ i2c0: i2c-bus@40 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c1: i2c-bus at 80 {\n"
- "+\ti2c1: i2c at 80 {\n"
+ "-\ti2c1: i2c-bus@80 {\n"
+ "+\ti2c1: i2c@80 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -622,7 +622,7 @@ i2c1: i2c-bus at 80 {\n"
+ "@@ -622,7 +622,7 @@ i2c1: i2c-bus@80 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c2: i2c-bus at c0 {\n"
- "+\ti2c2: i2c at c0 {\n"
+ "-\ti2c2: i2c-bus@c0 {\n"
+ "+\ti2c2: i2c@c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -638,7 +638,7 @@ i2c2: i2c-bus at c0 {\n"
+ "@@ -638,7 +638,7 @@ i2c2: i2c-bus@c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c3: i2c-bus at 100 {\n"
- "+\ti2c3: i2c at 100 {\n"
+ "-\ti2c3: i2c-bus@100 {\n"
+ "+\ti2c3: i2c@100 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -654,7 +654,7 @@ i2c3: i2c-bus at 100 {\n"
+ "@@ -654,7 +654,7 @@ i2c3: i2c-bus@100 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c4: i2c-bus at 140 {\n"
- "+\ti2c4: i2c at 140 {\n"
+ "-\ti2c4: i2c-bus@140 {\n"
+ "+\ti2c4: i2c@140 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -670,7 +670,7 @@ i2c4: i2c-bus at 140 {\n"
+ "@@ -670,7 +670,7 @@ i2c4: i2c-bus@140 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c5: i2c-bus at 180 {\n"
- "+\ti2c5: i2c at 180 {\n"
+ "-\ti2c5: i2c-bus@180 {\n"
+ "+\ti2c5: i2c@180 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -686,7 +686,7 @@ i2c5: i2c-bus at 180 {\n"
+ "@@ -686,7 +686,7 @@ i2c5: i2c-bus@180 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c6: i2c-bus at 1c0 {\n"
- "+\ti2c6: i2c at 1c0 {\n"
+ "-\ti2c6: i2c-bus@1c0 {\n"
+ "+\ti2c6: i2c@1c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -702,7 +702,7 @@ i2c6: i2c-bus at 1c0 {\n"
+ "@@ -702,7 +702,7 @@ i2c6: i2c-bus@1c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c7: i2c-bus at 300 {\n"
- "+\ti2c7: i2c at 300 {\n"
+ "-\ti2c7: i2c-bus@300 {\n"
+ "+\ti2c7: i2c@300 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -718,7 +718,7 @@ i2c7: i2c-bus at 300 {\n"
+ "@@ -718,7 +718,7 @@ i2c7: i2c-bus@300 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c8: i2c-bus at 340 {\n"
- "+\ti2c8: i2c at 340 {\n"
+ "-\ti2c8: i2c-bus@340 {\n"
+ "+\ti2c8: i2c@340 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -734,7 +734,7 @@ i2c8: i2c-bus at 340 {\n"
+ "@@ -734,7 +734,7 @@ i2c8: i2c-bus@340 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c9: i2c-bus at 380 {\n"
- "+\ti2c9: i2c at 380 {\n"
+ "-\ti2c9: i2c-bus@380 {\n"
+ "+\ti2c9: i2c@380 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -750,7 +750,7 @@ i2c9: i2c-bus at 380 {\n"
+ "@@ -750,7 +750,7 @@ i2c9: i2c-bus@380 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c10: i2c-bus at 3c0 {\n"
- "+\ti2c10: i2c at 3c0 {\n"
+ "-\ti2c10: i2c-bus@3c0 {\n"
+ "+\ti2c10: i2c@3c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -766,7 +766,7 @@ i2c10: i2c-bus at 3c0 {\n"
+ "@@ -766,7 +766,7 @@ i2c10: i2c-bus@3c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c11: i2c-bus at 400 {\n"
- "+\ti2c11: i2c at 400 {\n"
+ "-\ti2c11: i2c-bus@400 {\n"
+ "+\ti2c11: i2c@400 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -782,7 +782,7 @@ i2c11: i2c-bus at 400 {\n"
+ "@@ -782,7 +782,7 @@ i2c11: i2c-bus@400 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c12: i2c-bus at 440 {\n"
- "+\ti2c12: i2c at 440 {\n"
+ "-\ti2c12: i2c-bus@440 {\n"
+ "+\ti2c12: i2c@440 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -798,7 +798,7 @@ i2c12: i2c-bus at 440 {\n"
+ "@@ -798,7 +798,7 @@ i2c12: i2c-bus@440 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c13: i2c-bus at 480 {\n"
- "+\ti2c13: i2c at 480 {\n"
+ "-\ti2c13: i2c-bus@480 {\n"
+ "+\ti2c13: i2c@480 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
@@ -277,151 +284,157 @@
  "index 7fb421153596..0c00882f111a 100644\n"
  "--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi\n"
  "+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi\n"
- "@@ -905,7 +905,7 @@ udma: dma-controller at 1e79e000 {\n"
+ "@@ -905,7 +905,7 @@ udma: dma-controller@1e79e000 {\n"
  " #include \"aspeed-g6-pinctrl.dtsi\"\n"
  " \n"
  " &i2c {\n"
- "-\ti2c0: i2c-bus at 80 {\n"
- "+\ti2c0: i2c at 80 {\n"
+ "-\ti2c0: i2c-bus@80 {\n"
+ "+\ti2c0: i2c@80 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x80 0x80>;\n"
- "@@ -919,7 +919,7 @@ i2c0: i2c-bus at 80 {\n"
+ "@@ -919,7 +919,7 @@ i2c0: i2c-bus@80 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c1: i2c-bus at 100 {\n"
- "+\ti2c1: i2c at 100 {\n"
+ "-\ti2c1: i2c-bus@100 {\n"
+ "+\ti2c1: i2c@100 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x100 0x80>;\n"
- "@@ -933,7 +933,7 @@ i2c1: i2c-bus at 100 {\n"
+ "@@ -933,7 +933,7 @@ i2c1: i2c-bus@100 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c2: i2c-bus at 180 {\n"
- "+\ti2c2: i2c at 180 {\n"
+ "-\ti2c2: i2c-bus@180 {\n"
+ "+\ti2c2: i2c@180 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x180 0x80>;\n"
- "@@ -947,7 +947,7 @@ i2c2: i2c-bus at 180 {\n"
+ "@@ -947,7 +947,7 @@ i2c2: i2c-bus@180 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c3: i2c-bus at 200 {\n"
- "+\ti2c3: i2c at 200 {\n"
+ "-\ti2c3: i2c-bus@200 {\n"
+ "+\ti2c3: i2c@200 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x200 0x80>;\n"
- "@@ -961,7 +961,7 @@ i2c3: i2c-bus at 200 {\n"
+ "@@ -961,7 +961,7 @@ i2c3: i2c-bus@200 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c4: i2c-bus at 280 {\n"
- "+\ti2c4: i2c at 280 {\n"
+ "-\ti2c4: i2c-bus@280 {\n"
+ "+\ti2c4: i2c@280 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x280 0x80>;\n"
- "@@ -975,7 +975,7 @@ i2c4: i2c-bus at 280 {\n"
+ "@@ -975,7 +975,7 @@ i2c4: i2c-bus@280 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c5: i2c-bus at 300 {\n"
- "+\ti2c5: i2c at 300 {\n"
+ "-\ti2c5: i2c-bus@300 {\n"
+ "+\ti2c5: i2c@300 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x300 0x80>;\n"
- "@@ -989,7 +989,7 @@ i2c5: i2c-bus at 300 {\n"
+ "@@ -989,7 +989,7 @@ i2c5: i2c-bus@300 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c6: i2c-bus at 380 {\n"
- "+\ti2c6: i2c at 380 {\n"
+ "-\ti2c6: i2c-bus@380 {\n"
+ "+\ti2c6: i2c@380 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x380 0x80>;\n"
- "@@ -1003,7 +1003,7 @@ i2c6: i2c-bus at 380 {\n"
+ "@@ -1003,7 +1003,7 @@ i2c6: i2c-bus@380 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c7: i2c-bus at 400 {\n"
- "+\ti2c7: i2c at 400 {\n"
+ "-\ti2c7: i2c-bus@400 {\n"
+ "+\ti2c7: i2c@400 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x400 0x80>;\n"
- "@@ -1017,7 +1017,7 @@ i2c7: i2c-bus at 400 {\n"
+ "@@ -1017,7 +1017,7 @@ i2c7: i2c-bus@400 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c8: i2c-bus at 480 {\n"
- "+\ti2c8: i2c at 480 {\n"
+ "-\ti2c8: i2c-bus@480 {\n"
+ "+\ti2c8: i2c@480 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x480 0x80>;\n"
- "@@ -1031,7 +1031,7 @@ i2c8: i2c-bus at 480 {\n"
+ "@@ -1031,7 +1031,7 @@ i2c8: i2c-bus@480 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c9: i2c-bus at 500 {\n"
- "+\ti2c9: i2c at 500 {\n"
+ "-\ti2c9: i2c-bus@500 {\n"
+ "+\ti2c9: i2c@500 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x500 0x80>;\n"
- "@@ -1045,7 +1045,7 @@ i2c9: i2c-bus at 500 {\n"
+ "@@ -1045,7 +1045,7 @@ i2c9: i2c-bus@500 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c10: i2c-bus at 580 {\n"
- "+\ti2c10: i2c at 580 {\n"
+ "-\ti2c10: i2c-bus@580 {\n"
+ "+\ti2c10: i2c@580 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x580 0x80>;\n"
- "@@ -1059,7 +1059,7 @@ i2c10: i2c-bus at 580 {\n"
+ "@@ -1059,7 +1059,7 @@ i2c10: i2c-bus@580 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c11: i2c-bus at 600 {\n"
- "+\ti2c11: i2c at 600 {\n"
+ "-\ti2c11: i2c-bus@600 {\n"
+ "+\ti2c11: i2c@600 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x600 0x80>;\n"
- "@@ -1073,7 +1073,7 @@ i2c11: i2c-bus at 600 {\n"
+ "@@ -1073,7 +1073,7 @@ i2c11: i2c-bus@600 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c12: i2c-bus at 680 {\n"
- "+\ti2c12: i2c at 680 {\n"
+ "-\ti2c12: i2c-bus@680 {\n"
+ "+\ti2c12: i2c@680 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x680 0x80>;\n"
- "@@ -1087,7 +1087,7 @@ i2c12: i2c-bus at 680 {\n"
+ "@@ -1087,7 +1087,7 @@ i2c12: i2c-bus@680 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c13: i2c-bus at 700 {\n"
- "+\ti2c13: i2c at 700 {\n"
+ "-\ti2c13: i2c-bus@700 {\n"
+ "+\ti2c13: i2c@700 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x700 0x80>;\n"
- "@@ -1101,7 +1101,7 @@ i2c13: i2c-bus at 700 {\n"
+ "@@ -1101,7 +1101,7 @@ i2c13: i2c-bus@700 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c14: i2c-bus at 780 {\n"
- "+\ti2c14: i2c at 780 {\n"
+ "-\ti2c14: i2c-bus@780 {\n"
+ "+\ti2c14: i2c@780 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x780 0x80>;\n"
- "@@ -1115,7 +1115,7 @@ i2c14: i2c-bus at 780 {\n"
+ "@@ -1115,7 +1115,7 @@ i2c14: i2c-bus@780 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c15: i2c-bus at 800 {\n"
- "+\ti2c15: i2c at 800 {\n"
+ "-\ti2c15: i2c-bus@800 {\n"
+ "+\ti2c15: i2c@800 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x800 0x80>;\n"
  "-- \n"
- 2.43.0
+ "2.43.0\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-6ca7cacc799c3fa498e05b012ca0e58e0f02f4d93fdbb88a81de85254092bd62
+aeed9203e2886a958c0e042dcc67cba11f78d515fee2516d244f3c1c4c8f89c8

diff --git a/a/1.txt b/N2/1.txt
index 5afda9a..8e1ad22 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -11,129 +11,129 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed/
 index 857cb26ed6d7..c669ec202085 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
-@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller at 0 {
+@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller@0 {
  		interrupt-controller;
  	};
  
--	i2c0: i2c-bus at 40 {
-+	i2c0: i2c at 40 {
+-	i2c0: i2c-bus@40 {
++	i2c0: i2c@40 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -478,7 +478,7 @@ i2c0: i2c-bus at 40 {
+@@ -478,7 +478,7 @@ i2c0: i2c-bus@40 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c1: i2c-bus at 80 {
-+	i2c1: i2c at 80 {
+-	i2c1: i2c-bus@80 {
++	i2c1: i2c@80 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -493,7 +493,7 @@ i2c1: i2c-bus at 80 {
+@@ -493,7 +493,7 @@ i2c1: i2c-bus@80 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c2: i2c-bus at c0 {
-+	i2c2: i2c at c0 {
+-	i2c2: i2c-bus@c0 {
++	i2c2: i2c@c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -509,7 +509,7 @@ i2c2: i2c-bus at c0 {
+@@ -509,7 +509,7 @@ i2c2: i2c-bus@c0 {
  		status = "disabled";
  	};
  
--	i2c3: i2c-bus at 100 {
-+	i2c3: i2c at 100 {
+-	i2c3: i2c-bus@100 {
++	i2c3: i2c@100 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -525,7 +525,7 @@ i2c3: i2c-bus at 100 {
+@@ -525,7 +525,7 @@ i2c3: i2c-bus@100 {
  		status = "disabled";
  	};
  
--	i2c4: i2c-bus at 140 {
-+	i2c4: i2c at 140 {
+-	i2c4: i2c-bus@140 {
++	i2c4: i2c@140 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -541,7 +541,7 @@ i2c4: i2c-bus at 140 {
+@@ -541,7 +541,7 @@ i2c4: i2c-bus@140 {
  		status = "disabled";
  	};
  
--	i2c5: i2c-bus at 180 {
-+	i2c5: i2c at 180 {
+-	i2c5: i2c-bus@180 {
++	i2c5: i2c@180 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -557,7 +557,7 @@ i2c5: i2c-bus at 180 {
+@@ -557,7 +557,7 @@ i2c5: i2c-bus@180 {
  		status = "disabled";
  	};
  
--	i2c6: i2c-bus at 1c0 {
-+	i2c6: i2c at 1c0 {
+-	i2c6: i2c-bus@1c0 {
++	i2c6: i2c@1c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -573,7 +573,7 @@ i2c6: i2c-bus at 1c0 {
+@@ -573,7 +573,7 @@ i2c6: i2c-bus@1c0 {
  		status = "disabled";
  	};
  
--	i2c7: i2c-bus at 300 {
-+	i2c7: i2c at 300 {
+-	i2c7: i2c-bus@300 {
++	i2c7: i2c@300 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -589,7 +589,7 @@ i2c7: i2c-bus at 300 {
+@@ -589,7 +589,7 @@ i2c7: i2c-bus@300 {
  		status = "disabled";
  	};
  
--	i2c8: i2c-bus at 340 {
-+	i2c8: i2c at 340 {
+-	i2c8: i2c-bus@340 {
++	i2c8: i2c@340 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -605,7 +605,7 @@ i2c8: i2c-bus at 340 {
+@@ -605,7 +605,7 @@ i2c8: i2c-bus@340 {
  		status = "disabled";
  	};
  
--	i2c9: i2c-bus at 380 {
-+	i2c9: i2c at 380 {
+-	i2c9: i2c-bus@380 {
++	i2c9: i2c@380 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -621,7 +621,7 @@ i2c9: i2c-bus at 380 {
+@@ -621,7 +621,7 @@ i2c9: i2c-bus@380 {
  		status = "disabled";
  	};
  
--	i2c10: i2c-bus at 3c0 {
-+	i2c10: i2c at 3c0 {
+-	i2c10: i2c-bus@3c0 {
++	i2c10: i2c@3c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -637,7 +637,7 @@ i2c10: i2c-bus at 3c0 {
+@@ -637,7 +637,7 @@ i2c10: i2c-bus@3c0 {
  		status = "disabled";
  	};
  
--	i2c11: i2c-bus at 400 {
-+	i2c11: i2c at 400 {
+-	i2c11: i2c-bus@400 {
++	i2c11: i2c@400 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -653,7 +653,7 @@ i2c11: i2c-bus at 400 {
+@@ -653,7 +653,7 @@ i2c11: i2c-bus@400 {
  		status = "disabled";
  	};
  
--	i2c12: i2c-bus at 440 {
-+	i2c12: i2c at 440 {
+-	i2c12: i2c-bus@440 {
++	i2c12: i2c@440 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -669,7 +669,7 @@ i2c12: i2c-bus at 440 {
+@@ -669,7 +669,7 @@ i2c12: i2c-bus@440 {
  		status = "disabled";
  	};
  
--	i2c13: i2c-bus at 480 {
-+	i2c13: i2c at 480 {
+-	i2c13: i2c-bus@480 {
++	i2c13: i2c@480 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
@@ -141,129 +141,129 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/
 index e6f3cf3c721e..6e05cbcce49c 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
-@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller at 0 {
+@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller@0 {
  		interrupt-controller;
  	};
  
--	i2c0: i2c-bus at 40 {
-+	i2c0: i2c at 40 {
+-	i2c0: i2c-bus@40 {
++	i2c0: i2c@40 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -607,7 +607,7 @@ i2c0: i2c-bus at 40 {
+@@ -607,7 +607,7 @@ i2c0: i2c-bus@40 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c1: i2c-bus at 80 {
-+	i2c1: i2c at 80 {
+-	i2c1: i2c-bus@80 {
++	i2c1: i2c@80 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -622,7 +622,7 @@ i2c1: i2c-bus at 80 {
+@@ -622,7 +622,7 @@ i2c1: i2c-bus@80 {
  		/* Does not need pinctrl properties */
  	};
  
--	i2c2: i2c-bus at c0 {
-+	i2c2: i2c at c0 {
+-	i2c2: i2c-bus@c0 {
++	i2c2: i2c@c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -638,7 +638,7 @@ i2c2: i2c-bus at c0 {
+@@ -638,7 +638,7 @@ i2c2: i2c-bus@c0 {
  		status = "disabled";
  	};
  
--	i2c3: i2c-bus at 100 {
-+	i2c3: i2c at 100 {
+-	i2c3: i2c-bus@100 {
++	i2c3: i2c@100 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -654,7 +654,7 @@ i2c3: i2c-bus at 100 {
+@@ -654,7 +654,7 @@ i2c3: i2c-bus@100 {
  		status = "disabled";
  	};
  
--	i2c4: i2c-bus at 140 {
-+	i2c4: i2c at 140 {
+-	i2c4: i2c-bus@140 {
++	i2c4: i2c@140 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -670,7 +670,7 @@ i2c4: i2c-bus at 140 {
+@@ -670,7 +670,7 @@ i2c4: i2c-bus@140 {
  		status = "disabled";
  	};
  
--	i2c5: i2c-bus at 180 {
-+	i2c5: i2c at 180 {
+-	i2c5: i2c-bus@180 {
++	i2c5: i2c@180 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -686,7 +686,7 @@ i2c5: i2c-bus at 180 {
+@@ -686,7 +686,7 @@ i2c5: i2c-bus@180 {
  		status = "disabled";
  	};
  
--	i2c6: i2c-bus at 1c0 {
-+	i2c6: i2c at 1c0 {
+-	i2c6: i2c-bus@1c0 {
++	i2c6: i2c@1c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -702,7 +702,7 @@ i2c6: i2c-bus at 1c0 {
+@@ -702,7 +702,7 @@ i2c6: i2c-bus@1c0 {
  		status = "disabled";
  	};
  
--	i2c7: i2c-bus at 300 {
-+	i2c7: i2c at 300 {
+-	i2c7: i2c-bus@300 {
++	i2c7: i2c@300 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -718,7 +718,7 @@ i2c7: i2c-bus at 300 {
+@@ -718,7 +718,7 @@ i2c7: i2c-bus@300 {
  		status = "disabled";
  	};
  
--	i2c8: i2c-bus at 340 {
-+	i2c8: i2c at 340 {
+-	i2c8: i2c-bus@340 {
++	i2c8: i2c@340 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -734,7 +734,7 @@ i2c8: i2c-bus at 340 {
+@@ -734,7 +734,7 @@ i2c8: i2c-bus@340 {
  		status = "disabled";
  	};
  
--	i2c9: i2c-bus at 380 {
-+	i2c9: i2c at 380 {
+-	i2c9: i2c-bus@380 {
++	i2c9: i2c@380 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -750,7 +750,7 @@ i2c9: i2c-bus at 380 {
+@@ -750,7 +750,7 @@ i2c9: i2c-bus@380 {
  		status = "disabled";
  	};
  
--	i2c10: i2c-bus at 3c0 {
-+	i2c10: i2c at 3c0 {
+-	i2c10: i2c-bus@3c0 {
++	i2c10: i2c@3c0 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -766,7 +766,7 @@ i2c10: i2c-bus at 3c0 {
+@@ -766,7 +766,7 @@ i2c10: i2c-bus@3c0 {
  		status = "disabled";
  	};
  
--	i2c11: i2c-bus at 400 {
-+	i2c11: i2c at 400 {
+-	i2c11: i2c-bus@400 {
++	i2c11: i2c@400 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -782,7 +782,7 @@ i2c11: i2c-bus at 400 {
+@@ -782,7 +782,7 @@ i2c11: i2c-bus@400 {
  		status = "disabled";
  	};
  
--	i2c12: i2c-bus at 440 {
-+	i2c12: i2c at 440 {
+-	i2c12: i2c-bus@440 {
++	i2c12: i2c@440 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
-@@ -798,7 +798,7 @@ i2c12: i2c-bus at 440 {
+@@ -798,7 +798,7 @@ i2c12: i2c-bus@440 {
  		status = "disabled";
  	};
  
--	i2c13: i2c-bus at 480 {
-+	i2c13: i2c at 480 {
+-	i2c13: i2c-bus@480 {
++	i2c13: i2c@480 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  
@@ -271,147 +271,147 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/
 index 7fb421153596..0c00882f111a 100644
 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
 +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
-@@ -905,7 +905,7 @@ udma: dma-controller at 1e79e000 {
+@@ -905,7 +905,7 @@ udma: dma-controller@1e79e000 {
  #include "aspeed-g6-pinctrl.dtsi"
  
  &i2c {
--	i2c0: i2c-bus at 80 {
-+	i2c0: i2c at 80 {
+-	i2c0: i2c-bus@80 {
++	i2c0: i2c@80 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x80 0x80>;
-@@ -919,7 +919,7 @@ i2c0: i2c-bus at 80 {
+@@ -919,7 +919,7 @@ i2c0: i2c-bus@80 {
  		status = "disabled";
  	};
  
--	i2c1: i2c-bus at 100 {
-+	i2c1: i2c at 100 {
+-	i2c1: i2c-bus@100 {
++	i2c1: i2c@100 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x100 0x80>;
-@@ -933,7 +933,7 @@ i2c1: i2c-bus at 100 {
+@@ -933,7 +933,7 @@ i2c1: i2c-bus@100 {
  		status = "disabled";
  	};
  
--	i2c2: i2c-bus at 180 {
-+	i2c2: i2c at 180 {
+-	i2c2: i2c-bus@180 {
++	i2c2: i2c@180 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x180 0x80>;
-@@ -947,7 +947,7 @@ i2c2: i2c-bus at 180 {
+@@ -947,7 +947,7 @@ i2c2: i2c-bus@180 {
  		status = "disabled";
  	};
  
--	i2c3: i2c-bus at 200 {
-+	i2c3: i2c at 200 {
+-	i2c3: i2c-bus@200 {
++	i2c3: i2c@200 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x200 0x80>;
-@@ -961,7 +961,7 @@ i2c3: i2c-bus at 200 {
+@@ -961,7 +961,7 @@ i2c3: i2c-bus@200 {
  		status = "disabled";
  	};
  
--	i2c4: i2c-bus at 280 {
-+	i2c4: i2c at 280 {
+-	i2c4: i2c-bus@280 {
++	i2c4: i2c@280 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x280 0x80>;
-@@ -975,7 +975,7 @@ i2c4: i2c-bus at 280 {
+@@ -975,7 +975,7 @@ i2c4: i2c-bus@280 {
  		status = "disabled";
  	};
  
--	i2c5: i2c-bus at 300 {
-+	i2c5: i2c at 300 {
+-	i2c5: i2c-bus@300 {
++	i2c5: i2c@300 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x300 0x80>;
-@@ -989,7 +989,7 @@ i2c5: i2c-bus at 300 {
+@@ -989,7 +989,7 @@ i2c5: i2c-bus@300 {
  		status = "disabled";
  	};
  
--	i2c6: i2c-bus at 380 {
-+	i2c6: i2c at 380 {
+-	i2c6: i2c-bus@380 {
++	i2c6: i2c@380 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x380 0x80>;
-@@ -1003,7 +1003,7 @@ i2c6: i2c-bus at 380 {
+@@ -1003,7 +1003,7 @@ i2c6: i2c-bus@380 {
  		status = "disabled";
  	};
  
--	i2c7: i2c-bus at 400 {
-+	i2c7: i2c at 400 {
+-	i2c7: i2c-bus@400 {
++	i2c7: i2c@400 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x400 0x80>;
-@@ -1017,7 +1017,7 @@ i2c7: i2c-bus at 400 {
+@@ -1017,7 +1017,7 @@ i2c7: i2c-bus@400 {
  		status = "disabled";
  	};
  
--	i2c8: i2c-bus at 480 {
-+	i2c8: i2c at 480 {
+-	i2c8: i2c-bus@480 {
++	i2c8: i2c@480 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x480 0x80>;
-@@ -1031,7 +1031,7 @@ i2c8: i2c-bus at 480 {
+@@ -1031,7 +1031,7 @@ i2c8: i2c-bus@480 {
  		status = "disabled";
  	};
  
--	i2c9: i2c-bus at 500 {
-+	i2c9: i2c at 500 {
+-	i2c9: i2c-bus@500 {
++	i2c9: i2c@500 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x500 0x80>;
-@@ -1045,7 +1045,7 @@ i2c9: i2c-bus at 500 {
+@@ -1045,7 +1045,7 @@ i2c9: i2c-bus@500 {
  		status = "disabled";
  	};
  
--	i2c10: i2c-bus at 580 {
-+	i2c10: i2c at 580 {
+-	i2c10: i2c-bus@580 {
++	i2c10: i2c@580 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x580 0x80>;
-@@ -1059,7 +1059,7 @@ i2c10: i2c-bus at 580 {
+@@ -1059,7 +1059,7 @@ i2c10: i2c-bus@580 {
  		status = "disabled";
  	};
  
--	i2c11: i2c-bus at 600 {
-+	i2c11: i2c at 600 {
+-	i2c11: i2c-bus@600 {
++	i2c11: i2c@600 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x600 0x80>;
-@@ -1073,7 +1073,7 @@ i2c11: i2c-bus at 600 {
+@@ -1073,7 +1073,7 @@ i2c11: i2c-bus@600 {
  		status = "disabled";
  	};
  
--	i2c12: i2c-bus at 680 {
-+	i2c12: i2c at 680 {
+-	i2c12: i2c-bus@680 {
++	i2c12: i2c@680 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x680 0x80>;
-@@ -1087,7 +1087,7 @@ i2c12: i2c-bus at 680 {
+@@ -1087,7 +1087,7 @@ i2c12: i2c-bus@680 {
  		status = "disabled";
  	};
  
--	i2c13: i2c-bus at 700 {
-+	i2c13: i2c at 700 {
+-	i2c13: i2c-bus@700 {
++	i2c13: i2c@700 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x700 0x80>;
-@@ -1101,7 +1101,7 @@ i2c13: i2c-bus at 700 {
+@@ -1101,7 +1101,7 @@ i2c13: i2c-bus@700 {
  		status = "disabled";
  	};
  
--	i2c14: i2c-bus at 780 {
-+	i2c14: i2c at 780 {
+-	i2c14: i2c-bus@780 {
++	i2c14: i2c@780 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x780 0x80>;
-@@ -1115,7 +1115,7 @@ i2c14: i2c-bus at 780 {
+@@ -1115,7 +1115,7 @@ i2c14: i2c-bus@780 {
  		status = "disabled";
  	};
  
--	i2c15: i2c-bus at 800 {
-+	i2c15: i2c at 800 {
+-	i2c15: i2c-bus@800 {
++	i2c15: i2c@800 {
  		#address-cells = <1>;
  		#size-cells = <0>;
  		reg = <0x800 0x80>;
diff --git a/a/content_digest b/N2/content_digest
index 7ad4ac7..14de83f 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -1,7 +1,14 @@
  "From\0Rob Herring (Arm) <robh@kernel.org>\0"
  "Subject\0[PATCH] arm: dts: aspeed: Use standard 'i2c' bus node name\0"
  "Date\0Fri, 31 May 2024 14:31:14 -0500\0"
- "To\0linux-aspeed@lists.ozlabs.org\0"
+ "To\0Krzysztof Kozlowski <krzk+dt@kernel.org>"
+  Conor Dooley <conor+dt@kernel.org>
+  Joel Stanley <joel@jms.id.au>
+ " Andrew Jeffery <andrew@codeconstruct.com.au>\0"
+ "Cc\0devicetree@vger.kernel.org"
+  linux-arm-kernel@lists.infradead.org
+  linux-aspeed@lists.ozlabs.org
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "The standard node name for I2C buses is 'i2c'.\n"
@@ -17,129 +24,129 @@
  "index 857cb26ed6d7..c669ec202085 100644\n"
  "--- a/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi\n"
  "+++ b/arch/arm/boot/dts/aspeed/aspeed-g4.dtsi\n"
- "@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller at 0 {\n"
+ "@@ -463,7 +463,7 @@ i2c_ic: interrupt-controller@0 {\n"
  " \t\tinterrupt-controller;\n"
  " \t};\n"
  " \n"
- "-\ti2c0: i2c-bus at 40 {\n"
- "+\ti2c0: i2c at 40 {\n"
+ "-\ti2c0: i2c-bus@40 {\n"
+ "+\ti2c0: i2c@40 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -478,7 +478,7 @@ i2c0: i2c-bus at 40 {\n"
+ "@@ -478,7 +478,7 @@ i2c0: i2c-bus@40 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c1: i2c-bus at 80 {\n"
- "+\ti2c1: i2c at 80 {\n"
+ "-\ti2c1: i2c-bus@80 {\n"
+ "+\ti2c1: i2c@80 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -493,7 +493,7 @@ i2c1: i2c-bus at 80 {\n"
+ "@@ -493,7 +493,7 @@ i2c1: i2c-bus@80 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c2: i2c-bus at c0 {\n"
- "+\ti2c2: i2c at c0 {\n"
+ "-\ti2c2: i2c-bus@c0 {\n"
+ "+\ti2c2: i2c@c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -509,7 +509,7 @@ i2c2: i2c-bus at c0 {\n"
+ "@@ -509,7 +509,7 @@ i2c2: i2c-bus@c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c3: i2c-bus at 100 {\n"
- "+\ti2c3: i2c at 100 {\n"
+ "-\ti2c3: i2c-bus@100 {\n"
+ "+\ti2c3: i2c@100 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -525,7 +525,7 @@ i2c3: i2c-bus at 100 {\n"
+ "@@ -525,7 +525,7 @@ i2c3: i2c-bus@100 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c4: i2c-bus at 140 {\n"
- "+\ti2c4: i2c at 140 {\n"
+ "-\ti2c4: i2c-bus@140 {\n"
+ "+\ti2c4: i2c@140 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -541,7 +541,7 @@ i2c4: i2c-bus at 140 {\n"
+ "@@ -541,7 +541,7 @@ i2c4: i2c-bus@140 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c5: i2c-bus at 180 {\n"
- "+\ti2c5: i2c at 180 {\n"
+ "-\ti2c5: i2c-bus@180 {\n"
+ "+\ti2c5: i2c@180 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -557,7 +557,7 @@ i2c5: i2c-bus at 180 {\n"
+ "@@ -557,7 +557,7 @@ i2c5: i2c-bus@180 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c6: i2c-bus at 1c0 {\n"
- "+\ti2c6: i2c at 1c0 {\n"
+ "-\ti2c6: i2c-bus@1c0 {\n"
+ "+\ti2c6: i2c@1c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -573,7 +573,7 @@ i2c6: i2c-bus at 1c0 {\n"
+ "@@ -573,7 +573,7 @@ i2c6: i2c-bus@1c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c7: i2c-bus at 300 {\n"
- "+\ti2c7: i2c at 300 {\n"
+ "-\ti2c7: i2c-bus@300 {\n"
+ "+\ti2c7: i2c@300 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -589,7 +589,7 @@ i2c7: i2c-bus at 300 {\n"
+ "@@ -589,7 +589,7 @@ i2c7: i2c-bus@300 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c8: i2c-bus at 340 {\n"
- "+\ti2c8: i2c at 340 {\n"
+ "-\ti2c8: i2c-bus@340 {\n"
+ "+\ti2c8: i2c@340 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -605,7 +605,7 @@ i2c8: i2c-bus at 340 {\n"
+ "@@ -605,7 +605,7 @@ i2c8: i2c-bus@340 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c9: i2c-bus at 380 {\n"
- "+\ti2c9: i2c at 380 {\n"
+ "-\ti2c9: i2c-bus@380 {\n"
+ "+\ti2c9: i2c@380 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -621,7 +621,7 @@ i2c9: i2c-bus at 380 {\n"
+ "@@ -621,7 +621,7 @@ i2c9: i2c-bus@380 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c10: i2c-bus at 3c0 {\n"
- "+\ti2c10: i2c at 3c0 {\n"
+ "-\ti2c10: i2c-bus@3c0 {\n"
+ "+\ti2c10: i2c@3c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -637,7 +637,7 @@ i2c10: i2c-bus at 3c0 {\n"
+ "@@ -637,7 +637,7 @@ i2c10: i2c-bus@3c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c11: i2c-bus at 400 {\n"
- "+\ti2c11: i2c at 400 {\n"
+ "-\ti2c11: i2c-bus@400 {\n"
+ "+\ti2c11: i2c@400 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -653,7 +653,7 @@ i2c11: i2c-bus at 400 {\n"
+ "@@ -653,7 +653,7 @@ i2c11: i2c-bus@400 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c12: i2c-bus at 440 {\n"
- "+\ti2c12: i2c at 440 {\n"
+ "-\ti2c12: i2c-bus@440 {\n"
+ "+\ti2c12: i2c@440 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -669,7 +669,7 @@ i2c12: i2c-bus at 440 {\n"
+ "@@ -669,7 +669,7 @@ i2c12: i2c-bus@440 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c13: i2c-bus at 480 {\n"
- "+\ti2c13: i2c at 480 {\n"
+ "-\ti2c13: i2c-bus@480 {\n"
+ "+\ti2c13: i2c@480 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
@@ -147,129 +154,129 @@
  "index e6f3cf3c721e..6e05cbcce49c 100644\n"
  "--- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi\n"
  "+++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi\n"
- "@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller at 0 {\n"
+ "@@ -592,7 +592,7 @@ i2c_ic: interrupt-controller@0 {\n"
  " \t\tinterrupt-controller;\n"
  " \t};\n"
  " \n"
- "-\ti2c0: i2c-bus at 40 {\n"
- "+\ti2c0: i2c at 40 {\n"
+ "-\ti2c0: i2c-bus@40 {\n"
+ "+\ti2c0: i2c@40 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -607,7 +607,7 @@ i2c0: i2c-bus at 40 {\n"
+ "@@ -607,7 +607,7 @@ i2c0: i2c-bus@40 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c1: i2c-bus at 80 {\n"
- "+\ti2c1: i2c at 80 {\n"
+ "-\ti2c1: i2c-bus@80 {\n"
+ "+\ti2c1: i2c@80 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -622,7 +622,7 @@ i2c1: i2c-bus at 80 {\n"
+ "@@ -622,7 +622,7 @@ i2c1: i2c-bus@80 {\n"
  " \t\t/* Does not need pinctrl properties */\n"
  " \t};\n"
  " \n"
- "-\ti2c2: i2c-bus at c0 {\n"
- "+\ti2c2: i2c at c0 {\n"
+ "-\ti2c2: i2c-bus@c0 {\n"
+ "+\ti2c2: i2c@c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -638,7 +638,7 @@ i2c2: i2c-bus at c0 {\n"
+ "@@ -638,7 +638,7 @@ i2c2: i2c-bus@c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c3: i2c-bus at 100 {\n"
- "+\ti2c3: i2c at 100 {\n"
+ "-\ti2c3: i2c-bus@100 {\n"
+ "+\ti2c3: i2c@100 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -654,7 +654,7 @@ i2c3: i2c-bus at 100 {\n"
+ "@@ -654,7 +654,7 @@ i2c3: i2c-bus@100 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c4: i2c-bus at 140 {\n"
- "+\ti2c4: i2c at 140 {\n"
+ "-\ti2c4: i2c-bus@140 {\n"
+ "+\ti2c4: i2c@140 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -670,7 +670,7 @@ i2c4: i2c-bus at 140 {\n"
+ "@@ -670,7 +670,7 @@ i2c4: i2c-bus@140 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c5: i2c-bus at 180 {\n"
- "+\ti2c5: i2c at 180 {\n"
+ "-\ti2c5: i2c-bus@180 {\n"
+ "+\ti2c5: i2c@180 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -686,7 +686,7 @@ i2c5: i2c-bus at 180 {\n"
+ "@@ -686,7 +686,7 @@ i2c5: i2c-bus@180 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c6: i2c-bus at 1c0 {\n"
- "+\ti2c6: i2c at 1c0 {\n"
+ "-\ti2c6: i2c-bus@1c0 {\n"
+ "+\ti2c6: i2c@1c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -702,7 +702,7 @@ i2c6: i2c-bus at 1c0 {\n"
+ "@@ -702,7 +702,7 @@ i2c6: i2c-bus@1c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c7: i2c-bus at 300 {\n"
- "+\ti2c7: i2c at 300 {\n"
+ "-\ti2c7: i2c-bus@300 {\n"
+ "+\ti2c7: i2c@300 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -718,7 +718,7 @@ i2c7: i2c-bus at 300 {\n"
+ "@@ -718,7 +718,7 @@ i2c7: i2c-bus@300 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c8: i2c-bus at 340 {\n"
- "+\ti2c8: i2c at 340 {\n"
+ "-\ti2c8: i2c-bus@340 {\n"
+ "+\ti2c8: i2c@340 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -734,7 +734,7 @@ i2c8: i2c-bus at 340 {\n"
+ "@@ -734,7 +734,7 @@ i2c8: i2c-bus@340 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c9: i2c-bus at 380 {\n"
- "+\ti2c9: i2c at 380 {\n"
+ "-\ti2c9: i2c-bus@380 {\n"
+ "+\ti2c9: i2c@380 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -750,7 +750,7 @@ i2c9: i2c-bus at 380 {\n"
+ "@@ -750,7 +750,7 @@ i2c9: i2c-bus@380 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c10: i2c-bus at 3c0 {\n"
- "+\ti2c10: i2c at 3c0 {\n"
+ "-\ti2c10: i2c-bus@3c0 {\n"
+ "+\ti2c10: i2c@3c0 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -766,7 +766,7 @@ i2c10: i2c-bus at 3c0 {\n"
+ "@@ -766,7 +766,7 @@ i2c10: i2c-bus@3c0 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c11: i2c-bus at 400 {\n"
- "+\ti2c11: i2c at 400 {\n"
+ "-\ti2c11: i2c-bus@400 {\n"
+ "+\ti2c11: i2c@400 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -782,7 +782,7 @@ i2c11: i2c-bus at 400 {\n"
+ "@@ -782,7 +782,7 @@ i2c11: i2c-bus@400 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c12: i2c-bus at 440 {\n"
- "+\ti2c12: i2c at 440 {\n"
+ "-\ti2c12: i2c-bus@440 {\n"
+ "+\ti2c12: i2c@440 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
- "@@ -798,7 +798,7 @@ i2c12: i2c-bus at 440 {\n"
+ "@@ -798,7 +798,7 @@ i2c12: i2c-bus@440 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c13: i2c-bus at 480 {\n"
- "+\ti2c13: i2c at 480 {\n"
+ "-\ti2c13: i2c-bus@480 {\n"
+ "+\ti2c13: i2c@480 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \n"
@@ -277,151 +284,151 @@
  "index 7fb421153596..0c00882f111a 100644\n"
  "--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi\n"
  "+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi\n"
- "@@ -905,7 +905,7 @@ udma: dma-controller at 1e79e000 {\n"
+ "@@ -905,7 +905,7 @@ udma: dma-controller@1e79e000 {\n"
  " #include \"aspeed-g6-pinctrl.dtsi\"\n"
  " \n"
  " &i2c {\n"
- "-\ti2c0: i2c-bus at 80 {\n"
- "+\ti2c0: i2c at 80 {\n"
+ "-\ti2c0: i2c-bus@80 {\n"
+ "+\ti2c0: i2c@80 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x80 0x80>;\n"
- "@@ -919,7 +919,7 @@ i2c0: i2c-bus at 80 {\n"
+ "@@ -919,7 +919,7 @@ i2c0: i2c-bus@80 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c1: i2c-bus at 100 {\n"
- "+\ti2c1: i2c at 100 {\n"
+ "-\ti2c1: i2c-bus@100 {\n"
+ "+\ti2c1: i2c@100 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x100 0x80>;\n"
- "@@ -933,7 +933,7 @@ i2c1: i2c-bus at 100 {\n"
+ "@@ -933,7 +933,7 @@ i2c1: i2c-bus@100 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c2: i2c-bus at 180 {\n"
- "+\ti2c2: i2c at 180 {\n"
+ "-\ti2c2: i2c-bus@180 {\n"
+ "+\ti2c2: i2c@180 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x180 0x80>;\n"
- "@@ -947,7 +947,7 @@ i2c2: i2c-bus at 180 {\n"
+ "@@ -947,7 +947,7 @@ i2c2: i2c-bus@180 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c3: i2c-bus at 200 {\n"
- "+\ti2c3: i2c at 200 {\n"
+ "-\ti2c3: i2c-bus@200 {\n"
+ "+\ti2c3: i2c@200 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x200 0x80>;\n"
- "@@ -961,7 +961,7 @@ i2c3: i2c-bus at 200 {\n"
+ "@@ -961,7 +961,7 @@ i2c3: i2c-bus@200 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c4: i2c-bus at 280 {\n"
- "+\ti2c4: i2c at 280 {\n"
+ "-\ti2c4: i2c-bus@280 {\n"
+ "+\ti2c4: i2c@280 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x280 0x80>;\n"
- "@@ -975,7 +975,7 @@ i2c4: i2c-bus at 280 {\n"
+ "@@ -975,7 +975,7 @@ i2c4: i2c-bus@280 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c5: i2c-bus at 300 {\n"
- "+\ti2c5: i2c at 300 {\n"
+ "-\ti2c5: i2c-bus@300 {\n"
+ "+\ti2c5: i2c@300 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x300 0x80>;\n"
- "@@ -989,7 +989,7 @@ i2c5: i2c-bus at 300 {\n"
+ "@@ -989,7 +989,7 @@ i2c5: i2c-bus@300 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c6: i2c-bus at 380 {\n"
- "+\ti2c6: i2c at 380 {\n"
+ "-\ti2c6: i2c-bus@380 {\n"
+ "+\ti2c6: i2c@380 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x380 0x80>;\n"
- "@@ -1003,7 +1003,7 @@ i2c6: i2c-bus at 380 {\n"
+ "@@ -1003,7 +1003,7 @@ i2c6: i2c-bus@380 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c7: i2c-bus at 400 {\n"
- "+\ti2c7: i2c at 400 {\n"
+ "-\ti2c7: i2c-bus@400 {\n"
+ "+\ti2c7: i2c@400 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x400 0x80>;\n"
- "@@ -1017,7 +1017,7 @@ i2c7: i2c-bus at 400 {\n"
+ "@@ -1017,7 +1017,7 @@ i2c7: i2c-bus@400 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c8: i2c-bus at 480 {\n"
- "+\ti2c8: i2c at 480 {\n"
+ "-\ti2c8: i2c-bus@480 {\n"
+ "+\ti2c8: i2c@480 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x480 0x80>;\n"
- "@@ -1031,7 +1031,7 @@ i2c8: i2c-bus at 480 {\n"
+ "@@ -1031,7 +1031,7 @@ i2c8: i2c-bus@480 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c9: i2c-bus at 500 {\n"
- "+\ti2c9: i2c at 500 {\n"
+ "-\ti2c9: i2c-bus@500 {\n"
+ "+\ti2c9: i2c@500 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x500 0x80>;\n"
- "@@ -1045,7 +1045,7 @@ i2c9: i2c-bus at 500 {\n"
+ "@@ -1045,7 +1045,7 @@ i2c9: i2c-bus@500 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c10: i2c-bus at 580 {\n"
- "+\ti2c10: i2c at 580 {\n"
+ "-\ti2c10: i2c-bus@580 {\n"
+ "+\ti2c10: i2c@580 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x580 0x80>;\n"
- "@@ -1059,7 +1059,7 @@ i2c10: i2c-bus at 580 {\n"
+ "@@ -1059,7 +1059,7 @@ i2c10: i2c-bus@580 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c11: i2c-bus at 600 {\n"
- "+\ti2c11: i2c at 600 {\n"
+ "-\ti2c11: i2c-bus@600 {\n"
+ "+\ti2c11: i2c@600 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x600 0x80>;\n"
- "@@ -1073,7 +1073,7 @@ i2c11: i2c-bus at 600 {\n"
+ "@@ -1073,7 +1073,7 @@ i2c11: i2c-bus@600 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c12: i2c-bus at 680 {\n"
- "+\ti2c12: i2c at 680 {\n"
+ "-\ti2c12: i2c-bus@680 {\n"
+ "+\ti2c12: i2c@680 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x680 0x80>;\n"
- "@@ -1087,7 +1087,7 @@ i2c12: i2c-bus at 680 {\n"
+ "@@ -1087,7 +1087,7 @@ i2c12: i2c-bus@680 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c13: i2c-bus at 700 {\n"
- "+\ti2c13: i2c at 700 {\n"
+ "-\ti2c13: i2c-bus@700 {\n"
+ "+\ti2c13: i2c@700 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x700 0x80>;\n"
- "@@ -1101,7 +1101,7 @@ i2c13: i2c-bus at 700 {\n"
+ "@@ -1101,7 +1101,7 @@ i2c13: i2c-bus@700 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c14: i2c-bus at 780 {\n"
- "+\ti2c14: i2c at 780 {\n"
+ "-\ti2c14: i2c-bus@780 {\n"
+ "+\ti2c14: i2c@780 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x780 0x80>;\n"
- "@@ -1115,7 +1115,7 @@ i2c14: i2c-bus at 780 {\n"
+ "@@ -1115,7 +1115,7 @@ i2c14: i2c-bus@780 {\n"
  " \t\tstatus = \"disabled\";\n"
  " \t};\n"
  " \n"
- "-\ti2c15: i2c-bus at 800 {\n"
- "+\ti2c15: i2c at 800 {\n"
+ "-\ti2c15: i2c-bus@800 {\n"
+ "+\ti2c15: i2c@800 {\n"
  " \t\t#address-cells = <1>;\n"
  " \t\t#size-cells = <0>;\n"
  " \t\treg = <0x800 0x80>;\n"
  "-- \n"
  2.43.0
 
-6ca7cacc799c3fa498e05b012ca0e58e0f02f4d93fdbb88a81de85254092bd62
+7c81323779bc4d62bcacff7f93f416029b292eb9702a2509f638908fd98b8611

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.