On Tue, 8 Oct 2024 at 20:52, Jonas Karlman <[email protected]> wrote: > > After the full convertion of usb gadget interrupt handling to > usb_gadget_generic_ops, it is now possible to use DM_USB_GADGET, > DWC2_OTG and DWC3_GENERIC together without causing a build error. > > Change to use USB_DWC3_GENERIC instead of USB_XHCI_DWC3 to complte the > migration initiated in commit 1bc4e8eb1d7f ("rockchip: Migrate to use > DM_USB_GADGET on RK3328"). No functional change is intended. > > Signed-off-by: Jonas Karlman <[email protected]> LGTM Reviewed-by: Peter Robinson <[email protected]>
> --- > This has been tested on a Orange Pi R1 Plus LTS and a NanoPi R2S Plus. > --- > configs/evb-rk3328_defconfig | 3 +-- > configs/nanopi-r2c-plus-rk3328_defconfig | 3 +-- > configs/nanopi-r2c-rk3328_defconfig | 3 +-- > configs/nanopi-r2s-rk3328_defconfig | 3 +-- > configs/orangepi-r1-plus-lts-rk3328_defconfig | 3 +-- > configs/orangepi-r1-plus-rk3328_defconfig | 3 +-- > 6 files changed, 6 insertions(+), 12 deletions(-) > > diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig > index bfb85223437d..b3790c4d4ae2 100644 > --- a/configs/evb-rk3328_defconfig > +++ b/configs/evb-rk3328_defconfig > @@ -88,13 +88,12 @@ CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > -CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=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 > diff --git a/configs/nanopi-r2c-plus-rk3328_defconfig > b/configs/nanopi-r2c-plus-rk3328_defconfig > index f311a0a80ba7..19fab59eff01 100644 > --- a/configs/nanopi-r2c-plus-rk3328_defconfig > +++ b/configs/nanopi-r2c-plus-rk3328_defconfig > @@ -94,13 +94,12 @@ CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > -CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=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 > diff --git a/configs/nanopi-r2c-rk3328_defconfig > b/configs/nanopi-r2c-rk3328_defconfig > index 533dc1029f73..65ffdd34d4d1 100644 > --- a/configs/nanopi-r2c-rk3328_defconfig > +++ b/configs/nanopi-r2c-rk3328_defconfig > @@ -94,13 +94,12 @@ CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > -CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=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 > diff --git a/configs/nanopi-r2s-rk3328_defconfig > b/configs/nanopi-r2s-rk3328_defconfig > index 2591a9cc8ab2..751da1c446d8 100644 > --- a/configs/nanopi-r2s-rk3328_defconfig > +++ b/configs/nanopi-r2s-rk3328_defconfig > @@ -94,13 +94,12 @@ CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > -CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=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 > diff --git a/configs/orangepi-r1-plus-lts-rk3328_defconfig > b/configs/orangepi-r1-plus-lts-rk3328_defconfig > index 14cdbd813c81..7786a3514b4d 100644 > --- a/configs/orangepi-r1-plus-lts-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-lts-rk3328_defconfig > @@ -104,13 +104,12 @@ CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > -CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=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 > diff --git a/configs/orangepi-r1-plus-rk3328_defconfig > b/configs/orangepi-r1-plus-rk3328_defconfig > index 7fe58e7a1467..e2b9ce705ecb 100644 > --- a/configs/orangepi-r1-plus-rk3328_defconfig > +++ b/configs/orangepi-r1-plus-rk3328_defconfig > @@ -104,13 +104,12 @@ CONFIG_SYSRESET=y > CONFIG_USB=y > CONFIG_DM_USB_GADGET=y > CONFIG_USB_XHCI_HCD=y > -CONFIG_USB_XHCI_DWC3=y > CONFIG_USB_EHCI_HCD=y > CONFIG_USB_EHCI_GENERIC=y > CONFIG_USB_OHCI_HCD=y > CONFIG_USB_OHCI_GENERIC=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 > -- > 2.46.2 >
