diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index 87610a48b9..f448c03723 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -302,6 +302,13 @@ family_tweaks() {
 
 	fi
 
+	if [[ -f $SDCARD/lib/systemd/system/orangepi5-usb2-init.service ]]; then
+
+		# enable usb2 init service
+		chroot $SDCARD /bin/bash -c "systemctl --no-reload enable orangepi5-usb2-init.service >/dev/null 2>&1"
+
+	fi
+
 	if [[ $BOARD == nanopim4* ]]; then
 
 		# enable fan support
diff --git a/config/sources/families/rockchip-rk3588.conf b/config/sources/families/rockchip-rk3588.conf
index 6c0e8ea8c4..6cadea7432 100644
--- a/config/sources/families/rockchip-rk3588.conf
+++ b/config/sources/families/rockchip-rk3588.conf
@@ -24,5 +24,10 @@ esac
 prepare_boot_configuration
 
 family_tweaks_bsp() {
-	:
+	if [[ $BOARD == orangepi5 ]]; then
+
+		# Add USB2 init service. Otherwise, USB2 won't work by default
+		cp $SRC/packages/bsp/orangepi5/orangepi5-usb2-init.service $destination/lib/systemd/system/
+		
+	fi
 }
diff --git a/packages/bsp/orangepi5/orangepi5-usb2-init.service b/packages/bsp/orangepi5/orangepi5-usb2-init.service
new file mode 100644
index 0000000000..ab7f2fe338
--- /dev/null
+++ b/packages/bsp/orangepi5/orangepi5-usb2-init.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Init USB2 for Orange Pi 5
+
+[Service]
+ExecStart=/usr/bin/sh -c "echo host > /sys/kernel/debug/usb/fc000000.usb/mode"
+Type=oneshot
+
+[Install]
+WantedBy=default.target
diff --git a/patch/kernel/rockchip-rk3588-legacy/2005-OrangePi5-dubious-tcpm-stuff-extracted-from-Xunlong-.patch.disabled b/patch/kernel/rockchip-rk3588-legacy/2005-OrangePi5-tcpm-stuff-extracted-from-Xunlong-.patch
similarity index 100%
rename from patch/kernel/rockchip-rk3588-legacy/2005-OrangePi5-dubious-tcpm-stuff-extracted-from-Xunlong-.patch.disabled
rename to patch/kernel/rockchip-rk3588-legacy/2005-OrangePi5-tcpm-stuff-extracted-from-Xunlong-.patch