From e13a9dc370352000b16905c3abf586e3b9f3c5ef Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Fri, 29 Dec 2017 09:15:41 -0600 Subject: [PATCH] Convert CONFIG_USB_MUSB_HCD et al to Kconfig This converts the following to Kconfig: CONFIG_USB_MUSB_HCD CONFIG_USB_MUSB_UDC CONFIG_USB_DAVINCI CONFIG_USB_OMAP3 CONFIG_USB_DA8XX CONFIG_USB_AM35X Signed-off-by: Adam Ford --- configs/am3517_crane_defconfig | 2 ++ configs/cm_t35_defconfig | 2 ++ configs/duovero_defconfig | 2 ++ configs/igep0032_defconfig | 3 +++ configs/igep00x0_defconfig | 3 +++ configs/nokia_rx51_defconfig | 4 ++++ configs/omap3_evm_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_zoom1_defconfig | 3 +++ configs/omap4_panda_defconfig | 2 ++ configs/omap4_sdp4430_defconfig | 3 +++ drivers/usb/Kconfig | 2 ++ drivers/usb/musb/Kconfig | 29 +++++++++++++++++++++++++++++ include/configs/am3517_crane.h | 2 -- include/configs/cm_t35.h | 2 -- include/configs/cm_t3517.h | 1 - include/configs/eco5pk.h | 2 -- include/configs/nokia_rx51.h | 3 --- include/configs/omap3_evm.h | 1 - include/configs/omap3_igep00x0.h | 2 -- include/configs/omap3_logic.h | 2 -- include/configs/omap3_zoom1.h | 2 -- include/configs/ti_omap4_common.h | 2 -- scripts/config_whitelist.txt | 4 ---- 24 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 drivers/usb/musb/Kconfig diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index a1766d9f86..2e8d9439ad 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -31,4 +31,6 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_MUSB_HCD=y +CONFIG_USB_AM35X=y CONFIG_USB_STORAGE=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index c61a93beb9..cfb68b1cd2 100644 --- a/configs/cm_t35_defconfig +++ b/configs/cm_t35_defconfig @@ -50,6 +50,8 @@ CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_USB_STORAGE=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/duovero_defconfig b/configs/duovero_defconfig index f52cbe71b1..a510294093 100644 --- a/configs/duovero_defconfig +++ b/configs/duovero_defconfig @@ -32,6 +32,8 @@ CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_USB_STORAGE=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index e394aa53c7..60cce779cd 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -39,6 +39,9 @@ CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index d70d4c6ce4..d8ece6bbee 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -40,6 +40,9 @@ CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 9057811e7f..570bb3f7ac 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -26,6 +26,10 @@ CONFIG_CMD_FAT=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_HCD=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_VIDEO=y CONFIG_CFB_CONSOLE_ANSI=y # CONFIG_VGA_AS_SINGLE_DEVICE is not set diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 1fb775f98e..0ae18526e7 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -56,6 +56,7 @@ CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_GADGET=y diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index c99fa9e964..3abe8885f0 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -50,6 +50,7 @@ CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_STORAGE=y diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index 6639c7e466..db867b1f2c 100644 --- a/configs/omap3_zoom1_defconfig +++ b/configs/omap3_zoom1_defconfig @@ -41,5 +41,8 @@ CONFIG_SMC911X_BASE=0x08000000 CONFIG_SMC911X_32_BIT=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig index 0faea774ae..aa0c36eb95 100644 --- a/configs/omap4_panda_defconfig +++ b/configs/omap4_panda_defconfig @@ -31,6 +31,8 @@ CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index b7ba1f30b6..ac49571063 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -27,5 +27,8 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_UDC=y +CONFIG_USB_OMAP3=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index e7658b4d95..13e9e49b22 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -51,6 +51,8 @@ source "drivers/usb/host/Kconfig" source "drivers/usb/dwc3/Kconfig" +source "drivers/usb/musb/Kconfig" + source "drivers/usb/musb-new/Kconfig" source "drivers/usb/emul/Kconfig" diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig new file mode 100644 index 0000000000..4e2be3789c --- /dev/null +++ b/drivers/usb/musb/Kconfig @@ -0,0 +1,29 @@ +# +# (C) Copyright 2017 +# Adam Ford, Logic PD, aford173@gmail.com +# +# SPDX-License-Identifier: GPL-2.0+ +# + +comment "Legacy MUSB Support" + +config USB_MUSB_HCD + bool "Legacy MUSB Host Controller" + +config USB_MUSB_UDC + bool "Legacy USB Device Controller" + +config USB_DAVINCI + bool "Legacy MUSB DaVinci" + +config USB_OMAP3 + bool "Legacy MUSB OMAP3 / OMAP4" + depends on ARCH_OMAP2PLUS + +config USB_DA8XX + bool "Legacy MUSB DA8xx/OMAP-L1x" + depends on ARCH_DAVINCI + +config USB_AM35X + bool"Legacy MUSB AM35x" + depends on ARCH_OMAP2PLUS && !USB_OMAP3 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 400a06eeb2..16212ef9fb 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -72,8 +72,6 @@ * Enable CONFIG_USB_MUSB_HCD for Host functionalities MSC, keyboard * Enable CONFIG_USB_MUSB_UDC for Device functionalities. */ -#define CONFIG_USB_AM35X 1 -#define CONFIG_USB_MUSB_HCD 1 #ifdef CONFIG_USB_AM35X diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index dc1b6b5721..8abe870e9f 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -72,8 +72,6 @@ 115200} /* USB */ -#define CONFIG_USB_OMAP3 -#define CONFIG_USB_MUSB_UDC #define CONFIG_TWL4030_USB /* USB device configuration */ diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index f263e62041..fe8b39a65b 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -80,7 +80,6 @@ /* USB */ #ifndef CONFIG_USB_MUSB_AM35X -#define CONFIG_USB_OMAP3 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147 #endif /* CONFIG_USB_MUSB_AM35X */ diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index 9dbd7a2331..a75932f20f 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -15,8 +15,6 @@ #include "tam3517-common.h" -#undef CONFIG_USB_OMAP3 - /* Our console port is port3 */ #undef CONFIG_CONS_INDEX #undef CONFIG_SYS_NS16550_COM1 diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index b7fe7341e4..1c02a8ca31 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -83,9 +83,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } /* USB */ -#define CONFIG_USB_MUSB_UDC -#define CONFIG_USB_MUSB_HCD -#define CONFIG_USB_OMAP3 #define CONFIG_TWL4030_USB /* USB device configuration */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index f5e7e3b76a..ba67e33c38 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -74,7 +74,6 @@ #endif /* CONFIG_NAND */ /* MUSB */ -#define CONFIG_USB_OMAP3 /* USB EHCI */ #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 91b3a23d29..9b815e03f7 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -42,8 +42,6 @@ #define GPIO_IGEP00X0_REVISION_DETECTION 129 /* USB */ -#define CONFIG_USB_MUSB_UDC 1 -#define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 /* USB device configuration */ diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 1e4e42a5a0..a4b29f1812 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -49,8 +49,6 @@ /* Hardware drivers */ -#define CONFIG_USB_OMAP3 - /* I2C */ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */ diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index d1ff48d39f..e5e4bc4c8e 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -35,8 +35,6 @@ */ /* USB */ -#define CONFIG_USB_MUSB_UDC 1 -#define CONFIG_USB_OMAP3 1 #define CONFIG_TWL4030_USB 1 /* USB device configuration */ diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 91b2132455..844a9e55b3 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -61,8 +61,6 @@ #endif /* USB */ -#define CONFIG_USB_MUSB_UDC 1 -#define CONFIG_USB_OMAP3 1 /* USB device configuration */ #define CONFIG_USB_DEVICE 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ca69a71fff..d2b4184a1e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4817,7 +4817,6 @@ CONFIG_USBD_VENDORID CONFIG_USBID_ADDR CONFIG_USBNET_DEV_ADDR CONFIG_USBTTY -CONFIG_USB_AM35X CONFIG_USB_ATMEL CONFIG_USB_ATMEL_CLK_SEL_PLLB CONFIG_USB_ATMEL_CLK_SEL_UPLL @@ -4878,16 +4877,13 @@ CONFIG_USB_INVENTRA_DMA CONFIG_USB_ISP1301_I2C_ADDR CONFIG_USB_MAX_CONTROLLER_COUNT CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT -CONFIG_USB_MUSB_HCD CONFIG_USB_MUSB_TIMEOUT CONFIG_USB_MUSB_TUSB6010 -CONFIG_USB_MUSB_UDC CONFIG_USB_OHCI CONFIG_USB_OHCI_EP93XX CONFIG_USB_OHCI_LPC32XX CONFIG_USB_OHCI_NEW CONFIG_USB_OHCI_SUNXI -CONFIG_USB_OMAP3 CONFIG_USB_OTG CONFIG_USB_OTG_BLACKLIST_HUB CONFIG_USB_PHY_CFG_BASE -- GitLab