Skip to contentSkip to conversation

Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig

PATCH New Adam Ford 2 participants 3 messages Dec 28, 2017

Subsystems (2)
lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig

This converts the following to Kconfig:
CONFIG_USB_MUSB_OMAP2PLUS
CONFIG_USB_MUSB_PIO_ONLY

configs/am335x_baltos_defconfig +1 -0
index 0ef9f42..bb7c31b 100644
@@ -55,6 +55,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_defconfig +1 -0
index 55e0ebd..ccb5431 100644
@@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_vboot_defconfig +1 -0
index fe5b9e7..dc584d8 100644
@@ -42,6 +42,7 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_defconfig +1 -0
index 9c97009..9e860ce 100644
@@ -47,6 +47,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_nor_defconfig +1 -0
index 1813003..cfdd259 100644
@@ -34,6 +34,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_norboot_defconfig +1 -0
index b38d7f6..862f238 100644
@@ -30,6 +30,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_spiboot_defconfig +1 -0
index 7a20576..2afdc05 100644
@@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_usbspl_defconfig +1 -0
index 1e80017..cfdb00c 100644
@@ -38,6 +38,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_defconfig +1 -0
index 78cf48d..acb8362 100644
@@ -53,6 +53,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_uart_defconfig +1 -0
index 09aab29..98f770d 100644
@@ -53,6 +53,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
configs/am3517_evm_defconfig +1 -0
index e6c17c7..ace7ff2 100644
@@ -40,5 +40,6 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 # CONFIG_FAT_WRITE is not set
 CONFIG_BCH=y
configs/birdland_bav335a_defconfig +1 -0
index 61518f5..be02764 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/birdland_bav335b_defconfig +1 -0
index c7360c3..311d175 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/brppt1_mmc_defconfig +1 -0
index c41a7b4..a3303b9 100644
@@ -55,6 +55,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brppt1_nand_defconfig +1 -0
index 3844413..1fcc0e2 100644
@@ -57,6 +57,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brppt1_spi_defconfig +1 -0
index 25d8837..7d5d641 100644
@@ -65,6 +65,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brxre1_defconfig +1 -0
index 0c2d7ed..9271e46 100644
@@ -56,6 +56,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/chiliboard_defconfig +1 -0
index bc69df0..b0ed5a5 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_FAT_WRITE=y
 CONFIG_LZO=y
configs/cm_t3517_defconfig +1 -0
index 819a95b..b821daa 100644
@@ -48,6 +48,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
configs/draco_defconfig +1 -0
index be0105f..f99cae5 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/etamin_defconfig +1 -0
index 8e8ef6f..ab55c4e 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/kc1_defconfig +2 -0
index 0ddf64c..b06912a 100644
@@ -38,6 +38,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_beagle_defconfig +2 -0
index ad72079..b360cc9 100644
@@ -48,6 +48,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/omap3_evm_defconfig +2 -0
index 5103e9f..8ff59c7 100644
@@ -54,6 +54,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_logic_defconfig +2 -0
index 5590b9a..2908dc5 100644
@@ -51,6 +51,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/pcm051_rev1_defconfig +1 -0
index 273fc30..3a89ce4 100644
@@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETHER=y
configs/pcm051_rev3_defconfig +1 -0
index f1ddaa6..cea3145 100644
@@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETHER=y
configs/pengwyn_defconfig +1 -0
index 4bb6245..89d236d 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_FAT_WRITE=y
configs/pxm2_defconfig +1 -0
index 0ec1591..48b4d2c 100644
@@ -67,6 +67,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rastaban_defconfig +1 -0
index 5ef1740..b57592b 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rut_defconfig +1 -0
index 1711fc7..02e9732 100644
@@ -68,6 +68,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/sniper_defconfig +2 -0
index a8a592f..f6cbb69 100644
@@ -39,6 +39,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/thuban_defconfig +1 -0
index 2575c00..011f4b0 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
drivers/usb/musb-new/Kconfig +10 -0
index caba42c..2bdab5c 100644
@@ -23,6 +23,16 @@ config USB_MUSB_TI
 	  speed USB controller based on the Mentor Graphics
 	  silicon IP.
 
+config USB_MUSB_OMAP2PLUS
+	tristate "OMAP2430 and onwards"
+	depends on ARCH_OMAP2PLUS
+
+config USB_MUSB_PIO_ONLY
+	bool 'Disable DMA (always use PIO)'
+	help
+	  All data is copied between memory and FIFO by the CPU.
+	  DMA controllers are ignored.
+
 if USB_MUSB_HOST || USB_MUSB_GADGET
 
 config USB_MUSB_PIC32
include/configs/am335x_evm.h +0 -1
index 856c546..846f5c9 100644
@@ -229,7 +229,6 @@
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
include/configs/am3517_evm.h +0 -1
index 33ed85e..d9d2462 100644
@@ -43,7 +43,6 @@
  * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
  */
 #define CONFIG_USB_MUSB_AM35X
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 #ifdef CONFIG_USB_MUSB_AM35X
 
include/configs/baltos.h +0 -1
index 3fc9e2f..e438105 100644
@@ -273,7 +273,6 @@
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
include/configs/bav335x.h +0 -1
index 8917bbe..ab0082e 100644
@@ -395,7 +395,6 @@ DEFAULT_LINUX_BOOT_ENV \
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
include/configs/brppt1.h +0 -1
index 2dadcae..0d80c6d 100644
@@ -211,7 +211,6 @@ MMCARGS
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
include/configs/brxre1.h +0 -1
index 8f92d7a..7125c86 100644
@@ -81,7 +81,6 @@ BUR_COMMON_ENV \
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
include/configs/chiliboard.h +0 -1
index 92fd235..835b9dc 100644
@@ -154,7 +154,6 @@
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
include/configs/cm_t3517.h +0 -2
index a472b9f..1737f88 100644
@@ -84,8 +84,6 @@
 #define CONFIG_USB_OMAP3
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
-#else /* !CONFIG_USB_MUSB_AM35X */
-#define CONFIG_USB_MUSB_PIO_ONLY
 #endif /* CONFIG_USB_MUSB_AM35X */
 
 /* commands to include */
include/configs/kc1.h +0 -3
index 8d8dc26..94c3d0a 100644
@@ -115,9 +115,6 @@
  * USB gadget
  */
 
-#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_MUSB_OMAP2PLUS
-
 /*
  * Environment
  */
include/configs/omap3_beagle.h +0 -2
index 394bfb7..f21a843 100644
@@ -43,8 +43,6 @@
 #define CONFIG_SYS_I2C_NOPROBES		{{0x0, 0x0}}
 
 /* USB */
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_TWL4030_USB		1
 
 /* USB EHCI */
include/configs/omap3_evm.h +0 -2
index 42f2153..0eefb84 100644
@@ -77,8 +77,6 @@
 
 /* MUSB */
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /* USB EHCI */
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION  1
include/configs/omap3_logic.h +0 -2
index b095814..1e4e42a 100644
@@ -55,8 +55,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM AT24C64      */
 
 /* USB */
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /* TWL4030 */
 #define CONFIG_TWL4030_USB
include/configs/pcm051.h +0 -1
index 79f3f48..9482501 100644
@@ -127,7 +127,6 @@
  * USB configuration
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
include/configs/pengwyn.h +0 -1
index 8afd64e..d1ddb15 100644
@@ -163,7 +163,6 @@
  * add mass storage support.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
include/configs/pic32mzdask.h +0 -1
index 97636fe..0bb5126 100644
@@ -80,7 +80,6 @@
 /*--------------------------------------------------
  * USB Configuration
  */
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /*-----------------------------------------------------------------------
  * File System Configuration
include/configs/siemens-am33x-common.h +0 -1
index 78708a2..5da5a08 100644
@@ -169,7 +169,6 @@
  * USB configuration
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
 #define CONFIG_AM335X_USB0
include/configs/sniper.h +0 -2
index 5809942..09b5a73 100644
@@ -113,8 +113,6 @@
  * USB gadget
  */
 
-#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_TWL4030_USB
 
 /*
include/configs/sunxi-common.h +0 -4
index 3855c56..582aba2 100644
@@ -302,10 +302,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 #endif
 
-#ifdef CONFIG_USB_MUSB_SUNXI
-#define CONFIG_USB_MUSB_PIO_ONLY
-#endif
-
 #ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
scripts/config_whitelist.txt +0 -2
index 43a4ff0..97d27fc 100644
@@ -4947,8 +4947,6 @@ CONFIG_USB_MUSB_AM35X
 CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 CONFIG_USB_MUSB_DSPS
 CONFIG_USB_MUSB_HCD
-CONFIG_USB_MUSB_OMAP2PLUS
-CONFIG_USB_MUSB_PIO_ONLY
 CONFIG_USB_MUSB_TIMEOUT
 CONFIG_USB_MUSB_TUSB6010
 CONFIG_USB_MUSB_UDC
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig

Hi,

Quoted 3 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_USB_MUSB_OMAP2PLUS
CONFIG_USB_MUSB_PIO_ONLY

Thanks for the continued effort on omap platforms!

While you're at it, you might want to do the same with:
* CONFIG_USB_MUSB_AM35X
* CONFIG_USB_MUSB_DSPS

that are currently not in Kconfig either.

It looks like there is no controller out there that doesn't use CONFIG_USB_MUSB_PIO_ONLY, so I think it makes little sense to enable it in each defconfig.

IMO, it should be selected by default for each of the supported controllers:
* CONFIG_USB_MUSB_PIC32
* CONFIG_USB_MUSB_OMAP2PLUS
* CONFIG_USB_MUSB_AM35X
* CONFIG_USB_MUSB_DSPS
* CONFIG_USB_MUSB_SUNXI

What do you think?

Also, here is a list of config files for each controller:
CONFIG_USB_MUSB_PIC32:
include/configs/pic32mzdask.h

CONFIG_USB_MUSB_OMAP2PLUS:
include/configs/kc1.h
include/configs/omap3_beagle.h
include/configs/omap3_evm.h
include/configs/omap3_logic.h
include/configs/sniper.h

CONFIG_USB_MUSB_AM35X:
include/configs/am3517_evm.h
include/configs/cm_t3517.h

CONFIG_USB_MUSB_DSPS:
include/configs/am335x_evm.h
include/configs/baltos.h
include/configs/bav335x.h
include/configs/brppt1.h
include/configs/brxre1.h
include/configs/chiliboard.h
include/configs/pcm051.h
include/configs/pengwyn.h
include/configs/siemens-am33x-common.h

CONFIG_USB_MUSB_SUNXI:
include/configs/sunxi-common.h

Quoted 695 lines
configs/am335x_baltos_defconfig +1 -0
index 0ef9f42..bb7c31b 100644
@@ -55,6 +55,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_defconfig +1 -0
index 55e0ebd..ccb5431 100644
@@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_vboot_defconfig +1 -0
index fe5b9e7..dc584d8 100644
@@ -42,6 +42,7 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_defconfig +1 -0
index 9c97009..9e860ce 100644
@@ -47,6 +47,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_nor_defconfig +1 -0
index 1813003..cfdd259 100644
@@ -34,6 +34,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_norboot_defconfig +1 -0
index b38d7f6..862f238 100644
@@ -30,6 +30,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_spiboot_defconfig +1 -0
index 7a20576..2afdc05 100644
@@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_usbspl_defconfig +1 -0
index 1e80017..cfdb00c 100644
@@ -38,6 +38,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_defconfig +1 -0
index 78cf48d..acb8362 100644
@@ -53,6 +53,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_uart_defconfig +1 -0
index 09aab29..98f770d 100644
@@ -53,6 +53,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
configs/am3517_evm_defconfig +1 -0
index e6c17c7..ace7ff2 100644
@@ -40,5 +40,6 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 # CONFIG_FAT_WRITE is not set
 CONFIG_BCH=y
configs/birdland_bav335a_defconfig +1 -0
index 61518f5..be02764 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/birdland_bav335b_defconfig +1 -0
index c7360c3..311d175 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/brppt1_mmc_defconfig +1 -0
index c41a7b4..a3303b9 100644
@@ -55,6 +55,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brppt1_nand_defconfig +1 -0
index 3844413..1fcc0e2 100644
@@ -57,6 +57,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brppt1_spi_defconfig +1 -0
index 25d8837..7d5d641 100644
@@ -65,6 +65,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brxre1_defconfig +1 -0
index 0c2d7ed..9271e46 100644
@@ -56,6 +56,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/chiliboard_defconfig +1 -0
index bc69df0..b0ed5a5 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_FAT_WRITE=y
 CONFIG_LZO=y
configs/cm_t3517_defconfig +1 -0
index 819a95b..b821daa 100644
@@ -48,6 +48,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
configs/draco_defconfig +1 -0
index be0105f..f99cae5 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/etamin_defconfig +1 -0
index 8e8ef6f..ab55c4e 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/kc1_defconfig +2 -0
index 0ddf64c..b06912a 100644
@@ -38,6 +38,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_beagle_defconfig +2 -0
index ad72079..b360cc9 100644
@@ -48,6 +48,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/omap3_evm_defconfig +2 -0
index 5103e9f..8ff59c7 100644
@@ -54,6 +54,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_logic_defconfig +2 -0
index 5590b9a..2908dc5 100644
@@ -51,6 +51,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/pcm051_rev1_defconfig +1 -0
index 273fc30..3a89ce4 100644
@@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETHER=y
configs/pcm051_rev3_defconfig +1 -0
index f1ddaa6..cea3145 100644
@@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETHER=y
configs/pengwyn_defconfig +1 -0
index 4bb6245..89d236d 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_FAT_WRITE=y
configs/pxm2_defconfig +1 -0
index 0ec1591..48b4d2c 100644
@@ -67,6 +67,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rastaban_defconfig +1 -0
index 5ef1740..b57592b 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rut_defconfig +1 -0
index 1711fc7..02e9732 100644
@@ -68,6 +68,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/sniper_defconfig +2 -0
index a8a592f..f6cbb69 100644
@@ -39,6 +39,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/thuban_defconfig +1 -0
index 2575c00..011f4b0 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
drivers/usb/musb- renamed from drivers/usb/musb-new/Kconfig +0 -0

new/Kconfig
index caba42c..2bdab5c 100644

drivers/usb/musb-new/Kconfig +10 -0
@@ -23,6 +23,16 @@ config USB_MUSB_TI
 	  speed USB controller based on the Mentor Graphics
 	  silicon IP.
 
+config USB_MUSB_OMAP2PLUS
+	tristate "OMAP2430 and onwards"
+	depends on ARCH_OMAP2PLUS
+
+config USB_MUSB_PIO_ONLY
+	bool 'Disable DMA (always use PIO)'
+	help
+	  All data is copied between memory and FIFO by the CPU.
+	  DMA controllers are ignored.
+
 if USB_MUSB_HOST || USB_MUSB_GADGET
 
 config USB_MUSB_PIC32
include/configs/am335x_evm.h +0 -1
index 856c546..846f5c9 100644
@@ -229,7 +229,6 @@
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
include/configs/am3517_evm.h +0 -1
index 33ed85e..d9d2462 100644
@@ -43,7 +43,6 @@
  * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
  */
 #define CONFIG_USB_MUSB_AM35X
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 #ifdef CONFIG_USB_MUSB_AM35X
 
include/configs/baltos.h +0 -1
index 3fc9e2f..e438105 100644
@@ -273,7 +273,6 @@
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
include/configs/bav335x.h +0 -1
index 8917bbe..ab0082e 100644
@@ -395,7 +395,6 @@ DEFAULT_LINUX_BOOT_ENV \
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
include/configs/brppt1.h +0 -1
index 2dadcae..0d80c6d 100644
@@ -211,7 +211,6 @@ MMCARGS
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
include/configs/brxre1.h +0 -1
index 8f92d7a..7125c86 100644
@@ -81,7 +81,6 @@ BUR_COMMON_ENV \
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_HOST
include/configs/chiliboard.h +0 -1
index 92fd235..835b9dc 100644
@@ -154,7 +154,6 @@
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
include/configs/cm_t3517.h +0 -2
index a472b9f..1737f88 100644
@@ -84,8 +84,6 @@
 #define CONFIG_USB_OMAP3
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
-#else /* !CONFIG_USB_MUSB_AM35X */
-#define CONFIG_USB_MUSB_PIO_ONLY
 #endif /* CONFIG_USB_MUSB_AM35X */
 
 /* commands to include */
include/configs/kc1.h +0 -3
index 8d8dc26..94c3d0a 100644
@@ -115,9 +115,6 @@
  * USB gadget
  */
 
-#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_MUSB_OMAP2PLUS
-
 /*
  * Environment
  */
include/configs/omap3_beagle.h +0 -2
index 394bfb7..f21a843 100644
@@ -43,8 +43,6 @@
 #define CONFIG_SYS_I2C_NOPROBES		{{0x0, 0x0}}
 
 /* USB */
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_TWL4030_USB		1
 
 /* USB EHCI */
include/configs/omap3_evm.h +0 -2
index 42f2153..0eefb84 100644
@@ -77,8 +77,6 @@
 
 /* MUSB */
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /* USB EHCI */
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION  1
include/configs/omap3_logic.h +0 -0
index b095814..1e4e42a 100644
@@ -55,8 +55,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50	/* EEPROM

AT24C64 */

/* USB */

include/configs/omap3_logic.h +0 -2
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /* TWL4030 */
 #define CONFIG_TWL4030_USB
include/configs/pcm051.h +0 -1
index 79f3f48..9482501 100644
@@ -127,7 +127,6 @@
  * USB configuration
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
include/configs/pengwyn.h +0 -1
index 8afd64e..d1ddb15 100644
@@ -163,7 +163,6 @@
  * add mass storage support.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
include/configs/pic32mzdask.h +0 -2
index 97636fe..0bb5126 100644
@@ -80,7 +80,6 @@
 /*--------------------------------------------------
  * USB Configuration
  */
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /*-------------------------------------------------------------------
----
  * File System Configuration
include/configs/siemens-am33x-common.h +0 -1
index 78708a2..5da5a08 100644
@@ -169,7 +169,6 @@
  * USB configuration
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
 #define CONFIG_AM335X_USB0
include/configs/sniper.h +0 -2
index 5809942..09b5a73 100644
@@ -113,8 +113,6 @@
  * USB gadget
  */
 
-#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_TWL4030_USB
 
 /*
include/configs/sunxi- renamed from include/configs/sunxi-common.h +0 -0

common.h
index 3855c56..582aba2 100644

include/configs/sunxi-common.h +0 -4
@@ -302,10 +302,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 #endif
 
-#ifdef CONFIG_USB_MUSB_SUNXI
-#define CONFIG_USB_MUSB_PIO_ONLY
-#endif
-
 #ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
scripts/config_whitelist.txt +0 -2
index 43a4ff0..97d27fc 100644
@@ -4947,8 +4947,6 @@ CONFIG_USB_MUSB_AM35X
 CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 CONFIG_USB_MUSB_DSPS
 CONFIG_USB_MUSB_HCD
-CONFIG_USB_MUSB_OMAP2PLUS
-CONFIG_USB_MUSB_PIO_ONLY
 CONFIG_USB_MUSB_TIMEOUT
 CONFIG_USB_MUSB_TUSB6010
 CONFIG_USB_MUSB_UDC
Signature · 14 lines
Paul Kocialkowski,

developer of free digital technology and hardware support.

Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: This is a digitally signed message part
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20171228/76b372e6/attachment.sig>
author
#2 lore raw

PATCH 1/1 Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig

Quoted 13 lines · Paul Kocialkowski

Hi,

Quoted 3 lines · Adam Ford

This converts the following to Kconfig:
CONFIG_USB_MUSB_OMAP2PLUS
CONFIG_USB_MUSB_PIO_ONLY

Thanks for the continued effort on omap platforms!

While you're at it, you might want to do the same with:
* CONFIG_USB_MUSB_AM35X
* CONFIG_USB_MUSB_DSPS

Quoted 5 lines

that are currently not in Kconfig either.

It looks like there is no controller out there that doesn't use CONFIG_USB_MUSB_PIO_ONLY, so I think it makes little sense to enable it in each defconfig.

You're probably right, but I was (selfishly) interested in fixing my board and I don't have the other platforms, so I just copy-pasted (and modified) the description from Linux since my board uses those two settings.

Quoted 10 lines

IMO, it should be selected by default for each of the supported controllers:
* CONFIG_USB_MUSB_PIC32
* CONFIG_USB_MUSB_OMAP2PLUS
* CONFIG_USB_MUSB_AM35X
* CONFIG_USB_MUSB_DSPS
* CONFIG_USB_MUSB_SUNXI

What do you think?

That makes sense. I can 'imply' those settings based on the architecture, so those can be deselected as needed.

Quoted 27 lines

Also, here is a list of config files for each controller:
CONFIG_USB_MUSB_PIC32:
include/configs/pic32mzdask.h

CONFIG_USB_MUSB_OMAP2PLUS:
include/configs/kc1.h
include/configs/omap3_beagle.h
include/configs/omap3_evm.h
include/configs/omap3_logic.h
include/configs/sniper.h

CONFIG_USB_MUSB_AM35X:
include/configs/am3517_evm.h
include/configs/cm_t3517.h

CONFIG_USB_MUSB_DSPS:
include/configs/am335x_evm.h
include/configs/baltos.h
include/configs/bav335x.h
include/configs/brppt1.h
include/configs/brxre1.h
include/configs/chiliboard.h
include/configs/pcm051.h
include/configs/pengwyn.h
include/configs/siemens-am33x-common.h

Quoted 3 lines

CONFIG_USB_MUSB_SUNXI:
include/configs/sunxi-common.h

If there are no objections to the above patch, I'd like to get this approved. I'll submit a subsequent patch when I have some time. (maybe tomorrow or this weekend). In that, I'll add the additional Kconfig options and move the 'imply' setting into their respective architectures. I'll then re-sync all the affected defconfigs which should reduce their size a bit.

Quoted 703 lines
Quoted 687 lines
configs/am335x_baltos_defconfig +1 -0
index 0ef9f42..bb7c31b 100644
@@ -55,6 +55,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_defconfig +1 -0
index 55e0ebd..ccb5431 100644
@@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_vboot_defconfig +1 -0
index fe5b9e7..dc584d8 100644
@@ -42,6 +42,7 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_defconfig +1 -0
index 9c97009..9e860ce 100644
@@ -47,6 +47,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_nor_defconfig +1 -0
index 1813003..cfdd259 100644
@@ -34,6 +34,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_norboot_defconfig +1 -0
index b38d7f6..862f238 100644
@@ -30,6 +30,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_spiboot_defconfig +1 -0
index 7a20576..2afdc05 100644
@@ -32,6 +32,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_usbspl_defconfig +1 -0
index 1e80017..cfdb00c 100644
@@ -38,6 +38,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_defconfig +1 -0
index 78cf48d..acb8362 100644
@@ -53,6 +53,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_uart_defconfig +1 -0
index 09aab29..98f770d 100644
@@ -53,6 +53,7 @@ CONFIG_DM_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_TI=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_DOWNLOAD=y
configs/am3517_evm_defconfig +1 -0
index e6c17c7..ace7ff2 100644
@@ -40,5 +40,6 @@ CONFIG_SPL_NAND_SIMPLE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 # CONFIG_FAT_WRITE is not set
 CONFIG_BCH=y
configs/birdland_bav335a_defconfig +1 -0
index 61518f5..be02764 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/birdland_bav335b_defconfig +1 -0
index c7360c3..311d175 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/brppt1_mmc_defconfig +1 -0
index c41a7b4..a3303b9 100644
@@ -55,6 +55,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brppt1_nand_defconfig +1 -0
index 3844413..1fcc0e2 100644
@@ -57,6 +57,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brppt1_spi_defconfig +1 -0
index 25d8837..7d5d641 100644
@@ -65,6 +65,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/brxre1_defconfig +1 -0
index 0c2d7ed..9271e46 100644
@@ -56,6 +56,7 @@ CONFIG_PHYLIB=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
configs/chiliboard_defconfig +1 -0
index bc69df0..b0ed5a5 100644
@@ -45,6 +45,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_FAT_WRITE=y
 CONFIG_LZO=y
configs/cm_t3517_defconfig +1 -0
index 819a95b..b821daa 100644
@@ -48,6 +48,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
configs/draco_defconfig +1 -0
index be0105f..f99cae5 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/etamin_defconfig +1 -0
index 8e8ef6f..ab55c4e 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/kc1_defconfig +2 -0
index 0ddf64c..b06912a 100644
@@ -38,6 +38,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_beagle_defconfig +2 -0
index ad72079..b360cc9 100644
@@ -48,6 +48,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/omap3_evm_defconfig +2 -0
index 5103e9f..8ff59c7 100644
@@ -54,6 +54,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_logic_defconfig +2 -0
index 5590b9a..2908dc5 100644
@@ -51,6 +51,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/pcm051_rev1_defconfig +1 -0
index 273fc30..3a89ce4 100644
@@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETHER=y
configs/pcm051_rev3_defconfig +1 -0
index f1ddaa6..cea3145 100644
@@ -58,6 +58,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ETHER=y
configs/pengwyn_defconfig +1 -0
index 4bb6245..89d236d 100644
@@ -62,6 +62,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_FAT_WRITE=y
configs/pxm2_defconfig +1 -0
index 0ec1591..48b4d2c 100644
@@ -67,6 +67,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rastaban_defconfig +1 -0
index 5ef1740..b57592b 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rut_defconfig +1 -0
index 1711fc7..02e9732 100644
@@ -68,6 +68,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/sniper_defconfig +2 -0
index a8a592f..f6cbb69 100644
@@ -39,6 +39,8 @@ CONFIG_MMC_OMAP_HS=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_OMAP2PLUS=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/thuban_defconfig +1 -0
index 2575c00..011f4b0 100644
@@ -64,6 +64,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_GADGET=y
+CONFIG_USB_MUSB_PIO_ONLY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
drivers/usb/musb- renamed from drivers/usb/musb-new/Kconfig +0 -0

new/Kconfig
index caba42c..2bdab5c 100644

drivers/usb/musb-new/Kconfig +10 -0
@@ -23,6 +23,16 @@ config USB_MUSB_TI
        speed USB controller based on the Mentor Graphics
        silicon IP.
 
+config USB_MUSB_OMAP2PLUS
+     tristate "OMAP2430 and onwards"
+     depends on ARCH_OMAP2PLUS
+
+config USB_MUSB_PIO_ONLY
+     bool 'Disable DMA (always use PIO)'
+     help
+       All data is copied between memory and FIFO by the CPU.
+       DMA controllers are ignored.
+
 if USB_MUSB_HOST || USB_MUSB_GADGET
 
 config USB_MUSB_PIC32
include/configs/am335x_evm.h +0 -1
index 856c546..846f5c9 100644
@@ -229,7 +229,6 @@
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_PERIPHERAL
include/configs/am3517_evm.h +0 -1
index 33ed85e..d9d2462 100644
@@ -43,7 +43,6 @@
  * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
  */
 #define CONFIG_USB_MUSB_AM35X
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 #ifdef CONFIG_USB_MUSB_AM35X
 
include/configs/baltos.h +0 -1
index 3fc9e2f..e438105 100644
@@ -273,7 +273,6 @@
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_HOST
include/configs/bav335x.h +0 -1
index 8917bbe..ab0082e 100644
@@ -395,7 +395,6 @@ DEFAULT_LINUX_BOOT_ENV \
  * and DFU.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_PERIPHERAL
include/configs/brppt1.h +0 -1
index 2dadcae..0d80c6d 100644
@@ -211,7 +211,6 @@ MMCARGS
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_HOST
include/configs/brxre1.h +0 -1
index 8f92d7a..7125c86 100644
@@ -81,7 +81,6 @@ BUR_COMMON_ENV \
 
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_HOST
include/configs/chiliboard.h +0 -1
index 92fd235..835b9dc 100644
@@ -154,7 +154,6 @@
 /* USB configuration */
 #define CONFIG_USB_MUSB_DSPS
 #define CONFIG_ARCH_MISC_INIT
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB1
 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
include/configs/cm_t3517.h +0 -2
index a472b9f..1737f88 100644
@@ -84,8 +84,6 @@
 #define CONFIG_USB_OMAP3
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
-#else /* !CONFIG_USB_MUSB_AM35X */
-#define CONFIG_USB_MUSB_PIO_ONLY
 #endif /* CONFIG_USB_MUSB_AM35X */
 
 /* commands to include */
include/configs/kc1.h +0 -3
index 8d8dc26..94c3d0a 100644
@@ -115,9 +115,6 @@
  * USB gadget
  */
 
-#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_MUSB_OMAP2PLUS
-
 /*
  * Environment
  */
include/configs/omap3_beagle.h +0 -2
index 394bfb7..f21a843 100644
@@ -43,8 +43,6 @@
 #define CONFIG_SYS_I2C_NOPROBES              {{0x0, 0x0}}
 
 /* USB */
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_TWL4030_USB           1
 
 /* USB EHCI */
include/configs/omap3_evm.h +0 -2
index 42f2153..0eefb84 100644
@@ -77,8 +77,6 @@
 
 /* MUSB */
 #define CONFIG_USB_OMAP3
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /* USB EHCI */
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION  1
include/configs/omap3_logic.h +0 -0
index b095814..1e4e42a 100644
@@ -55,8 +55,6 @@
 #define CONFIG_SYS_I2C_EEPROM_ADDR   0x50    /* EEPROM

AT24C64 */

/* USB */

include/configs/omap3_logic.h +0 -2
-#define CONFIG_USB_MUSB_OMAP2PLUS
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /* TWL4030 */
 #define CONFIG_TWL4030_USB
include/configs/pcm051.h +0 -1
index 79f3f48..9482501 100644
@@ -127,7 +127,6 @@
  * USB configuration
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_PERIPHERAL
 #define CONFIG_AM335X_USB1
include/configs/pengwyn.h +0 -1
index 8afd64e..d1ddb15 100644
@@ -163,7 +163,6 @@
  * add mass storage support.
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 #define CONFIG_AM335X_USB0
 #define CONFIG_AM335X_USB0_MODE      MUSB_PERIPHERAL
include/configs/pic32mzdask.h +0 -2
index 97636fe..0bb5126 100644
@@ -80,7 +80,6 @@
 /*--------------------------------------------------
  * USB Configuration
  */
-#define CONFIG_USB_MUSB_PIO_ONLY
 
 /*-------------------------------------------------------------------
----
  * File System Configuration
include/configs/siemens-am33x-common.h +0 -1
index 78708a2..5da5a08 100644
@@ -169,7 +169,6 @@
  * USB configuration
  */
 #define CONFIG_USB_MUSB_DSPS
-#define CONFIG_USB_MUSB_PIO_ONLY
 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 
 #define CONFIG_AM335X_USB0
include/configs/sniper.h +0 -2
index 5809942..09b5a73 100644
@@ -113,8 +113,6 @@
  * USB gadget
  */
 
-#define CONFIG_USB_MUSB_PIO_ONLY
-#define CONFIG_USB_MUSB_OMAP2PLUS
 #define CONFIG_TWL4030_USB
 
 /*
include/configs/sunxi- renamed from include/configs/sunxi-common.h +0 -0

common.h
index 3855c56..582aba2 100644

include/configs/sunxi-common.h +0 -4
@@ -302,10 +302,6 @@ extern int soft_i2c_gpio_scl;
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
 #endif
 
-#ifdef CONFIG_USB_MUSB_SUNXI
-#define CONFIG_USB_MUSB_PIO_ONLY
-#endif
-
 #ifdef CONFIG_USB_MUSB_GADGET
 #define CONFIG_USB_FUNCTION_MASS_STORAGE
 #endif
scripts/config_whitelist.txt +0 -0
index 43a4ff0..97d27fc 100644

scripts/config_whitelist.txt CONFIG_USB_MUSB_AM35X · line 4952

Quoted 8 lines
scripts/config_whitelist.txt +0 -2
@@ -4947,8 +4947,6 @@ CONFIG_USB_MUSB_AM35X
 CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
 CONFIG_USB_MUSB_DSPS
 CONFIG_USB_MUSB_HCD
-CONFIG_USB_MUSB_OMAP2PLUS
-CONFIG_USB_MUSB_PIO_ONLY
 CONFIG_USB_MUSB_TIMEOUT
 CONFIG_USB_MUSB_TUSB6010
 CONFIG_USB_MUSB_UDC

--
Paul Kocialkowski,

developer of free digital technology and hardware support.

Website: https://www.paulk.fr/
Coding blog: https://code.paulk.fr/
Git repositories: https://git.paulk.fr/ https://git.code.paulk.fr/