diff --git a/arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-arthur.dts b/arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-arthur.dts
index 291e15fb78372b..24650399ba9f31 100644
--- a/arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-arthur.dts
+++ b/arch/arm64/boot/dts/aspeed/aspeed-bmc-amd-arthur.dts
@@ -50,22 +50,38 @@
 	};
 
 	aliases {
-		i2c100 = &arthur_local_fans_0;
-		i2c101 = &arthur_local_fans_1;
-		i2c102 = &arthur_fan_board_ch2;
-		i2c103 = &arthur_fan_board_ch3;
-		i2c104 = &arthur_fan_board_ch2;
-		i2c105 = &arthur_fan_board_ch3;
+		i2c100 = &P0_conn_012_cpu;
+		i2c101 = &P0_conn_345_cpu;
+		i2c102 = &P0_conn_012_mgmt;
+		i2c103 = &P0_conn_345_mgmt;
+		i2c104 = &fan_pdb;
+		i2c105 = &P0_pcp;
+		i2c106 = &NC_ch4;
+		i2c107 = &NC_6;
 		i2c200 = &arthur_local_fans_0;
 		i2c201 = &arthur_local_fans_1;
 		i2c202 = &arthur_fan_board_ch2;
-		i2c203 = &churro_fans_0_0;
-		i2c204 = &churro_fans_0_1;
-		i2c205 = &arthur_2u_mux;
 		i2c206 = &arthur_2u_ctrl0;
 		i2c207 = &arthur_2u_ctrl1;
-		i2c208 = &churro_fans_1_0;
-		i2c209 = &churro_fans_1_1;
+		i2c203 = &churro_fans_0_0;
+		i2c204 = &churro_fans_0_1;
+		i2c210 = &churro_id;
+		i2c215 = &arthur_2u_id;
+		i2c211 = &churro_mcu;
+		i2c216 = &arthur_2u_mcu;
+		i2c212 = &fan_board1_temp;
+		i2c213 = &fan_board1_ioexp;
+		i2c214 = &arthur_fan_board_ch3;
+		i2c116 = &P0_id;
+		i2c117 = &P0_clk;
+		i2c118 = &P0_vr;
+		i2c119 = &NC_1;
+		i2c120 = &brd_vr;
+		i2c121 = &temp;
+		i2c124 = &therm;
+		i2c125 = &adc_pdb;
+		i2c126 = &NC_2;
+		i2c127 = &adc_brd;
 	};
 };
 
@@ -242,6 +258,211 @@
 		compatible = "microchip,24lc256", "atmel,24c256";
 		reg = <0x50>;
 	};
+
+	i2cswitch@70 {
+		compatible = "nxp,pca9546";
+		reg = <0x70>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		i2c-mux-idle-disconnect;
+
+		P0_id: i2c@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			p0brdid@53 {
+				compatible = "microchip,24lc256", "atmel,24c256";
+				reg = <0x53>;
+			};
+		};
+
+		P0_clk: i2c@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			clkgen@09 {
+				compatible = "renesas,rc21008";
+				reg = <0x09>;
+			};
+			clkmux_p1p2@6c {
+				compatible = "renesas,rc19208";
+				reg = <0x6c>;
+			};
+			clkmux_p0p4@6d {
+				compatible = "renesas,rc19208";
+				reg = <0x6d>;
+			};
+			clkmux_g1g2p5@6f {
+				compatible = "renesas,rc19208";
+				reg = <0x6f>;
+			};
+		};
+
+		P0_vr: i2c@2 {
+			reg = <2>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			vddcore0@40 {
+				// MAX20916 P0_VDD_CORE_0_RUN / P0_VDD_MEM_RUN
+				compatible = "pmbus";
+				reg = <0x40>;
+			};
+			vddcore1@41 {
+				// MAX20916 P0_VDD_CORE_1_RUN / P0_VDD_SOC_RUN
+				compatible = "pmbus";
+				reg = <0x41>;
+			};
+			vddvddio@42 {
+				// MAX20908 P0_VDD_VDDIO_RUN
+				compatible = "pmbus";
+				reg = <0x42>;
+			};
+			vddio05mem0@43 {
+				// MPQ82D00 P0_VDD_VDDIO_05_MEM0_RUN
+				compatible = "pmbus";
+				reg = <0x43>;
+			};
+			vddio05mem1@44 {
+				// MPQ82D00 P0_VDD_VDDIO_05_MEM1_RUN
+				compatible = "pmbus";
+				reg = <0x44>;
+			};
+			vdd33s5@46 {
+				// MPQ82D00 P0_VDD_33_S5_RUN
+				compatible = "pmbus";
+				reg = <0x46>;
+			};
+			vdd18s5@47 {
+				// TDA38740 P0_VDD_18_S5_RUN
+				compatible = "pmbus";
+				reg = <0x47>;
+			};
+		};
+
+		NC_1: i2c@3 {
+			reg = <3>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+	};
+
+	i2cswitch@71 {
+		compatible = "nxp,pca9548";
+		reg = <0x71>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		i2c-mux-idle-disconnect;
+
+		brd_vr: i2c@0 {
+			reg = <0>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			vdd5dual@45 {
+				// MPQ82D00 VDD_5_DUAL
+				compatible = "pmbus";
+				reg = <0x45>;
+			};
+			socamm_n@48 {
+				compatible = "pmbus";
+				reg = <0x48>;
+			};
+			socamm_e@49 {
+				compatible = "pmbus";
+				reg = <0x49>;
+			};
+			socamm_w@4a {
+				compatible = "pmbus";
+				reg = <0x4a>;
+			};
+			socamm_s@4b {
+				compatible = "pmbus";
+				reg = <0x4b>;
+			};
+			vdd33dual@4c {
+				// TDA38740 VDD_33_DUAL
+				compatible = "pmbus";
+				reg = <0x4c>;
+			};
+		};
+
+		temp: i2c@1 {
+			reg = <1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			lm75@48 {
+				compatible = "national,lm75";
+				reg = <0x48>;
+			};
+			lm75@49 {
+				compatible = "national,lm75";
+				reg = <0x49>;
+			};
+			lm75@4a {
+				compatible = "national,lm75";
+				reg = <0x4a>;
+			};
+			lm75@4b {
+				compatible = "national,lm75";
+				reg = <0x4b>;
+			};
+			lm75@4c {
+				compatible = "national,lm75";
+				reg = <0x4c>;
+			};
+		};
+
+		therm: i2c@4 {
+			reg = <4>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			emc1438@4e {
+				compatible = "smsc,emc1403";
+				reg = <0x4e>;
+			};
+			emc1438@4f {
+				compatible = "smsc,emc1403";
+				reg = <0x4f>;
+			};
+		};
+
+		adc_pdb: i2c@5 {
+			reg = <5>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			pdb_vmon@54 {
+				compatible = "ti,adc121";
+				reg = <0x54>;
+			};
+			pdb_imon@55 {
+				compatible = "ti,adc121";
+				reg = <0x55>;
+			};
+		};
+
+		NC_2: i2c@6 {
+			reg = <6>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
+		adc_brd: i2c@7 {
+			reg = <7>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			brd_adc@48 {
+				compatible = "ti,tla2024";
+				reg = <0x48>;
+			};
+		};
+	};
 };
 
 &i2c9 {
@@ -352,191 +573,242 @@
 					};
 				};
 
-		/*
-		 * TacoBowl mux channel 2 -> Churro/2U fan-board superset path.
-		 * TODO: split DT variants once 0x76 mux type is finalized per board
-		 * (Churro uses TCA9546, 2U fan board uses TCA9548).
-		 */
-		arthur_fan_board_ch2: i2c@2 {
-			reg = <2>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			arthur_2u_mux: i2cswitch@76 {
-				compatible = "nxp,pca9546";
-				reg = <0x76>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				i2c-mux-idle-disconnect;
-
-				arthur_2u_ctrl0: churro_fans_0_0: i2c@0 {
-					reg = <0>;
+				/*
+				 * TacoBowl mux channel 2 -> Churro/2U fan-board superset path.
+				 * TODO: split DT variants once 0x76 mux type is finalized per board
+				 * (Churro uses TCA9546, 2U fan board uses TCA9548).
+				 */
+				arthur_fan_board_ch2: i2c@2 {
+					reg = <2>;
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					emc2305@4d {
-						compatible = "smsc,emc2305";
-						reg = <0x4d>;
-						#cooling-cells = <0x02>;
-
-						fan@0 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
-						};
-						fan@1 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+					arthur_2u_mux: i2cswitch@76 {
+						compatible = "nxp,pca9546";
+						reg = <0x76>;
+						#address-cells = <1>;
+						#size-cells = <0>;
+						i2c-mux-idle-disconnect;
+
+						arthur_2u_ctrl0: churro_fans_0_0: i2c@0 {
+							reg = <0>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+
+							emc2305@4d {
+								compatible = "smsc,emc2305";
+								reg = <0x4d>;
+								#cooling-cells = <0x02>;
+
+								fan@0 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@1 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@2 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@3 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@4 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+							};
+
+							nct7363@20 {
+								compatible = "nct,nct7363";
+								reg = <0x21>;
+								fan_sel_gpio = <3>;
+							};
 						};
-						fan@2 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+
+						arthur_2u_ctrl1: churro_fans_0_1: i2c@1 {
+							reg = <1>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+
+							emc2305@4d {
+								compatible = "smsc,emc2305";
+								reg = <0x4d>;
+								#cooling-cells = <0x02>;
+
+								fan@0 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@1 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@2 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+							};
+
+							nct7363@20 {
+								compatible = "nct,nct7363";
+								reg = <0x21>;
+								fan_sel_gpio = <3>;
+							};
 						};
-						fan@3 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+
+						churro_id: i2c@2 {
+							reg = <2>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+
+							eeprom@57 {
+								compatible = "microchip,24lc256", "atmel,24c256";
+								reg = <0x57>;
+							};
 						};
-					};
 
-					nct7363@20 {
-						compatible = "nct,nct7363";
-						reg = <0x20>;
-						fan_sel_gpio = <3>;
-					};
-				};
+						churro_mcu: i2c@3 {
+							reg = <3>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+						};
 
-				arthur_2u_ctrl1: churro_fans_0_1: i2c@1 {
-					reg = <1>;
-					#address-cells = <1>;
-					#size-cells = <0>;
+						fan_board1_temp: i2c@4 {
+							reg = <4>;
+							#address-cells = <1>;
+							#size-cells = <0>;
 
-					emc2305@4d {
-						compatible = "smsc,emc2305";
-						reg = <0x4d>;
-						#cooling-cells = <0x02>;
+							lm75@48 {
+								compatible = "national,lm75";
+								reg = <0x48>;
+							};
 
-						fan@0 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+							lm75@49 {
+								compatible = "national,lm75";
+								reg = <0x49>;
+							};
 						};
-						fan@1 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
-						};
-						fan@2 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+
+						fan_board1_ioexp: i2c@5 {
+							reg = <5>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+
+							pca9535@27 {
+								compatible = "nxp,pca9535";
+								reg = <0x27>;
+								gpio-controller;
+								#gpio-cells = <2>;
+							};
 						};
-						fan@3 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+
+						i2c@6 {
+							reg = <6>;
+							#address-cells = <1>;
+							#size-cells = <0>;
 						};
-					};
 
-					nct7363@20 {
-						compatible = "nct,nct7363";
-						reg = <0x20>;
-						fan_sel_gpio = <3>;
+						i2c@7 {
+							reg = <7>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+						};
 					};
 				};
 
-				churro_id: i2c@2 {
-					reg = <2>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-				};
-
-				churro_mcu: i2c@3 {
-					reg = <3>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-				};
-			};
-		};
-
 				/* TacoBowl ch3 -> second Churro/2U superset path */
 				arthur_fan_board_ch3: i2c@3 {
-			reg = <3>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			i2cswitch@76 {
-				compatible = "nxp,pca9546";
-				reg = <0x76>;
-				#address-cells = <1>;
-				#size-cells = <0>;
-				i2c-mux-idle-disconnect;
-
-				churro_fans_1_0: i2c@0 {
-					reg = <0>;
+					reg = <3>;
 					#address-cells = <1>;
 					#size-cells = <0>;
 
-					emc2305@4d {
-						compatible = "smsc,emc2305";
-						reg = <0x4d>;
-						#cooling-cells = <0x02>;
-
-						fan@0 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
-						};
-						fan@1 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
-						};
-						fan@2 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+					fan_board2_mux: i2cswitch@76 {
+						compatible = "nxp,pca9546";
+						reg = <0x76>;
+						#address-cells = <1>;
+						#size-cells = <0>;
+						i2c-mux-idle-disconnect;
+
+						churro_fans_1_0: i2c@0 {
+							reg = <0>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+
+							emc2305@4d {
+								compatible = "smsc,emc2305";
+								reg = <0x4d>;
+								#cooling-cells = <0x02>;
+
+								fan@0 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@1 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@2 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@3 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@4 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+							};
 						};
-						fan@3 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+
+						churro_fans_1_1: i2c@1 {
+							reg = <1>;
+							#address-cells = <1>;
+							#size-cells = <0>;
+
+							emc2305@4d {
+								compatible = "smsc,emc2305";
+								reg = <0x4d>;
+								#cooling-cells = <0x02>;
+
+								fan@0 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@1 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+								fan@2 {
+									min-rpm = /bits/ 16 <1000>;
+									max-rpm = /bits/ 16 <16000>;
+								};
+							};
 						};
-					};
-				};
 
-				churro_fans_1_1: i2c@1 {
-					reg = <1>;
-					#address-cells = <1>;
-					#size-cells = <0>;
+						churro1_id: i2c@2 {
+							reg = <2>;
+							#address-cells = <1>;
+							#size-cells = <0>;
 
-					emc2305@4d {
-						compatible = "smsc,emc2305";
-						reg = <0x4d>;
-						#cooling-cells = <0x02>;
-
-						fan@0 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+							eeprom@57 {
+								compatible = "microchip,24lc256", "atmel,24c256";
+								reg = <0x57>;
+							};
 						};
-						fan@1 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
-						};
-						fan@2 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
-						};
-						fan@3 {
-							min-rpm = /bits/ 16 <1000>;
-							max-rpm = /bits/ 16 <16000>;
+
+						churro1_mcu: i2c@3 {
+							reg = <3>;
+							#address-cells = <1>;
+							#size-cells = <0>;
 						};
 					};
 				};
-
-				churro1_id: i2c@2 {
-					reg = <2>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-				};
-
-				churro1_mcu: i2c@3 {
-					reg = <3>;
-					#address-cells = <1>;
-					#size-cells = <0>;
-				};
-			};
-				};
 			};
 		};
 	};