| Message ID | 20240310185106.665553-2-jonas@kwiboo.se |
|---|---|
| State | Accepted |
| Commit | 8c19275fdb13cdc1b8719436fa9477c294996fab |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: Migrate to use DM_USB_GADGET on RK3328 | expand |
On 2024/3/11 02:50, Jonas Karlman wrote: > RK3036 is using the USB product id normally used by RK3066B, and RK3328 > is using the product id normally used by RK3368. > > Fix this and update the default USB_GADGET_PRODUCT_NUM Kconfig option > for remaining supported Rockchip SoCs to match the product id used in > Maskrom mode. > > Also remove a reference to an undefined ROCKCHIP_RK3229 Kconfig symbol. > > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > v2: > - Update commit message > --- > drivers/usb/gadget/Kconfig | 15 ++++++++++++--- > 1 file changed, 12 insertions(+), 3 deletions(-) > > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index c72a8047635c..4621a6fd5e64 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -70,12 +70,21 @@ config USB_GADGET_PRODUCT_NUM > hex "Product ID of the USB device" > default 0x701a if ARCH_TEGRA > default 0x1010 if ARCH_SUNXI > - default 0x310a if ROCKCHIP_RK3036 > + default 0x110a if ROCKCHIP_RV1108 > + default 0x110b if ROCKCHIP_RV1126 > default 0x300a if ROCKCHIP_RK3066 > + default 0x301a if ROCKCHIP_RK3036 > + default 0x310b if ROCKCHIP_RK3188 > default 0x310c if ROCKCHIP_RK3128 > - default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 > - default 0x330a if ROCKCHIP_RK3328 > + default 0x320a if ROCKCHIP_RK3288 > + default 0x320b if ROCKCHIP_RK322X > + default 0x320c if ROCKCHIP_RK3328 > + default 0x330a if ROCKCHIP_RK3368 > default 0x330c if ROCKCHIP_RK3399 > + default 0x330d if ROCKCHIP_PX30 > + default 0x330e if ROCKCHIP_RK3308 > + default 0x350a if ROCKCHIP_RK3568 > + default 0x350b if ROCKCHIP_RK3588 > default 0x0 > help > Product ID of the USB device emulated, reported to the host device.
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index c72a8047635c..4621a6fd5e64 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -70,12 +70,21 @@ config USB_GADGET_PRODUCT_NUM hex "Product ID of the USB device" default 0x701a if ARCH_TEGRA default 0x1010 if ARCH_SUNXI - default 0x310a if ROCKCHIP_RK3036 + default 0x110a if ROCKCHIP_RV1108 + default 0x110b if ROCKCHIP_RV1126 default 0x300a if ROCKCHIP_RK3066 + default 0x301a if ROCKCHIP_RK3036 + default 0x310b if ROCKCHIP_RK3188 default 0x310c if ROCKCHIP_RK3128 - default 0x320a if ROCKCHIP_RK3229 || ROCKCHIP_RK3288 - default 0x330a if ROCKCHIP_RK3328 + default 0x320a if ROCKCHIP_RK3288 + default 0x320b if ROCKCHIP_RK322X + default 0x320c if ROCKCHIP_RK3328 + default 0x330a if ROCKCHIP_RK3368 default 0x330c if ROCKCHIP_RK3399 + default 0x330d if ROCKCHIP_PX30 + default 0x330e if ROCKCHIP_RK3308 + default 0x350a if ROCKCHIP_RK3568 + default 0x350b if ROCKCHIP_RK3588 default 0x0 help Product ID of the USB device emulated, reported to the host device.
RK3036 is using the USB product id normally used by RK3066B, and RK3328 is using the product id normally used by RK3368. Fix this and update the default USB_GADGET_PRODUCT_NUM Kconfig option for remaining supported Rockchip SoCs to match the product id used in Maskrom mode. Also remove a reference to an undefined ROCKCHIP_RK3229 Kconfig symbol. Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- v2: - Update commit message --- drivers/usb/gadget/Kconfig | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)