[U-Boot] [PATCH v2 02/10] gadget: Select USB_GADGET_VENDOR_NUM for rockchip

Kever Yang
2019-11-23T14:20:37Z

On 2019/11/19 下午4:26, Jagan Teki wrote:
> Gadget vendor number, 0x2207 is common across all platfroms
> supported in Rockchip SoC.
>
> So, select the same number globally, if ARCH_ROCKCHIP.
>
> This eventually drop the explicit configs defined in supported
> board defconfig files.
>
> Tested-by: Levin Du <djw@t-chip.com.cn>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
> configs/elgin-rv1108_defconfig | 1 -
> configs/evb-rk3036_defconfig | 1 -
> configs/evb-rk3229_defconfig | 1 -
> configs/evb-rk3288_defconfig | 1 -
> configs/evb-rk3328_defconfig | 1 -
> configs/evb-rv1108_defconfig | 1 -
> configs/firefly-rk3288_defconfig | 1 -
> configs/kylin-rk3036_defconfig | 1 -
> configs/miqi-rk3288_defconfig | 1 -
> configs/phycore-rk3288_defconfig | 1 -
> configs/popmetal-rk3288_defconfig | 1 -
> configs/rock2_defconfig | 1 -
> configs/rock64-rk3328_defconfig | 1 -
> configs/tinker-rk3288_defconfig | 1 -
> configs/tinker-s-rk3288_defconfig | 1 -
> configs/vyasa-rk3288_defconfig | 1 -
> drivers/usb/gadget/Kconfig | 1 +
> 17 files changed, 1 insertion(+), 16 deletions(-)
>
> diff --git a/configs/elgin-rv1108_defconfig b/configs/elgin-rv1108_defconfig
> index c9d703a0f5..48351bb1dd 100644
> --- a/configs/elgin-rv1108_defconfig
> +++ b/configs/elgin-rv1108_defconfig
> @@ -49,7 +49,6 @@ CONFIG_USB_OHCI_HCD=y
> CONFIG_USB_OHCI_GENERIC=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x110a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig
> index c9882ded98..bb3e2c8f7d 100644
> --- a/configs/evb-rk3036_defconfig
> +++ b/configs/evb-rk3036_defconfig
> @@ -52,7 +52,6 @@ CONFIG_SYSRESET=y
> # CONFIG_SPL_SYSRESET is not set
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_SPL_TINY_MEMSET=y
> diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
> index 38b2660fb3..7bf26f7497 100644
> --- a/configs/evb-rk3229_defconfig
> +++ b/configs/evb-rk3229_defconfig
> @@ -64,7 +64,6 @@ CONFIG_DEBUG_UART_SHIFT=2
> CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_TPL_TINY_MEMSET=y
> diff --git a/configs/evb-rk3288_defconfig b/configs/evb-rk3288_defconfig
> index 12d454b410..8f2f13adae 100644
> --- a/configs/evb-rk3288_defconfig
> +++ b/configs/evb-rk3288_defconfig
> @@ -71,7 +71,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_DM_VIDEO=y
> diff --git a/configs/evb-rk3328_defconfig b/configs/evb-rk3328_defconfig
> index 8f97ef2c34..747089435d 100644
> --- a/configs/evb-rk3328_defconfig
> +++ b/configs/evb-rk3328_defconfig
> @@ -86,7 +86,6 @@ CONFIG_USB_DWC2=y
> CONFIG_USB_DWC3=y
> # CONFIG_USB_DWC3_GADGET is not set
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x330a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_SPL_TINY_MEMSET=y
> diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig
> index 18bc6529ac..c9cad2bb4a 100644
> --- a/configs/evb-rv1108_defconfig
> +++ b/configs/evb-rv1108_defconfig
> @@ -44,7 +44,6 @@ CONFIG_USB_OHCI_HCD=y
> CONFIG_USB_OHCI_GENERIC=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x110a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_ERRNO_STR=y
> diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig
> index fa3715cf7e..92eeffda01 100644
> --- a/configs/firefly-rk3288_defconfig
> +++ b/configs/firefly-rk3288_defconfig
> @@ -75,7 +75,6 @@ CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig
> index 4fc0c3e491..08b47c84ef 100644
> --- a/configs/kylin-rk3036_defconfig
> +++ b/configs/kylin-rk3036_defconfig
> @@ -56,7 +56,6 @@ CONFIG_SYSRESET=y
> CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x310a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/miqi-rk3288_defconfig b/configs/miqi-rk3288_defconfig
> index c007c90a90..b06175958e 100644
> --- a/configs/miqi-rk3288_defconfig
> +++ b/configs/miqi-rk3288_defconfig
> @@ -71,7 +71,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/phycore-rk3288_defconfig b/configs/phycore-rk3288_defconfig
> index 0329a8aa55..a86f689858 100644
> --- a/configs/phycore-rk3288_defconfig
> +++ b/configs/phycore-rk3288_defconfig
> @@ -75,7 +75,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/popmetal-rk3288_defconfig b/configs/popmetal-rk3288_defconfig
> index 95a0a4b4d1..0cb67f33fe 100644
> --- a/configs/popmetal-rk3288_defconfig
> +++ b/configs/popmetal-rk3288_defconfig
> @@ -71,7 +71,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig
> index b7f6646381..1afb12d015 100644
> --- a/configs/rock2_defconfig
> +++ b/configs/rock2_defconfig
> @@ -72,7 +72,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_DM_VIDEO=y
> diff --git a/configs/rock64-rk3328_defconfig b/configs/rock64-rk3328_defconfig
> index d9a170ba26..ec13a7710a 100644
> --- a/configs/rock64-rk3328_defconfig
> +++ b/configs/rock64-rk3328_defconfig
> @@ -87,7 +87,6 @@ CONFIG_USB_DWC2=y
> CONFIG_USB_DWC3=y
> # CONFIG_USB_DWC3_GADGET is not set
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x330a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_SPL_TINY_MEMSET=y
> diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
> index bb561fac23..e46eb1cd91 100644
> --- a/configs/tinker-rk3288_defconfig
> +++ b/configs/tinker-rk3288_defconfig
> @@ -77,7 +77,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig
> index 38cb1984d8..3acb2ac5f5 100644
> --- a/configs/tinker-s-rk3288_defconfig
> +++ b/configs/tinker-s-rk3288_defconfig
> @@ -83,7 +83,6 @@ CONFIG_USB=y
> CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_HOST_ETHER=y
> diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig
> index 081e32d67d..997d9a3877 100644
> --- a/configs/vyasa-rk3288_defconfig
> +++ b/configs/vyasa-rk3288_defconfig
> @@ -69,7 +69,6 @@ CONFIG_USB_DWC2=y
> CONFIG_ROCKCHIP_USB2_PHY=y
> CONFIG_USB_KEYBOARD=y
> CONFIG_USB_GADGET=y
> -CONFIG_USB_GADGET_VENDOR_NUM=0x2207
> CONFIG_USB_GADGET_PRODUCT_NUM=0x320a
> CONFIG_USB_GADGET_DWC2_OTG=y
> CONFIG_USB_FUNCTION_MASS_STORAGE=y
> diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
> index 1959a390f3..844c3be16f 100644
> --- a/drivers/usb/gadget/Kconfig
> +++ b/drivers/usb/gadget/Kconfig
> @@ -48,6 +48,7 @@ config USB_GADGET_MANUFACTURER
> config USB_GADGET_VENDOR_NUM
> hex "Vendor ID of the USB device"
> default 0x1f3a if ARCH_SUNXI
> + default 0x2207 if ARCH_ROCKCHIP
> default 0x0
> help
> Vendor ID of the USB device emulated, reported to the host device.