Skip to contentSkip to conversation

rockchip: rock-3a: rock5a: rock5b: add USB GADGET related configs

PATCH In review FUKAUMI Naoki 2 participants 6 messages Jun 15, 2024 – Jun 16, 2024 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 rockchip: rock-3a: rock5a: rock5b: add USB GADGET related configs

add USB GADGET related configs for USB OTG port on ROCK 3A/5A/5B.

---
 configs/rock-3a-rk3568_defconfig | 6 ++++++
 configs/rock5a-rk3588s_defconfig | 6 ++++++
 configs/rock5b-rk3588_defconfig  | 1 +
 3 files changed, 13 insertions(+)
configs/rock-3a-rk3568_defconfig +6 -0
index 66ac2f6d7a..0568a73038 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_POWEROFF=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
@@ -50,6 +52,7 @@ CONFIG_SPL_SYSCON=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_SPL_CLK=y
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
@@ -90,4 +93,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
 CONFIG_ERRNO_STR=y
configs/rock5a-rk3588s_defconfig +6 -0
index c09e6655f0..e06052cd80 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_REGULATOR=y
 # CONFIG_SPL_DOS_PARTITION is not set
@@ -37,6 +39,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
 CONFIG_SPL_CLK=y
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
@@ -67,4 +70,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
 CONFIG_ERRNO_STR=y
configs/rock5b-rk3588_defconfig +1 -0
index fc118cea7b..80a2f2fed5 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_REGULATOR=y
 # CONFIG_SPL_DOS_PARTITION is not set
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/3 arm: dts: rockchip: rock-5a: enable USB3 OTG port

enable USB3 OTG (upper) port for ums and rockusb commands on ROCK 5A.

---
 arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi +16 -0
index efba0c359b..5ae1a3cdd9 100644
@@ -9,3 +9,19 @@
 	cap-mmc-highspeed;
 	mmc-hs200-1_8v;
 };
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	status = "okay";
+};
+
+&usb_host0_xhci {
+	status = "okay";
+};
Signature · 1 line
2.43.0
#2 lore raw

Re: [PATCH 2/3] arm: dts: rockchip: rock-5a: enable USB3 OTG port

Quoted 21 lines · FUKAUMI Naoki

enable USB3 OTG (upper) port for ums and rockusb commands on ROCK 5A.

---
 arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi +6 -0
index efba0c359b..5ae1a3cdd9 100644
@@ -9,3 +9,19 @@
 	cap-mmc-highspeed;
 	mmc-hs200-1_8v;
 };
+
+&u2phy0 {
+	status = "okay";
+};
+
+&u2phy0_otg {

arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi line 27

Quoted 10 lines
arch/arm/dts/rk3588s-rock-5a-u-boot.dtsi +10 -0
+	status = "okay";
+};
+
+&usbdp_phy0 {
+	status = "okay";
+};
+
+&usb_host0_xhci {
+	status = "okay";
+};

Instead of adding new nodes to the u-boot.dtsi-file, please pick related commits for dts/upstream tree when possible and remove any merged nodes.

E.g do something like following:
- base on u-boot-rockchip-next-20240615
- run: dts/update-dts-subtree.sh pick c233f1327b04279454217b826ebf648bd4bc6b8f
- run: dts/update-dts-subtree.sh pick 402af187821d4e38a6c687e868b26ba22cb82886
- remove u2phy1/usbdp_phy1/usb_host1_xhci from rock-5b u-boot.dtsi and instead include those commits in a v2 :-)

Related devicetree-rebasing commits:

arm64: dts: rockchip: add upper USB3 port to rock-5a:
https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/commit/?id=c233f1327b04279454217b826ebf648bd4bc6b8f

arm64: dts: rockchip: add lower USB3 port to rock-5b
https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git/commit/?id=402af187821d4e38a6c687e868b26ba22cb82886

Regards,
Jonas

#3 lore raw

PATCH 3/3 arm: dts: rockchip: rock-5b: sort usbdp_phy nodes

In reply to FUKAUMI Naoki

sort alphanumerically.

---
 arch/arm/dts/rk3588-rock-5b-u-boot.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/dts/rk3588-rock-5b-u-boot.dtsi +2 -2
index 8e318e624a..fabbd717b6 100644
@@ -47,11 +47,11 @@
 	status = "okay";
 };
 
-&usbdp_phy1 {
+&usbdp_phy0 {
 	status = "okay";
 };
 
-&usbdp_phy0 {
+&usbdp_phy1 {
 	status = "okay";
 };
 
Signature · 1 line
2.43.0
#4 lore raw
In reply to FUKAUMI Naoki
Quoted 60 lines · FUKAUMI Naoki

add USB GADGET related configs for USB OTG port on ROCK 3A/5A/5B.

---
 configs/rock-3a-rk3568_defconfig | 6 ++++++
 configs/rock5a-rk3588s_defconfig | 6 ++++++
 configs/rock5b-rk3588_defconfig  | 1 +
 3 files changed, 13 insertions(+)
configs/rock-3a-rk3568_defconfig +6 -0
index 66ac2f6d7a..0568a73038 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_POWEROFF=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_PMIC=y
 CONFIG_CMD_REGULATOR=y
@@ -50,6 +52,7 @@ CONFIG_SPL_SYSCON=y
 CONFIG_SCSI_AHCI=y
 CONFIG_AHCI_PCI=y
 CONFIG_SPL_CLK=y
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y
@@ -90,4 +93,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
 CONFIG_ERRNO_STR=y
configs/rock5a-rk3588s_defconfig +3 -0
index c09e6655f0..e06052cd80 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_GPT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_REGULATOR=y
 # CONFIG_SPL_DOS_PARTITION is not set
@@ -37,6 +39,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
 CONFIG_SPL_REGMAP=y
 CONFIG_SPL_SYSCON=y
 CONFIG_SPL_CLK=y
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
 CONFIG_MISC=y

configs/rock5a-rk3588s_defconfig CONFIG_USB_OHCI_HCD=y · line 75

Quoted 6 lines
configs/rock5a-rk3588s_defconfig +3 -0
@@ -67,4 +70,7 @@ CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_OHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_ROCKUSB=y

I do not think there is any usb port that use dr_mode otg/peripheral, so enabling gadget support probably have no impact on ROCK 5A.

Regards,
Jonas

Quoted 13 lines
configs/rock5a-rk3588s_defconfig +0 -0
 CONFIG_ERRNO_STR=y
configs/rock5b-rk3588_defconfig +1 -0
index fc118cea7b..80a2f2fed5 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_MMC=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_REGULATOR=y
 # CONFIG_SPL_DOS_PARTITION is not set
#5 lore raw

Hi,

Quoted 71 lines · Jonas Karlman
Quoted 60 lines · FUKAUMI Naoki

add USB GADGET related configs for USB OTG port on ROCK 3A/5A/5B.

---
  configs/rock-3a-rk3568_defconfig | 6 ++++++
  configs/rock5a-rk3588s_defconfig | 6 ++++++
  configs/rock5b-rk3588_defconfig  | 1 +
  3 files changed, 13 insertions(+)
configs/rock-3a-rk3568_defconfig +6 -0
index 66ac2f6d7a..0568a73038 100644
@@ -37,6 +37,8 @@ CONFIG_CMD_MMC=y
  CONFIG_CMD_PCI=y
  CONFIG_CMD_POWEROFF=y
  CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_PMIC=y
  CONFIG_CMD_REGULATOR=y
@@ -50,6 +52,7 @@ CONFIG_SPL_SYSCON=y
  CONFIG_SCSI_AHCI=y
  CONFIG_AHCI_PCI=y
  CONFIG_SPL_CLK=y
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MISC=y
@@ -90,4 +93,7 @@ CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_GENERIC=y
  CONFIG_USB_DWC3=y
  CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_ROCKUSB=y
  CONFIG_ERRNO_STR=y
configs/rock5a-rk3588s_defconfig +3 -0
index c09e6655f0..e06052cd80 100644
@@ -27,6 +27,8 @@ CONFIG_CMD_GPT=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_USB=y
+CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_REGULATOR=y
  # CONFIG_SPL_DOS_PARTITION is not set
@@ -37,6 +39,7 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
  CONFIG_SPL_REGMAP=y
  CONFIG_SPL_SYSCON=y
  CONFIG_SPL_CLK=y
+# CONFIG_USB_FUNCTION_FASTBOOT is not set
  CONFIG_ROCKCHIP_GPIO=y
  CONFIG_SYS_I2C_ROCKCHIP=y
  CONFIG_MISC=y

configs/rock5a-rk3588s_defconfig CONFIG_USB_OHCI_HCD=y · line 75

Quoted 6 lines
configs/rock5a-rk3588s_defconfig +3 -0
@@ -67,4 +70,7 @@ CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_GENERIC=y
  CONFIG_USB_DWC3=y
  CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_ROCKUSB=y

I do not think there is any usb port that use dr_mode otg/peripheral, so enabling gadget support probably have no impact on ROCK 5A.

Quoted 2 lines

Regards,
Jonas

my patch 2/3 doesn't add "dr_mode = "host";", so it will be "otg". I may need to fix upstream dts first...

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

Quoted 16 lines
Quoted 14 lines
configs/rock5a-rk3588s_defconfig +0 -0
  CONFIG_ERRNO_STR=y
configs/rock5b-rk3588_defconfig +1 -0
index fc118cea7b..80a2f2fed5 100644
@@ -39,6 +39,7 @@ CONFIG_CMD_MMC=y
  CONFIG_CMD_PCI=y
  CONFIG_CMD_USB=y
  CONFIG_CMD_ROCKUSB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
  # CONFIG_CMD_SETEXPR is not set
  CONFIG_CMD_REGULATOR=y
  # CONFIG_SPL_DOS_PARTITION is not set