From 71ac9beb28df7523d784b212b3956fdc2cbc0378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Efe=20=C3=87etin?= Date: Sun, 1 Jan 2023 00:37:31 +0300 Subject: [PATCH] Fix USB2 and Type C ports on Orange Pi 5 (#4634) --- config/sources/families/include/rockchip64_common.inc | 7 +++++++ config/sources/families/rockchip-rk3588.conf | 7 ++++++- packages/bsp/orangepi5/orangepi5-usb2-init.service | 9 +++++++++ ...5-OrangePi5-tcpm-stuff-extracted-from-Xunlong-.patch} | 0 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 packages/bsp/orangepi5/orangepi5-usb2-init.service rename patch/kernel/rockchip-rk3588-legacy/{2005-OrangePi5-dubious-tcpm-stuff-extracted-from-Xunlong-.patch.disabled => 2005-OrangePi5-tcpm-stuff-extracted-from-Xunlong-.patch} (100%) 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