diff --git a/device/rockchip/common/rootdir/init.rk30board.usb.rc b/device/rockchip/common/rootdir/init.rk30board.usb.rc
index 988b2fe8045..f4f5c52b59a 100644
--- a/device/rockchip/common/rootdir/init.rk30board.usb.rc
+++ b/device/rockchip/common/rootdir/init.rk30board.usb.rc
@@ -197,6 +197,3 @@ on boot
     write sys/module/usbcore/parameters/initial_descriptor_timeout 500
     # Use USB Gadget HAL
     setprop sys.usb.configfs 2
-
-on property:init.svc.adbd=stopped
-    setprop sys.usb.ffs.ready 0
diff --git a/device/rockchip/rk3588/nanopi6/init.rk3588.rc b/device/rockchip/rk3588/nanopi6/init.rk3588.rc
index 9e30576aede..6ecc8a2ac16 100644
--- a/device/rockchip/rk3588/nanopi6/init.rk3588.rc
+++ b/device/rockchip/rk3588/nanopi6/init.rk3588.rc
@@ -22,9 +22,6 @@ on property:ro.cold_boot_done=true && property:persist.vendor.init_usb=1
     setprop sys.usb.config none
     setprop persist.vendor.init_usb 0
 
-on property:persist.vendor.init_usb=0 && property:persist.sys.usb.config=adb
-    write /d/usb/fc000000.usb/mode device
-
 on property:persist.vendor.radio.no_modem_board=1
     setprop ro.radio.noril yes
     stop vendor.ril-daemon
@@ -65,6 +62,9 @@ on boot
     chown system system /sys/devices/platform/fd5d0000.syscon/fd5d0000.syscon:usb2-phy@0/otg_mode
     chmod 0660 /sys/devices/platform/fd5d0000.syscon/fd5d0000.syscon:usb2-phy@0/otg_mode
 
+    chown system system /sys/class/usb_role/fc000000.usb-role-switch/role
+    chmod 0660 /sys/class/usb_role/fc000000.usb-role-switch/role
+
     chmod 0220 /sys/class/gpio/export
     chown root system /sys/class/gpio/export
     chmod 0220 /sys/class/gpio/unexport