| Message ID | 20240226230822.2430391-5-jonas@kwiboo.se |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: Migrate to use DM_USB_GADGET on RK3328 | expand |
On 2024/2/27 07:08, Jonas Karlman wrote: > USB gadget is not working fully as expected on RK3328, it uses a > board_usb_init() function to initialize the DWC2 OTG port. > > The board_usb_init() function does not intgrate with the generic phy > framework and as a result the USB phy is not properly configured before > or after USB gadget use. > > Having both USB_DWC2 and DWC2_OTG enabled for the same board is also > causing some issues. > > Trying to use rockusb or ums command after usb stop result in a freeze > due to usb stop is putting the phy in a suspended state. > > => usb start > => usb stop > => ums 0 mmc 0 > --> freeze due to usb phy is suspended <-- > > Fix this by only using one of USB_DWC2 (host) or DWC2_OTG (peripheral) > depending on the most likely usage of the otg port. > > The nanopi-r2 and orangepi-r1-plus variants share OTG and power using a > Type-C connector, mark these boards dr_mode as peripheral, the most > likely usage is for recovery and image download. > > The rock64 and roc-cc currently use dr_mode as host, remove the DWC2_OTG > driver from these boards to ensure that the USB_DWC2 driver is used. > > The rock-pi-e board does not enable the usb20_otg node so both USB_DWC2 > and DWC2_OTG is removed from this board. > > Enable RockUSB and UMS on all boards with a otg port in peripheral mode. > > Also with the migration to DM_USB_GADGET completed the U-Boot specific > change to reorder usb nodes in the device tree can be reverted. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 4 ++ > .../rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 4 ++ > .../dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 4 ++ > arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 4 ++ > arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 9 ++++ > arch/arm/dts/rk3328-rock64-u-boot.dtsi | 4 ++ > arch/arm/dts/rk3328-u-boot.dtsi | 4 -- > arch/arm/dts/rk3328.dtsi | 41 ++++++++----------- > configs/evb-rk3328_defconfig | 5 ++- > configs/nanopi-r2c-plus-rk3328_defconfig | 5 ++- > configs/nanopi-r2c-rk3328_defconfig | 5 ++- > configs/nanopi-r2s-rk3328_defconfig | 5 ++- > configs/orangepi-r1-plus-lts-rk3328_defconfig | 5 ++- > configs/orangepi-r1-plus-rk3328_defconfig | 5 ++- > configs/roc-cc-rk3328_defconfig | 7 ---- > configs/rock-pi-e-rk3328_defconfig | 7 ---- > configs/rock64-rk3328_defconfig | 6 --- > 17 files changed, 69 insertions(+), 55 deletions(-) > > diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi > index cca4f06145cf..4fa170eeaf8d 100644 > --- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi > @@ -15,6 +15,10 @@ > bootph-all; > }; > > +&usb20_otg { > + dr_mode = "peripheral"; > +}; > + > &vcc_io_sdio { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi > index 0dbe5a01f986..0a9423cd9c7e 100644 > --- a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi > @@ -33,6 +33,10 @@ > bootph-pre-ram; > }; > > +&usb20_otg { > + dr_mode = "peripheral"; > +}; > + > &vcc_sd { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi > index 1af75ada1a62..1096821fc5d3 100644 > --- a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi > @@ -33,6 +33,10 @@ > bootph-pre-ram; > }; > > +&usb20_otg { > + dr_mode = "peripheral"; > +}; > + > &vcc_sd { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > index 47d74964fd0c..582d6ba49b4e 100644 > --- a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi > @@ -29,6 +29,10 @@ > }; > }; > > +&usb20_otg { > + hnp-srp-disable; > +}; > + > &vcc_sd { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi > index 9ed0aef1ecc9..d314bfad6fc0 100644 > --- a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi > @@ -29,6 +29,15 @@ > }; > }; > > +&u2phy_host { > + phy-supply = <&vcc_host_5v>; > +}; > + > +&vcc_host_5v { > + /delete-property/ regulator-always-on; > + /delete-property/ regulator-boot-on; > +}; > + > &vcc_sd { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > index 85426495c3d8..551cff6f24f6 100644 > --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi > @@ -55,6 +55,10 @@ > bootph-pre-ram; > }; > > +&usb20_otg { > + hnp-srp-disable; > +}; > + > &vcc_sd { > bootph-pre-ram; > }; > diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi > index 4d43fe2fb51a..e0c6aee58aba 100644 > --- a/arch/arm/dts/rk3328-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-u-boot.dtsi > @@ -130,10 +130,6 @@ > bootph-all; > }; > > -&usb20_otg { > - hnp-srp-disable; > -}; > - > #ifdef CONFIG_ROCKCHIP_SPI_IMAGE > &binman { > simple-bin-spi { > diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi > index fe81b97bbe78..fb5dcf6e9327 100644 > --- a/arch/arm/dts/rk3328.dtsi > +++ b/arch/arm/dts/rk3328.dtsi > @@ -965,6 +965,22 @@ > }; > }; > > + usb20_otg: usb@ff580000 { > + compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb", > + "snps,dwc2"; > + reg = <0x0 0xff580000 0x0 0x40000>; > + interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&cru HCLK_OTG>; > + clock-names = "otg"; > + dr_mode = "otg"; > + g-np-tx-fifo-size = <16>; > + g-rx-fifo-size = <280>; > + g-tx-fifo-size = <256 128 128 64 32 16>; > + phys = <&u2phy_otg>; > + phy-names = "usb2-phy"; > + status = "disabled"; > + }; > + > usb_host0_ehci: usb@ff5c0000 { > compatible = "generic-ehci"; > reg = <0x0 0xff5c0000 0x0 0x10000>; > @@ -1004,31 +1020,6 @@ > status = "disabled"; > }; > > - /* > - * U-Boot Specific Change > - * > - * The OTG controller must come after the USB host pair for it > - * to work. This is likely due to lack of support for the USB > - * PHYs. This must be manually changed after each device tree > - * sync. There is no clean way to handle this in -u-boot.dtsi > - * files. > - */ > - usb20_otg: usb@ff580000 { > - compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb", > - "snps,dwc2"; > - reg = <0x0 0xff580000 0x0 0x40000>; > - interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; > - clocks = <&cru HCLK_OTG>; > - clock-names = "otg"; > - dr_mode = "otg"; > - g-np-tx-fifo-size = <16>; > - g-rx-fifo-size = <280>; > - g-tx-fifo-size = <256 128 128 64 32 16>; > - phys = <&u2phy_otg>; > - phy-names = "usb2-phy"; > - status = "disabled"; > - }; > - > gic: interrupt-controller@ff811000 { > compatible = "arm,gic-400"; > #interrupt-cells = <3>; > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index 4fa8a7d365a4..c9683711dec2 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -31,6 +31,8 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=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_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -83,17 +85,18 @@ CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > # CONFIG_TPL_SYSRESET is not set > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > # CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig b/configs/nanopi-r2c-plus-rk3328_defconfig > index 5302fd91a0f5..ffcead53f398 100644 > --- a/configs/nanopi-r2c-plus-rk3328_defconfig > +++ b/configs/nanopi-r2c-plus-rk3328_defconfig > @@ -33,6 +33,8 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=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_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -90,17 +92,18 @@ CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > # CONFIG_TPL_SYSRESET is not set > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > # CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/nanopi-r2c-rk3328_defconfig b/configs/nanopi-r2c-rk3328_defconfig > index 5a722c182631..966627033212 100644 > --- a/configs/nanopi-r2c-rk3328_defconfig > +++ b/configs/nanopi-r2c-rk3328_defconfig > @@ -33,6 +33,8 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=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_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -90,17 +92,18 @@ CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > # CONFIG_TPL_SYSRESET is not set > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > # CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig > index 985d02475ece..5dff7d9a14a7 100644 > --- a/configs/nanopi-r2s-rk3328_defconfig > +++ b/configs/nanopi-r2s-rk3328_defconfig > @@ -33,6 +33,8 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=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_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -90,17 +92,18 @@ CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > # CONFIG_TPL_SYSRESET is not set > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > # CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig b/configs/orangepi-r1-plus-lts-rk3328_defconfig > index e9f7a1306923..b7a4ff7efefe 100644 > --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig > @@ -38,6 +38,8 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=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_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -100,17 +102,18 @@ CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > # CONFIG_TPL_SYSRESET is not set > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > # CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/orangepi-r1-plus-rk3328_defconfig b/configs/orangepi-r1-plus-rk3328_defconfig > index 6019f33ae3f5..4b0dc1441a6f 100644 > --- a/configs/orangepi-r1-plus-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-rk3328_defconfig > @@ -38,6 +38,8 @@ CONFIG_CMD_GPIO=y > CONFIG_CMD_GPT=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_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -100,17 +102,18 @@ CONFIG_SYSINFO=y > CONFIG_SYSRESET=y > # CONFIG_TPL_SYSRESET is not set > CONFIG_USB=y > +CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > # CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_DWC2_OTG=y > +CONFIG_USB_FUNCTION_ROCKUSB=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig > index 191dbff928bb..6526d2606e72 100644 > --- a/configs/roc-cc-rk3328_defconfig > +++ b/configs/roc-cc-rk3328_defconfig > @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART_BASE=0xFF130000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_DEBUG_UART=y > -# CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_FIT_SIGNATURE=y > @@ -34,7 +33,6 @@ CONFIG_CMD_GPT=y > CONFIG_CMD_MMC=y > CONFIG_CMD_POWEROFF=y > CONFIG_CMD_USB=y > -CONFIG_CMD_USB_MASS_STORAGE=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_CMD_TIME=y > CONFIG_CMD_REGULATOR=y > @@ -55,8 +53,6 @@ CONFIG_SPL_SYSCON=y > CONFIG_TPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_BUF_ADDR=0x800800 > -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -97,10 +93,7 @@ CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > -# CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > -CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig > index e4f2123e0b17..23029255bca2 100644 > --- a/configs/rock-pi-e-rk3328_defconfig > +++ b/configs/rock-pi-e-rk3328_defconfig > @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART_BASE=0xFF130000 > CONFIG_DEBUG_UART_CLOCK=24000000 > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_DEBUG_UART=y > -# CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_FIT_SIGNATURE=y > @@ -52,8 +51,6 @@ CONFIG_SPL_SYSCON=y > CONFIG_TPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_BUF_ADDR=0x800800 > -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -92,12 +89,8 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > -CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > -# CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > -CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y > diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig > index f38431891bf8..b0be1d1d7633 100644 > --- a/configs/rock64-rk3328_defconfig > +++ b/configs/rock64-rk3328_defconfig > @@ -16,7 +16,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y > CONFIG_SPL_SPI=y > CONFIG_SYS_LOAD_ADDR=0x800800 > CONFIG_DEBUG_UART=y > -# CONFIG_ANDROID_BOOT_IMAGE is not set > CONFIG_FIT=y > CONFIG_FIT_VERBOSE=y > CONFIG_SPL_FIT_SIGNATURE=y > @@ -59,8 +58,6 @@ CONFIG_SPL_SYSCON=y > CONFIG_TPL_SYSCON=y > CONFIG_CLK=y > CONFIG_SPL_CLK=y > -CONFIG_FASTBOOT_BUF_ADDR=0x800800 > -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y > CONFIG_ROCKCHIP_GPIO=y > CONFIG_SYS_I2C_ROCKCHIP=y > CONFIG_MMC_DW=y > @@ -106,10 +103,7 @@ CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=y > CONFIG_USB_DWC2=y > CONFIG_USB_DWC3=y > -# CONFIG_USB_DWC3_GADGET is not set > CONFIG_USB_DWC3_GENERIC=y > -CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_SPL_TINY_MEMSET=y > CONFIG_TPL_TINY_MEMSET=y > CONFIG_ERRNO_STR=y
Hi Kever, On 2024-03-08 10:29, Kever Yang wrote: > > On 2024/2/27 07:08, Jonas Karlman wrote: >> USB gadget is not working fully as expected on RK3328, it uses a >> board_usb_init() function to initialize the DWC2 OTG port. >> >> The board_usb_init() function does not intgrate with the generic phy >> framework and as a result the USB phy is not properly configured before >> or after USB gadget use. >> >> Having both USB_DWC2 and DWC2_OTG enabled for the same board is also >> causing some issues. >> >> Trying to use rockusb or ums command after usb stop result in a freeze >> due to usb stop is putting the phy in a suspended state. >> >> => usb start >> => usb stop >> => ums 0 mmc 0 >> --> freeze due to usb phy is suspended <-- >> >> Fix this by only using one of USB_DWC2 (host) or DWC2_OTG (peripheral) >> depending on the most likely usage of the otg port. >> >> The nanopi-r2 and orangepi-r1-plus variants share OTG and power using a >> Type-C connector, mark these boards dr_mode as peripheral, the most >> likely usage is for recovery and image download. >> >> The rock64 and roc-cc currently use dr_mode as host, remove the DWC2_OTG >> driver from these boards to ensure that the USB_DWC2 driver is used. >> >> The rock-pi-e board does not enable the usb20_otg node so both USB_DWC2 >> and DWC2_OTG is removed from this board. >> >> Enable RockUSB and UMS on all boards with a otg port in peripheral mode. >> >> Also with the migration to DM_USB_GADGET completed the U-Boot specific >> change to reorder usb nodes in the device tree can be reverted. >> >> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, I will send a v2 of this patch, that will change to use XHCI_DWC3 for USB 3.0 host mode instead of DWC3_GENERIC to avoid generating a build error with dependent patch [1] being rejected. [1] https://patchwork.ozlabs.org/patch/1903946/ Regards, Jonas > > Thanks, > - Kever [snip]
diff --git a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi index cca4f06145cf..4fa170eeaf8d 100644 --- a/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi +++ b/arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi @@ -15,6 +15,10 @@ bootph-all; }; +&usb20_otg { + dr_mode = "peripheral"; +}; + &vcc_io_sdio { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi index 0dbe5a01f986..0a9423cd9c7e 100644 --- a/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi +++ b/arch/arm/dts/rk3328-orangepi-r1-plus-lts-u-boot.dtsi @@ -33,6 +33,10 @@ bootph-pre-ram; }; +&usb20_otg { + dr_mode = "peripheral"; +}; + &vcc_sd { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi index 1af75ada1a62..1096821fc5d3 100644 --- a/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi +++ b/arch/arm/dts/rk3328-orangepi-r1-plus-u-boot.dtsi @@ -33,6 +33,10 @@ bootph-pre-ram; }; +&usb20_otg { + dr_mode = "peripheral"; +}; + &vcc_sd { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi index 47d74964fd0c..582d6ba49b4e 100644 --- a/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi +++ b/arch/arm/dts/rk3328-roc-cc-u-boot.dtsi @@ -29,6 +29,10 @@ }; }; +&usb20_otg { + hnp-srp-disable; +}; + &vcc_sd { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi index 9ed0aef1ecc9..d314bfad6fc0 100644 --- a/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi @@ -29,6 +29,15 @@ }; }; +&u2phy_host { + phy-supply = <&vcc_host_5v>; +}; + +&vcc_host_5v { + /delete-property/ regulator-always-on; + /delete-property/ regulator-boot-on; +}; + &vcc_sd { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3328-rock64-u-boot.dtsi b/arch/arm/dts/rk3328-rock64-u-boot.dtsi index 85426495c3d8..551cff6f24f6 100644 --- a/arch/arm/dts/rk3328-rock64-u-boot.dtsi +++ b/arch/arm/dts/rk3328-rock64-u-boot.dtsi @@ -55,6 +55,10 @@ bootph-pre-ram; }; +&usb20_otg { + hnp-srp-disable; +}; + &vcc_sd { bootph-pre-ram; }; diff --git a/arch/arm/dts/rk3328-u-boot.dtsi b/arch/arm/dts/rk3328-u-boot.dtsi index 4d43fe2fb51a..e0c6aee58aba 100644 --- a/arch/arm/dts/rk3328-u-boot.dtsi +++ b/arch/arm/dts/rk3328-u-boot.dtsi @@ -130,10 +130,6 @@ bootph-all; }; -&usb20_otg { - hnp-srp-disable; -}; - #ifdef CONFIG_ROCKCHIP_SPI_IMAGE &binman { simple-bin-spi { diff --git a/arch/arm/dts/rk3328.dtsi b/arch/arm/dts/rk3328.dtsi index fe81b97bbe78..fb5dcf6e9327 100644 --- a/arch/arm/dts/rk3328.dtsi +++ b/arch/arm/dts/rk3328.dtsi @@ -965,6 +965,22 @@ }; }; + usb20_otg: usb@ff580000 { + compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb", + "snps,dwc2"; + reg = <0x0 0xff580000 0x0 0x40000>; + interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cru HCLK_OTG>; + clock-names = "otg"; + dr_mode = "otg"; + g-np-tx-fifo-size = <16>; + g-rx-fifo-size = <280>; + g-tx-fifo-size = <256 128 128 64 32 16>; + phys = <&u2phy_otg>; + phy-names = "usb2-phy"; + status = "disabled"; + }; + usb_host0_ehci: usb@ff5c0000 { compatible = "generic-ehci"; reg = <0x0 0xff5c0000 0x0 0x10000>; @@ -1004,31 +1020,6 @@ status = "disabled"; }; - /* - * U-Boot Specific Change - * - * The OTG controller must come after the USB host pair for it - * to work. This is likely due to lack of support for the USB - * PHYs. This must be manually changed after each device tree - * sync. There is no clean way to handle this in -u-boot.dtsi - * files. - */ - usb20_otg: usb@ff580000 { - compatible = "rockchip,rk3328-usb", "rockchip,rk3066-usb", - "snps,dwc2"; - reg = <0x0 0xff580000 0x0 0x40000>; - interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&cru HCLK_OTG>; - clock-names = "otg"; - dr_mode = "otg"; - g-np-tx-fifo-size = <16>; - g-rx-fifo-size = <280>; - g-tx-fifo-size = <256 128 128 64 32 16>; - phys = <&u2phy_otg>; - phy-names = "usb2-phy"; - status = "disabled"; - }; - gic: interrupt-controller@ff811000 { compatible = "arm,gic-400"; #interrupt-cells = <3>; diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig index 4fa8a7d365a4..c9683711dec2 100644 --- a/configs/evb-rk3328_defconfig +++ b/configs/evb-rk3328_defconfig @@ -31,6 +31,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=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_TIME=y CONFIG_CMD_REGULATOR=y @@ -83,17 +85,18 @@ CONFIG_SYSINFO=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig b/configs/nanopi-r2c-plus-rk3328_defconfig index 5302fd91a0f5..ffcead53f398 100644 --- a/configs/nanopi-r2c-plus-rk3328_defconfig +++ b/configs/nanopi-r2c-plus-rk3328_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=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_TIME=y CONFIG_CMD_REGULATOR=y @@ -90,17 +92,18 @@ CONFIG_SYSINFO=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/nanopi-r2c-rk3328_defconfig b/configs/nanopi-r2c-rk3328_defconfig index 5a722c182631..966627033212 100644 --- a/configs/nanopi-r2c-rk3328_defconfig +++ b/configs/nanopi-r2c-rk3328_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=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_TIME=y CONFIG_CMD_REGULATOR=y @@ -90,17 +92,18 @@ CONFIG_SYSINFO=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/nanopi-r2s-rk3328_defconfig b/configs/nanopi-r2s-rk3328_defconfig index 985d02475ece..5dff7d9a14a7 100644 --- a/configs/nanopi-r2s-rk3328_defconfig +++ b/configs/nanopi-r2s-rk3328_defconfig @@ -33,6 +33,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=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_TIME=y CONFIG_CMD_REGULATOR=y @@ -90,17 +92,18 @@ CONFIG_SYSINFO=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig b/configs/orangepi-r1-plus-lts-rk3328_defconfig index e9f7a1306923..b7a4ff7efefe 100644 --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig @@ -38,6 +38,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=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_TIME=y CONFIG_CMD_REGULATOR=y @@ -100,17 +102,18 @@ CONFIG_SYSINFO=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/orangepi-r1-plus-rk3328_defconfig b/configs/orangepi-r1-plus-rk3328_defconfig index 6019f33ae3f5..4b0dc1441a6f 100644 --- a/configs/orangepi-r1-plus-rk3328_defconfig +++ b/configs/orangepi-r1-plus-rk3328_defconfig @@ -38,6 +38,8 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_GPT=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_TIME=y CONFIG_CMD_REGULATOR=y @@ -100,17 +102,18 @@ CONFIG_SYSINFO=y CONFIG_SYSRESET=y # CONFIG_TPL_SYSRESET is not set CONFIG_USB=y +CONFIG_DM_USB_GADGET=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y # CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DWC2_OTG=y +CONFIG_USB_FUNCTION_ROCKUSB=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/roc-cc-rk3328_defconfig b/configs/roc-cc-rk3328_defconfig index 191dbff928bb..6526d2606e72 100644 --- a/configs/roc-cc-rk3328_defconfig +++ b/configs/roc-cc-rk3328_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART_BASE=0xFF130000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y -# CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_SIGNATURE=y @@ -34,7 +33,6 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_POWEROFF=y CONFIG_CMD_USB=y -CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_CMD_REGULATOR=y @@ -55,8 +53,6 @@ CONFIG_SPL_SYSCON=y CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -97,10 +93,7 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y -# CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/rock-pi-e-rk3328_defconfig b/configs/rock-pi-e-rk3328_defconfig index e4f2123e0b17..23029255bca2 100644 --- a/configs/rock-pi-e-rk3328_defconfig +++ b/configs/rock-pi-e-rk3328_defconfig @@ -13,7 +13,6 @@ CONFIG_DEBUG_UART_BASE=0xFF130000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y -# CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_SIGNATURE=y @@ -52,8 +51,6 @@ CONFIG_SPL_SYSCON=y CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -92,12 +89,8 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y -CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y -# CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig index f38431891bf8..b0be1d1d7633 100644 --- a/configs/rock64-rk3328_defconfig +++ b/configs/rock64-rk3328_defconfig @@ -16,7 +16,6 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_SYS_LOAD_ADDR=0x800800 CONFIG_DEBUG_UART=y -# CONFIG_ANDROID_BOOT_IMAGE is not set CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_FIT_SIGNATURE=y @@ -59,8 +58,6 @@ CONFIG_SPL_SYSCON=y CONFIG_TPL_SYSCON=y CONFIG_CLK=y CONFIG_SPL_CLK=y -CONFIG_FASTBOOT_BUF_ADDR=0x800800 -CONFIG_FASTBOOT_CMD_OEM_FORMAT=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y CONFIG_MMC_DW=y @@ -106,10 +103,7 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_GENERIC=y CONFIG_USB_DWC2=y CONFIG_USB_DWC3=y -# CONFIG_USB_DWC3_GADGET is not set CONFIG_USB_DWC3_GENERIC=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_SPL_TINY_MEMSET=y CONFIG_TPL_TINY_MEMSET=y CONFIG_ERRNO_STR=y
USB gadget is not working fully as expected on RK3328, it uses a board_usb_init() function to initialize the DWC2 OTG port. The board_usb_init() function does not intgrate with the generic phy framework and as a result the USB phy is not properly configured before or after USB gadget use. Having both USB_DWC2 and DWC2_OTG enabled for the same board is also causing some issues. Trying to use rockusb or ums command after usb stop result in a freeze due to usb stop is putting the phy in a suspended state. => usb start => usb stop => ums 0 mmc 0 --> freeze due to usb phy is suspended <-- Fix this by only using one of USB_DWC2 (host) or DWC2_OTG (peripheral) depending on the most likely usage of the otg port. The nanopi-r2 and orangepi-r1-plus variants share OTG and power using a Type-C connector, mark these boards dr_mode as peripheral, the most likely usage is for recovery and image download. The rock64 and roc-cc currently use dr_mode as host, remove the DWC2_OTG driver from these boards to ensure that the USB_DWC2 driver is used. The rock-pi-e board does not enable the usb20_otg node so both USB_DWC2 and DWC2_OTG is removed from this board. Enable RockUSB and UMS on all boards with a otg port in peripheral mode. Also with the migration to DM_USB_GADGET completed the U-Boot specific change to reorder usb nodes in the device tree can be reverted. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- arch/arm/dts/rk3328-nanopi-r2s-u-boot.dtsi | 4 ++ .../rk3328-orangepi-r1-plus-lts-u-boot.dtsi | 4 ++ .../dts/rk3328-orangepi-r1-plus-u-boot.dtsi | 4 ++ arch/arm/dts/rk3328-roc-cc-u-boot.dtsi | 4 ++ arch/arm/dts/rk3328-rock-pi-e-u-boot.dtsi | 9 ++++ arch/arm/dts/rk3328-rock64-u-boot.dtsi | 4 ++ arch/arm/dts/rk3328-u-boot.dtsi | 4 -- arch/arm/dts/rk3328.dtsi | 41 ++++++++----------- configs/evb-rk3328_defconfig | 5 ++- configs/nanopi-r2c-plus-rk3328_defconfig | 5 ++- configs/nanopi-r2c-rk3328_defconfig | 5 ++- configs/nanopi-r2s-rk3328_defconfig | 5 ++- configs/orangepi-r1-plus-lts-rk3328_defconfig | 5 ++- configs/orangepi-r1-plus-rk3328_defconfig | 5 ++- configs/roc-cc-rk3328_defconfig | 7 ---- configs/rock-pi-e-rk3328_defconfig | 7 ---- configs/rock64-rk3328_defconfig | 6 --- 17 files changed, 69 insertions(+), 55 deletions(-)