From a59a77f86318550168d5ceec36a7ca0add42d778 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:24 +0300 Subject: usb: gadget: Move CONFIG_USB_GADGET_VBUS_DRAW to Kconfig The description was borrowed from kernel. Definitions were added to defconfig files in a way that "make savedefconfig" generates exactly the same file as used defconfig. Boards using 0 mA as CONFIG_USB_GADGET_VBUS_DRAW value were moved to use 2 mA (as minimal allowed by Kconfig). Signed-off-by: Sam Protsenko --- include/configs/siemens-am33x-common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/siemens-am33x-common.h') diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index df2a514..df4e734 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -225,7 +225,6 @@ #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #undef CONFIG_USB_GADGET_DUALSPEED -#define CONFIG_USB_GADGET_VBUS_DRAW 2 #define CONFIG_USB_MUSB_HOST #define CONFIG_AM335X_USB0 -- cgit v1.1 From 3457bbaf22a8fb6884d52fc3af997c187e930f06 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:25 +0300 Subject: usb: gadget: Move CONFIG_USB_GADGET_DUALSPEED to Kconfig Move CONFIG_USB_GADGET_DUALSPEED option to Kconfig and make all UDC controllers select USB_GADGET_DUALSPEED: - add next options to Kconfig selecting USB_GADGET_DUALSPEED: - USB_GADGET_ATMEL_USBA - USB_GADGET_DWC2_OTG - USB_DWC3 - CI_UDC - make USB_MUSB_GADGET select USB_GADGET_DUALSPEED While at it, make some related fixes: - remove DUALSPEED from configs that don't enable gadget support: - kwb.h - tseries.h - add missing USB_GADGET option to next configs: - novena_defconfig - pcm051_rev*_defconfig - xfi3_defconfig Signed-off-by: Sam Protsenko --- include/configs/siemens-am33x-common.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/configs/siemens-am33x-common.h') diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index df4e734..3dbe343 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -221,7 +221,6 @@ */ #define CONFIG_USB_MUSB_DSPS #define CONFIG_ARCH_MISC_INIT -#define CONFIG_USB_MUSB_GADGET #define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT #undef CONFIG_USB_GADGET_DUALSPEED -- cgit v1.1 From aaa4a9e313ee6e5d30c1476ad754e0b907e34217 Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:26 +0300 Subject: usb: gadget: Move CONFIG_USB_GADGET_DOWNLOAD to Kconfig While at it, remove obsolete CONFIG_USBDOWNLOAD_GADGET option from some config headers. This is also probably fixes am335x_baltos board. Signed-off-by: Sam Protsenko --- include/configs/siemens-am33x-common.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/configs/siemens-am33x-common.h') diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 3dbe343..d630f04 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -241,8 +241,6 @@ #define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" #endif /* CONFIG_USB_MUSB_GADGET */ -#define CONFIG_USB_GADGET_DOWNLOAD - /* USB DRACO ID as default */ #define CONFIG_USBD_HS #define CONFIG_G_DNL_VENDOR_NUM 0x0908 -- cgit v1.1 From e6c0bc0643e5a4387fecbcf83080d0b796eb067c Mon Sep 17 00:00:00 2001 From: Sam Protsenko Date: Wed, 13 Apr 2016 14:20:30 +0300 Subject: usb: gadget Move: CONFIG_G_DNL_* to Kconfig And also reformat defconfigs using "make savedefconfig" rule. Signed-off-by: Sam Protsenko --- include/configs/siemens-am33x-common.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include/configs/siemens-am33x-common.h') diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index d630f04..5b94fad 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -243,9 +243,6 @@ /* USB DRACO ID as default */ #define CONFIG_USBD_HS -#define CONFIG_G_DNL_VENDOR_NUM 0x0908 -#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2 -#define CONFIG_G_DNL_MANUFACTURER "Siemens AG" /* USB Device Firmware Update support */ #define CONFIG_USB_FUNCTION_DFU -- cgit v1.1