| Message ID | dbf8e39b6ecfaffd8206f926b5dd4efa475a9128.1505242834.git-series.maxime.ripard@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | e02687bda96cc8ed942e14b558796d3043d24b23 |
| Headers | show |
| Series | sunxi: convert musb to the device model and enable usb_ether | expand |
On 09/12/2017 09:01 PM, Maxime Ripard wrote: > All the Allwinner boards use the same manufacturer, VID and PID for the > gadgets. Make them the defaults to remove some boilerplate from our > defconfigs. Reviewed-by: Łukasz Majewski <lukma@denx.de> > > Reviewed-by: Simon Glass <sjg@chromium.org> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > configs/A13-OLinuXino_defconfig | 3 --- > configs/A20-OLinuXino-Lime2-eMMC_defconfig | 3 --- > configs/A20-OLinuXino-Lime2_defconfig | 3 --- > configs/CHIP_defconfig | 3 --- > configs/CHIP_pro_defconfig | 3 --- > configs/Cubietruck_defconfig | 3 --- > configs/Nintendo_NES_Classic_Edition_defconfig | 3 --- > configs/Sinlinx_SinA33_defconfig | 3 --- > configs/parrot_r16_defconfig | 3 --- > drivers/usb/gadget/Kconfig | 3 +++ > 10 files changed, 3 insertions(+), 27 deletions(-) > > diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig > index 2574018d8213..ae790164dff7 100644 > --- a/configs/A13-OLinuXino_defconfig > +++ b/configs/A13-OLinuXino_defconfig > @@ -32,7 +32,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig > index 5663a824e71b..b136af66b71f 100644 > --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig > +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig > @@ -34,7 +34,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig > index 63d013293690..ebb435f30956 100644 > --- a/configs/A20-OLinuXino-Lime2_defconfig > +++ b/configs/A20-OLinuXino-Lime2_defconfig > @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig > index 278039c05573..7d50d0533dcd 100644 > --- a/configs/CHIP_defconfig > +++ b/configs/CHIP_defconfig > @@ -23,8 +23,5 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig > index edbdefc69ddf..76daf477ec87 100644 > --- a/configs/CHIP_pro_defconfig > +++ b/configs/CHIP_pro_defconfig > @@ -28,8 +28,5 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > CONFIG_OF_LIBFDT_OVERLAY=y > diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig > index 2d1753645b0f..1b2989d364f6 100644 > --- a/configs/Cubietruck_defconfig > +++ b/configs/Cubietruck_defconfig > @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig > index 99f7d30f150d..5986764a14b9 100644 > --- a/configs/Nintendo_NES_Classic_Edition_defconfig > +++ b/configs/Nintendo_NES_Classic_Edition_defconfig > @@ -23,7 +23,4 @@ CONFIG_AXP_ELDO2_VOLT=1800 > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig > index 8c5fc7587909..9299aedd6019 100644 > --- a/configs/Sinlinx_SinA33_defconfig > +++ b/configs/Sinlinx_SinA33_defconfig > @@ -28,7 +28,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig > index 4b70fc5687eb..57db9587fe77 100644 > --- a/configs/parrot_r16_defconfig > +++ b/configs/parrot_r16_defconfig > @@ -24,7 +24,4 @@ CONFIG_USB_EHCI_HCD=y > CONFIG_USB_MUSB_GADGET=y > CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y > CONFIG_USB_GADGET=y > -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" > -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a > -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 > CONFIG_USB_GADGET_DOWNLOAD=y > diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig > index ef13bd2edb66..32b9a7e9fe49 100644 > --- a/drivers/usb/gadget/Kconfig > +++ b/drivers/usb/gadget/Kconfig > @@ -38,12 +38,14 @@ if USB_GADGET > > config USB_GADGET_MANUFACTURER > string "Vendor name of the USB device" > + default "Allwinner Technology" if ARCH_SUNXI > help > Vendor name of the USB device emulated, reported to the host device. > This is usually either the manufacturer of the device or the SoC. > > config USB_GADGET_VENDOR_NUM > hex "Vendor ID of the USB device" > + default 0x1f3a if ARCH_SUNXI > help > Vendor ID of the USB device emulated, reported to the host device. > This is usually the board or SoC vendor's, unless you've registered > @@ -51,6 +53,7 @@ config USB_GADGET_VENDOR_NUM > > config USB_GADGET_PRODUCT_NUM > hex "Product ID of the USB device" > + default 0x1010 if ARCH_SUNXI > help > Product ID of the USB device emulated, reported to the host device. > >
diff --git a/configs/A13-OLinuXino_defconfig b/configs/A13-OLinuXino_defconfig index 2574018d8213..ae790164dff7 100644 --- a/configs/A13-OLinuXino_defconfig +++ b/configs/A13-OLinuXino_defconfig @@ -32,7 +32,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig index 5663a824e71b..b136af66b71f 100644 --- a/configs/A20-OLinuXino-Lime2-eMMC_defconfig +++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig @@ -34,7 +34,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig index 63d013293690..ebb435f30956 100644 --- a/configs/A20-OLinuXino-Lime2_defconfig +++ b/configs/A20-OLinuXino-Lime2_defconfig @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/CHIP_defconfig b/configs/CHIP_defconfig index 278039c05573..7d50d0533dcd 100644 --- a/configs/CHIP_defconfig +++ b/configs/CHIP_defconfig @@ -23,8 +23,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/CHIP_pro_defconfig b/configs/CHIP_pro_defconfig index edbdefc69ddf..76daf477ec87 100644 --- a/configs/CHIP_pro_defconfig +++ b/configs/CHIP_pro_defconfig @@ -28,8 +28,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_OF_LIBFDT_OVERLAY=y diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig index 2d1753645b0f..1b2989d364f6 100644 --- a/configs/Cubietruck_defconfig +++ b/configs/Cubietruck_defconfig @@ -33,7 +33,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/Nintendo_NES_Classic_Edition_defconfig b/configs/Nintendo_NES_Classic_Edition_defconfig index 99f7d30f150d..5986764a14b9 100644 --- a/configs/Nintendo_NES_Classic_Edition_defconfig +++ b/configs/Nintendo_NES_Classic_Edition_defconfig @@ -23,7 +23,4 @@ CONFIG_AXP_ELDO2_VOLT=1800 CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/Sinlinx_SinA33_defconfig b/configs/Sinlinx_SinA33_defconfig index 8c5fc7587909..9299aedd6019 100644 --- a/configs/Sinlinx_SinA33_defconfig +++ b/configs/Sinlinx_SinA33_defconfig @@ -28,7 +28,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/configs/parrot_r16_defconfig b/configs/parrot_r16_defconfig index 4b70fc5687eb..57db9587fe77 100644 --- a/configs/parrot_r16_defconfig +++ b/configs/parrot_r16_defconfig @@ -24,7 +24,4 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_MUSB_GADGET=y CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_MANUFACTURER="Allwinner Technology" -CONFIG_USB_GADGET_VENDOR_NUM=0x1f3a -CONFIG_USB_GADGET_PRODUCT_NUM=0x1010 CONFIG_USB_GADGET_DOWNLOAD=y diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig index ef13bd2edb66..32b9a7e9fe49 100644 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/gadget/Kconfig @@ -38,12 +38,14 @@ if USB_GADGET config USB_GADGET_MANUFACTURER string "Vendor name of the USB device" + default "Allwinner Technology" if ARCH_SUNXI help Vendor name of the USB device emulated, reported to the host device. This is usually either the manufacturer of the device or the SoC. config USB_GADGET_VENDOR_NUM hex "Vendor ID of the USB device" + default 0x1f3a if ARCH_SUNXI help Vendor ID of the USB device emulated, reported to the host device. This is usually the board or SoC vendor's, unless you've registered @@ -51,6 +53,7 @@ config USB_GADGET_VENDOR_NUM config USB_GADGET_PRODUCT_NUM hex "Product ID of the USB device" + default 0x1010 if ARCH_SUNXI help Product ID of the USB device emulated, reported to the host device.