[PATCH v2 2/2] rockchip: board: Remove dwc3 usb init and gadget handler functions

[Kever Yang]

On 2023/11/13 01:48, Jonas Karlman wrote:
> Remove board_usb_init() and dm_usb_gadget_handle_interrupts() functions
> related to dwc3, they use e.g. a hard-coded reg address for RK3399 and
> are obsolete with use of DM_USB_GADGET.
>
> Use of DM_USB_GADGET, USB_DWC3_GENERIC and USB_DWC3_GADGET have replaced
> same feature provided by the removed functions on RK3399 boards.
>
> Signed-off-by: Jonas Karlman <jonas at kwiboo.se>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
> v2:
> - Set DM_USB_GADGET for ARCH_ROCKCHIP when USB_DWC3_GADGET is enabled
>    to ensure same functionality is provided
> - Remove DM_USB_GADGET from a few more defconfig files
>
>   arch/arm/Kconfig                         |  1 +
>   arch/arm/mach-rockchip/board.c           | 30 +-----------------------
>   configs/nanopc-t6-rk3588_defconfig       |  1 -
>   configs/orangepi-5-plus-rk3588_defconfig |  1 -
>   configs/orangepi-5-rk3588s_defconfig     |  1 -
>   configs/rock5a-rk3588s_defconfig         |  1 -
>   configs/rock5b-rk3588_defconfig          |  1 -
>   7 files changed, 2 insertions(+), 34 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index d812685c9842..c39ae40335a0 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1974,6 +1974,7 @@ config ARCH_ROCKCHIP
>   	select DM_SERIAL
>   	select DM_SPI
>   	select DM_SPI_FLASH
> +	select DM_USB_GADGET if USB_DWC3_GADGET
>   	select ENABLE_ARM_SOC_BOOT0_HOOK
>   	select OF_CONTROL
>   	select SPI
> diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
> index 57f08e0be0e9..38a2a4b95ec0 100644
> --- a/arch/arm/mach-rockchip/board.c
> +++ b/arch/arm/mach-rockchip/board.c
> @@ -208,10 +208,8 @@ void enable_caches(void)
>   }
>   #endif
>   
> -#if defined(CONFIG_USB_GADGET)
> +#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG)
>   #include <usb.h>
> -
> -#if defined(CONFIG_USB_GADGET_DWC2_OTG)
>   #include <linux/usb/otg.h>
>   #include <usb/dwc2_udc.h>
>   
> @@ -287,32 +285,6 @@ int board_usb_cleanup(int index, enum usb_init_type init)
>   }
>   #endif /* CONFIG_USB_GADGET_DWC2_OTG */
>   
> -#if defined(CONFIG_USB_DWC3_GADGET) && !defined(CONFIG_DM_USB_GADGET)
> -#include <dwc3-uboot.h>
> -
> -static struct dwc3_device dwc3_device_data = {
> -	.maximum_speed = USB_SPEED_HIGH,
> -	.base = 0xfe800000,
> -	.dr_mode = USB_DR_MODE_PERIPHERAL,
> -	.index = 0,
> -	.dis_u2_susphy_quirk = 1,
> -	.hsphy_mode = USBPHY_INTERFACE_MODE_UTMIW,
> -};
> -
> -int dm_usb_gadget_handle_interrupts(struct udevice *dev)
> -{
> -	dwc3_uboot_handle_interrupt(dev);
> -	return 0;
> -}
> -
> -int board_usb_init(int index, enum usb_init_type init)
> -{
> -	return dwc3_uboot_init(&dwc3_device_data);
> -}
> -#endif /* CONFIG_USB_DWC3_GADGET */
> -
> -#endif /* CONFIG_USB_GADGET */
> -
>   #if IS_ENABLED(CONFIG_FASTBOOT)
>   int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason)
>   {
> diff --git a/configs/nanopc-t6-rk3588_defconfig b/configs/nanopc-t6-rk3588_defconfig
> index 070399ce2a86..62f307a3f361 100644
> --- a/configs/nanopc-t6-rk3588_defconfig
> +++ b/configs/nanopc-t6-rk3588_defconfig
> @@ -91,7 +91,6 @@ CONFIG_SYS_NS16550_MEM32=y
>   CONFIG_ROCKCHIP_SFC=y
>   CONFIG_SYSRESET=y
>   CONFIG_USB=y
> -CONFIG_DM_USB_GADGET=y
>   CONFIG_USB_XHCI_HCD=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y
> diff --git a/configs/orangepi-5-plus-rk3588_defconfig b/configs/orangepi-5-plus-rk3588_defconfig
> index 04736996217e..9ebb8c2244c5 100644
> --- a/configs/orangepi-5-plus-rk3588_defconfig
> +++ b/configs/orangepi-5-plus-rk3588_defconfig
> @@ -94,7 +94,6 @@ CONFIG_SYS_NS16550_MEM32=y
>   CONFIG_ROCKCHIP_SFC=y
>   CONFIG_SYSRESET=y
>   CONFIG_USB=y
> -CONFIG_DM_USB_GADGET=y
>   CONFIG_USB_XHCI_HCD=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y
> diff --git a/configs/orangepi-5-rk3588s_defconfig b/configs/orangepi-5-rk3588s_defconfig
> index feb45a53853b..4b5803dce9be 100644
> --- a/configs/orangepi-5-rk3588s_defconfig
> +++ b/configs/orangepi-5-rk3588s_defconfig
> @@ -91,7 +91,6 @@ CONFIG_SYS_NS16550_MEM32=y
>   CONFIG_ROCKCHIP_SFC=y
>   CONFIG_SYSRESET=y
>   CONFIG_USB=y
> -CONFIG_DM_USB_GADGET=y
>   CONFIG_USB_XHCI_HCD=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y
> diff --git a/configs/rock5a-rk3588s_defconfig b/configs/rock5a-rk3588s_defconfig
> index a6471a519514..efa7bcbdcda6 100644
> --- a/configs/rock5a-rk3588s_defconfig
> +++ b/configs/rock5a-rk3588s_defconfig
> @@ -75,7 +75,6 @@ CONFIG_DEBUG_UART_SHIFT=2
>   CONFIG_SYS_NS16550_MEM32=y
>   CONFIG_SYSRESET=y
>   CONFIG_USB=y
> -CONFIG_DM_USB_GADGET=y
>   CONFIG_USB_XHCI_HCD=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y
> diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
> index 0595325e8107..6135af04feef 100644
> --- a/configs/rock5b-rk3588_defconfig
> +++ b/configs/rock5b-rk3588_defconfig
> @@ -99,7 +99,6 @@ CONFIG_SYS_NS16550_MEM32=y
>   CONFIG_ROCKCHIP_SFC=y
>   CONFIG_SYSRESET=y
>   CONFIG_USB=y
> -CONFIG_DM_USB_GADGET=y
>   CONFIG_USB_XHCI_HCD=y
>   CONFIG_USB_EHCI_HCD=y
>   CONFIG_USB_EHCI_GENERIC=y