diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-chalupa.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-chalupa.dts
index da4fb97d108261..b611f39050a273 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-chalupa.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-chalupa.dts
@@ -614,6 +614,10 @@
 				mi350p_slot0_rm_chnl: mi350p_rm@0 {
 					reg = <0>; #address-cells = <1>; #size-cells = <0>;
 					mctp-controller;
+					fru_eprom@56 {
+							compatible = "microchip,24lc512","atmel,24c512";
+							reg = <0x56>;
+					};
 				};
 			};
 		};
@@ -633,6 +637,10 @@
 				mi350p_slot1_rm_chnl: mi350p_rm@0 {
 					reg = <0>; #address-cells = <1>; #size-cells = <0>;
 					mctp-controller;
+					fru_eprom@56 {
+							compatible = "microchip,24lc512","atmel,24c512";
+							reg = <0x56>;
+					};
 				};
 			};
 		};
@@ -651,6 +659,10 @@
 				mi350p_slot2_rm_chnl: mi350p_rm@0 {
 					reg = <0>; #address-cells = <1>; #size-cells = <0>;
 					mctp-controller;
+					fru_eprom@56 {
+							compatible = "microchip,24lc512","atmel,24c512";
+							reg = <0x56>;
+					};
 				};
 			};
 		};
@@ -669,6 +681,10 @@
 				mi350p_slot3_rm_chnl: mi350p_rm@0 {
 					reg = <0>; #address-cells = <1>; #size-cells = <0>;
 					mctp-controller;
+					fru_eprom@56 {
+							compatible = "microchip,24lc512","atmel,24c512";
+							reg = <0x56>;
+					};
 				};
 			};
 		};
diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-galena.dts b/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-galena.dts
index 68558abe7007f0..b9a3938092b9a3 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-galena.dts
+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-amd-galena.dts
@@ -333,6 +333,10 @@
 						mi350p_slot0_rm_chnl: mi350p_rm@0 {
 							reg = <0>; #address-cells = <1>; #size-cells = <0>;
 							mctp-controller;
+							fru_eprom@56 {
+								compatible = "microchip,24lc512","atmel,24c512";
+								reg = <0x56>;
+							};
 						};
 					};
 				};
@@ -352,6 +356,10 @@
 						mi350p_slot1_rm_chnl: mi350p_rm@0 {
 							reg = <0>; #address-cells = <1>; #size-cells = <0>;
 							mctp-controller;
+                                                        fru_eprom@56 {
+                                                                compatible = "microchip,24lc512","atmel,24c512";
+                                                                reg = <0x56>;
+                                                        };							
 						};
 					};
 				};
@@ -370,6 +378,10 @@
 						mi350p_slot2_rm_chnl: mi350p_rm@0 {
 							reg = <0>; #address-cells = <1>; #size-cells = <0>;
 							mctp-controller;
+                                                        fru_eprom@56 {
+                                                                compatible = "microchip,24lc512","atmel,24c512";
+                                                                reg = <0x56>;
+                                                        };							
 						};
 					};
 				};
@@ -388,6 +400,10 @@
 						mi350p_slot3_rm_chnl: mi350p_rm@0 {
 							reg = <0>; #address-cells = <1>; #size-cells = <0>;
 							mctp-controller;
+                                                        fru_eprom@56 {
+                                                                compatible = "microchip,24lc512","atmel,24c512";
+                                                                reg = <0x56>;
+                                                        };							
 						};
 					};
 				};
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
index dffaa4c8a3919b..ed5fb4a70c3fcb 100644
--- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -529,6 +529,18 @@
 				#interrupt-cells = <2>;
 			};
 
+			jtag1: jtag@1e6e4100 {
+				compatible = "aspeed,ast2600-jtag";
+				reg= <0x1e6e4100 0x40>;
+				interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&syscon ASPEED_CLK_AHB>;
+				resets = <&syscon ASPEED_RESET_JTAG_MASTER2>;
+				reset-names = "jtag";
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_jtagm_default>;
+				status = "disabled";
+			};
+
 			rtc: rtc@1e781000 {
 				compatible = "aspeed,ast2600-rtc";
 				reg = <0x1e781000 0x18>;
diff --git a/arch/arm/boot/dts/aspeed/ast2600-amd-bmc-common.dtsi b/arch/arm/boot/dts/aspeed/ast2600-amd-bmc-common.dtsi
index 0d688760928d97..de3a2d19d6b9a3 100644
--- a/arch/arm/boot/dts/aspeed/ast2600-amd-bmc-common.dtsi
+++ b/arch/arm/boot/dts/aspeed/ast2600-amd-bmc-common.dtsi
@@ -533,6 +533,10 @@
 	/*Z0-Z7*/	"","","","","","","","";
 };
 
+&jtag1 {
+	status = "okay";
+};
+
 &video {
 	status = "okay";
 	memory-region = <&video_engine_memory>;
@@ -560,7 +564,9 @@
 
 &kcs3 {
 	status = "okay";
-	aspeed,lpc-io-reg = <0xCA2>;
+	compatible = "aspeed,ast2600-kcs-bmc";
+	kcs-io-addr = <0xca2>;
+	kcs-channel = <3>;
 };
 
 &uart_routing {