diff --git a/devicetree/mainline/upstream b/devicetree/mainline/upstream
index 0449e8973..5b650c7a3 160000
--- a/devicetree/mainline/upstream
+++ b/devicetree/mainline/upstream
@@ -1 +1 @@
-Subproject commit 0449e8973a84b92f615badc9ebcce97ca0a6bd30
+Subproject commit 5b650c7a338755d8e2ba6b56e8d895bf85f8c300
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/DeviceTree/Mainline.inf b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/DeviceTree/Mainline.inf
new file mode 100644
index 000000000..971125e9d
--- /dev/null
+++ b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/DeviceTree/Mainline.inf
@@ -0,0 +1,21 @@
+#/** @file
+#
+#  Copyright (c) 2024, Mario Bălănică <mariobalanica02@gmail.com>
+#
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
+#
+#**/
+
+[Defines]
+  INF_VERSION                    = 0x0001001A
+  BASE_NAME                      = DeviceTree-Mainline
+  FILE_GUID                      = 84492e97-a10f-49a7-85e9-025d1966b343
+  MODULE_TYPE                    = USER_DEFINED
+  VERSION_STRING                 = 1.0
+
+[Sources]
+  devicetree/mainline/upstream/src/arm64/rockchip/rk3588-rock-5b-plus.dts
+
+[Packages]
+  MdePkg/MdePkg.dec
+  Silicon/Rockchip/RockchipPkg.dec
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/Library/RockchipPlatformLib/RockchipPlatformLib.c b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/Library/RockchipPlatformLib/RockchipPlatformLib.c
index a42c5231d..e0c7e88af 100644
--- a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/Library/RockchipPlatformLib/RockchipPlatformLib.c
+++ b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/Library/RockchipPlatformLib/RockchipPlatformLib.c
@@ -426,14 +426,21 @@ PlatformGetDtbFileGuid (
   IN UINT32  CompatMode
   )
 {
-  STATIC CONST EFI_GUID  VendorDtbFileGuid = {
-    // DeviceTree/Vendor.inf
-    0xd58b4028, 0x43d8, 0x4e97, { 0x87, 0xd4, 0x4e, 0x37, 0x16, 0x13, 0x65, 0x80 }
-  };
-
-  switch (CompatMode) {
-    case FDT_COMPAT_MODE_VENDOR:
-      return &VendorDtbFileGuid;
+  STATIC CONST EFI_GUID  VendorDtbFileGuid = {

+    // DeviceTree/Vendor.inf

+    0xd58b4028, 0x43d8, 0x4e97, { 0x87, 0xd4, 0x4e, 0x37, 0x16, 0x13, 0x65, 0x80 }

+  };

+

+  STATIC CONST EFI_GUID  MainlineDtbFileGuid = {

+    // DeviceTree/Mainline.inf

+    0x84492e97, 0xa10f, 0x49a7, { 0x85, 0xe9, 0x02, 0x5d, 0x19, 0x66, 0xb3, 0x43 }

+  };

+ 
+  switch (CompatMode) {

+    case FDT_COMPAT_MODE_VENDOR:

+      return &VendorDtbFileGuid;

+    case FDT_COMPAT_MODE_MAINLINE:

+      return &MainlineDtbFileGuid;

   }
 
   return NULL;
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.Modules.fdf.inc b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.Modules.fdf.inc
index 93c57c91e..0750a85e2 100644
--- a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.Modules.fdf.inc
+++ b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.Modules.fdf.inc
@@ -11,6 +11,7 @@
 
   # Device Tree Support
   INF RuleOverride = DTB $(PLATFORM_DIRECTORY)/DeviceTree/Vendor.inf
+  INF RuleOverride = DTB $(PLATFORM_DIRECTORY)/DeviceTree/Mainline.inf 
 
   # Splash screen logo
   INF $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf
diff --git a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.dsc b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.dsc
index 5fed005b3..fe952a261 100644
--- a/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.dsc
+++ b/edk2-rockchip/Platform/Radxa/ROCK5BPlus/ROCK5BPlus.dsc
@@ -64,7 +64,7 @@
   gRockchipTokenSpaceGuid.PcdPlatformVendorName|"Radxa"
   gRockchipTokenSpaceGuid.PcdFamilyName|"ROCK 5"
   gRockchipTokenSpaceGuid.PcdProductUrl|"https://docs.radxa.com/en/rock5/rock5b"
-  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-rock-5bp"
+  gRockchipTokenSpaceGuid.PcdDeviceTreeName|"rk3588-rock-5b-plus"
 
   # I2C
   gRockchipTokenSpaceGuid.PcdI2cSlaveAddresses|{ 0x42, 0x43, 0x51, 0x11 }
@@ -127,6 +127,7 @@
 
   # Device Tree Support
   $(PLATFORM_DIRECTORY)/DeviceTree/Vendor.inf
-
+  $(PLATFORM_DIRECTORY)/DeviceTree/Mainline.inf
+  
   # Splash screen logo
   $(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf