Message ID | 1514427002-28664-1-git-send-email-aford173@gmail.com |
---|---|
State | Superseded |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot] Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig | expand |
Hi, Le mercredi 27 décembre 2017 à 20:09 -0600, Adam Ford a écrit : > 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 > Signed-off-by: Adam Ford <aford173@gmail.com> > > diff --git a/configs/am335x_baltos_defconfig > b/configs/am335x_baltos_defconfig > index 0ef9f42..bb7c31b 100644 > --- a/configs/am335x_baltos_defconfig > +++ b/configs/am335x_baltos_defconfig > @@ -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" > diff --git a/configs/am335x_boneblack_defconfig > b/configs/am335x_boneblack_defconfig > index 55e0ebd..ccb5431 100644 > --- a/configs/am335x_boneblack_defconfig > +++ b/configs/am335x_boneblack_defconfig > @@ -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" > diff --git a/configs/am335x_boneblack_vboot_defconfig > b/configs/am335x_boneblack_vboot_defconfig > index fe5b9e7..dc584d8 100644 > --- a/configs/am335x_boneblack_vboot_defconfig > +++ b/configs/am335x_boneblack_vboot_defconfig > @@ -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" > diff --git a/configs/am335x_evm_defconfig > b/configs/am335x_evm_defconfig > index 9c97009..9e860ce 100644 > --- a/configs/am335x_evm_defconfig > +++ b/configs/am335x_evm_defconfig > @@ -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" > diff --git a/configs/am335x_evm_nor_defconfig > b/configs/am335x_evm_nor_defconfig > index 1813003..cfdd259 100644 > --- a/configs/am335x_evm_nor_defconfig > +++ b/configs/am335x_evm_nor_defconfig > @@ -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" > diff --git a/configs/am335x_evm_norboot_defconfig > b/configs/am335x_evm_norboot_defconfig > index b38d7f6..862f238 100644 > --- a/configs/am335x_evm_norboot_defconfig > +++ b/configs/am335x_evm_norboot_defconfig > @@ -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" > diff --git a/configs/am335x_evm_spiboot_defconfig > b/configs/am335x_evm_spiboot_defconfig > index 7a20576..2afdc05 100644 > --- a/configs/am335x_evm_spiboot_defconfig > +++ b/configs/am335x_evm_spiboot_defconfig > @@ -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" > diff --git a/configs/am335x_evm_usbspl_defconfig > b/configs/am335x_evm_usbspl_defconfig > index 1e80017..cfdb00c 100644 > --- a/configs/am335x_evm_usbspl_defconfig > +++ b/configs/am335x_evm_usbspl_defconfig > @@ -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" > diff --git a/configs/am335x_hs_evm_defconfig > b/configs/am335x_hs_evm_defconfig > index 78cf48d..acb8362 100644 > --- a/configs/am335x_hs_evm_defconfig > +++ b/configs/am335x_hs_evm_defconfig > @@ -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" > diff --git a/configs/am335x_hs_evm_uart_defconfig > b/configs/am335x_hs_evm_uart_defconfig > index 09aab29..98f770d 100644 > --- a/configs/am335x_hs_evm_uart_defconfig > +++ b/configs/am335x_hs_evm_uart_defconfig > @@ -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 > diff --git a/configs/am3517_evm_defconfig > b/configs/am3517_evm_defconfig > index e6c17c7..ace7ff2 100644 > --- a/configs/am3517_evm_defconfig > +++ b/configs/am3517_evm_defconfig > @@ -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 > diff --git a/configs/birdland_bav335a_defconfig > b/configs/birdland_bav335a_defconfig > index 61518f5..be02764 100644 > --- a/configs/birdland_bav335a_defconfig > +++ b/configs/birdland_bav335a_defconfig > @@ -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" > diff --git a/configs/birdland_bav335b_defconfig > b/configs/birdland_bav335b_defconfig > index c7360c3..311d175 100644 > --- a/configs/birdland_bav335b_defconfig > +++ b/configs/birdland_bav335b_defconfig > @@ -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" > diff --git a/configs/brppt1_mmc_defconfig > b/configs/brppt1_mmc_defconfig > index c41a7b4..a3303b9 100644 > --- a/configs/brppt1_mmc_defconfig > +++ b/configs/brppt1_mmc_defconfig > @@ -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 > diff --git a/configs/brppt1_nand_defconfig > b/configs/brppt1_nand_defconfig > index 3844413..1fcc0e2 100644 > --- a/configs/brppt1_nand_defconfig > +++ b/configs/brppt1_nand_defconfig > @@ -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 > diff --git a/configs/brppt1_spi_defconfig > b/configs/brppt1_spi_defconfig > index 25d8837..7d5d641 100644 > --- a/configs/brppt1_spi_defconfig > +++ b/configs/brppt1_spi_defconfig > @@ -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 > diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig > index 0c2d7ed..9271e46 100644 > --- a/configs/brxre1_defconfig > +++ b/configs/brxre1_defconfig > @@ -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 > diff --git a/configs/chiliboard_defconfig > b/configs/chiliboard_defconfig > index bc69df0..b0ed5a5 100644 > --- a/configs/chiliboard_defconfig > +++ b/configs/chiliboard_defconfig > @@ -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 > diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig > index 819a95b..b821daa 100644 > --- a/configs/cm_t3517_defconfig > +++ b/configs/cm_t3517_defconfig > @@ -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 > diff --git a/configs/draco_defconfig b/configs/draco_defconfig > index be0105f..f99cae5 100644 > --- a/configs/draco_defconfig > +++ b/configs/draco_defconfig > @@ -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" > diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig > index 8e8ef6f..ab55c4e 100644 > --- a/configs/etamin_defconfig > +++ b/configs/etamin_defconfig > @@ -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" > diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig > index 0ddf64c..b06912a 100644 > --- a/configs/kc1_defconfig > +++ b/configs/kc1_defconfig > @@ -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 > diff --git a/configs/omap3_beagle_defconfig > b/configs/omap3_beagle_defconfig > index ad72079..b360cc9 100644 > --- a/configs/omap3_beagle_defconfig > +++ b/configs/omap3_beagle_defconfig > @@ -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" > diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig > index 5103e9f..8ff59c7 100644 > --- a/configs/omap3_evm_defconfig > +++ b/configs/omap3_evm_defconfig > @@ -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 > diff --git a/configs/omap3_logic_defconfig > b/configs/omap3_logic_defconfig > index 5590b9a..2908dc5 100644 > --- a/configs/omap3_logic_defconfig > +++ b/configs/omap3_logic_defconfig > @@ -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" > diff --git a/configs/pcm051_rev1_defconfig > b/configs/pcm051_rev1_defconfig > index 273fc30..3a89ce4 100644 > --- a/configs/pcm051_rev1_defconfig > +++ b/configs/pcm051_rev1_defconfig > @@ -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 > diff --git a/configs/pcm051_rev3_defconfig > b/configs/pcm051_rev3_defconfig > index f1ddaa6..cea3145 100644 > --- a/configs/pcm051_rev3_defconfig > +++ b/configs/pcm051_rev3_defconfig > @@ -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 > diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig > index 4bb6245..89d236d 100644 > --- a/configs/pengwyn_defconfig > +++ b/configs/pengwyn_defconfig > @@ -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 > diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig > index 0ec1591..48b4d2c 100644 > --- a/configs/pxm2_defconfig > +++ b/configs/pxm2_defconfig > @@ -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" > diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig > index 5ef1740..b57592b 100644 > --- a/configs/rastaban_defconfig > +++ b/configs/rastaban_defconfig > @@ -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" > diff --git a/configs/rut_defconfig b/configs/rut_defconfig > index 1711fc7..02e9732 100644 > --- a/configs/rut_defconfig > +++ b/configs/rut_defconfig > @@ -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" > diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig > index a8a592f..f6cbb69 100644 > --- a/configs/sniper_defconfig > +++ b/configs/sniper_defconfig > @@ -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 > diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig > index 2575c00..011f4b0 100644 > --- a/configs/thuban_defconfig > +++ b/configs/thuban_defconfig > @@ -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" > diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb- > new/Kconfig > index caba42c..2bdab5c 100644 > --- a/drivers/usb/musb-new/Kconfig > +++ b/drivers/usb/musb-new/Kconfig > @@ -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 > diff --git a/include/configs/am335x_evm.h > b/include/configs/am335x_evm.h > index 856c546..846f5c9 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -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 > diff --git a/include/configs/am3517_evm.h > b/include/configs/am3517_evm.h > index 33ed85e..d9d2462 100644 > --- a/include/configs/am3517_evm.h > +++ b/include/configs/am3517_evm.h > @@ -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 > > diff --git a/include/configs/baltos.h b/include/configs/baltos.h > index 3fc9e2f..e438105 100644 > --- a/include/configs/baltos.h > +++ b/include/configs/baltos.h > @@ -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 > diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h > index 8917bbe..ab0082e 100644 > --- a/include/configs/bav335x.h > +++ b/include/configs/bav335x.h > @@ -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 > diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h > index 2dadcae..0d80c6d 100644 > --- a/include/configs/brppt1.h > +++ b/include/configs/brppt1.h > @@ -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 > diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h > index 8f92d7a..7125c86 100644 > --- a/include/configs/brxre1.h > +++ b/include/configs/brxre1.h > @@ -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 > diff --git a/include/configs/chiliboard.h > b/include/configs/chiliboard.h > index 92fd235..835b9dc 100644 > --- a/include/configs/chiliboard.h > +++ b/include/configs/chiliboard.h > @@ -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 > diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h > index a472b9f..1737f88 100644 > --- a/include/configs/cm_t3517.h > +++ b/include/configs/cm_t3517.h > @@ -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 */ > diff --git a/include/configs/kc1.h b/include/configs/kc1.h > index 8d8dc26..94c3d0a 100644 > --- a/include/configs/kc1.h > +++ b/include/configs/kc1.h > @@ -115,9 +115,6 @@ > * USB gadget > */ > > -#define CONFIG_USB_MUSB_PIO_ONLY > -#define CONFIG_USB_MUSB_OMAP2PLUS > - > /* > * Environment > */ > diff --git a/include/configs/omap3_beagle.h > b/include/configs/omap3_beagle.h > index 394bfb7..f21a843 100644 > --- a/include/configs/omap3_beagle.h > +++ b/include/configs/omap3_beagle.h > @@ -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 */ > diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h > index 42f2153..0eefb84 100644 > --- a/include/configs/omap3_evm.h > +++ b/include/configs/omap3_evm.h > @@ -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 > diff --git a/include/configs/omap3_logic.h > b/include/configs/omap3_logic.h > index b095814..1e4e42a 100644 > --- a/include/configs/omap3_logic.h > +++ b/include/configs/omap3_logic.h > @@ -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 > diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h > index 79f3f48..9482501 100644 > --- a/include/configs/pcm051.h > +++ b/include/configs/pcm051.h > @@ -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 > diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h > index 8afd64e..d1ddb15 100644 > --- a/include/configs/pengwyn.h > +++ b/include/configs/pengwyn.h > @@ -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 > diff --git a/include/configs/pic32mzdask.h > b/include/configs/pic32mzdask.h > index 97636fe..0bb5126 100644 > --- a/include/configs/pic32mzdask.h > +++ b/include/configs/pic32mzdask.h > @@ -80,7 +80,6 @@ > /*-------------------------------------------------- > * USB Configuration > */ > -#define CONFIG_USB_MUSB_PIO_ONLY > > /*------------------------------------------------------------------- > ---- > * File System Configuration > diff --git a/include/configs/siemens-am33x-common.h > b/include/configs/siemens-am33x-common.h > index 78708a2..5da5a08 100644 > --- a/include/configs/siemens-am33x-common.h > +++ b/include/configs/siemens-am33x-common.h > @@ -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 > diff --git a/include/configs/sniper.h b/include/configs/sniper.h > index 5809942..09b5a73 100644 > --- a/include/configs/sniper.h > +++ b/include/configs/sniper.h > @@ -113,8 +113,6 @@ > * USB gadget > */ > > -#define CONFIG_USB_MUSB_PIO_ONLY > -#define CONFIG_USB_MUSB_OMAP2PLUS > #define CONFIG_TWL4030_USB > > /* > diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi- > common.h > index 3855c56..582aba2 100644 > --- a/include/configs/sunxi-common.h > +++ b/include/configs/sunxi-common.h > @@ -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 > diff --git a/scripts/config_whitelist.txt > b/scripts/config_whitelist.txt > index 43a4ff0..97d27fc 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -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
On Wed, Dec 27, 2017 at 10:12 PM, Paul Kocialkowski <contact@paulk.fr> wrote: > Hi, > > Le mercredi 27 décembre 2017 à 20:09 -0600, Adam Ford a écrit : >> 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. 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. > > 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. > > 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 > 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. >> Signed-off-by: Adam Ford <aford173@gmail.com> >> >> diff --git a/configs/am335x_baltos_defconfig >> b/configs/am335x_baltos_defconfig >> index 0ef9f42..bb7c31b 100644 >> --- a/configs/am335x_baltos_defconfig >> +++ b/configs/am335x_baltos_defconfig >> @@ -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" >> diff --git a/configs/am335x_boneblack_defconfig >> b/configs/am335x_boneblack_defconfig >> index 55e0ebd..ccb5431 100644 >> --- a/configs/am335x_boneblack_defconfig >> +++ b/configs/am335x_boneblack_defconfig >> @@ -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" >> diff --git a/configs/am335x_boneblack_vboot_defconfig >> b/configs/am335x_boneblack_vboot_defconfig >> index fe5b9e7..dc584d8 100644 >> --- a/configs/am335x_boneblack_vboot_defconfig >> +++ b/configs/am335x_boneblack_vboot_defconfig >> @@ -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" >> diff --git a/configs/am335x_evm_defconfig >> b/configs/am335x_evm_defconfig >> index 9c97009..9e860ce 100644 >> --- a/configs/am335x_evm_defconfig >> +++ b/configs/am335x_evm_defconfig >> @@ -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" >> diff --git a/configs/am335x_evm_nor_defconfig >> b/configs/am335x_evm_nor_defconfig >> index 1813003..cfdd259 100644 >> --- a/configs/am335x_evm_nor_defconfig >> +++ b/configs/am335x_evm_nor_defconfig >> @@ -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" >> diff --git a/configs/am335x_evm_norboot_defconfig >> b/configs/am335x_evm_norboot_defconfig >> index b38d7f6..862f238 100644 >> --- a/configs/am335x_evm_norboot_defconfig >> +++ b/configs/am335x_evm_norboot_defconfig >> @@ -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" >> diff --git a/configs/am335x_evm_spiboot_defconfig >> b/configs/am335x_evm_spiboot_defconfig >> index 7a20576..2afdc05 100644 >> --- a/configs/am335x_evm_spiboot_defconfig >> +++ b/configs/am335x_evm_spiboot_defconfig >> @@ -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" >> diff --git a/configs/am335x_evm_usbspl_defconfig >> b/configs/am335x_evm_usbspl_defconfig >> index 1e80017..cfdb00c 100644 >> --- a/configs/am335x_evm_usbspl_defconfig >> +++ b/configs/am335x_evm_usbspl_defconfig >> @@ -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" >> diff --git a/configs/am335x_hs_evm_defconfig >> b/configs/am335x_hs_evm_defconfig >> index 78cf48d..acb8362 100644 >> --- a/configs/am335x_hs_evm_defconfig >> +++ b/configs/am335x_hs_evm_defconfig >> @@ -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" >> diff --git a/configs/am335x_hs_evm_uart_defconfig >> b/configs/am335x_hs_evm_uart_defconfig >> index 09aab29..98f770d 100644 >> --- a/configs/am335x_hs_evm_uart_defconfig >> +++ b/configs/am335x_hs_evm_uart_defconfig >> @@ -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 >> diff --git a/configs/am3517_evm_defconfig >> b/configs/am3517_evm_defconfig >> index e6c17c7..ace7ff2 100644 >> --- a/configs/am3517_evm_defconfig >> +++ b/configs/am3517_evm_defconfig >> @@ -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 >> diff --git a/configs/birdland_bav335a_defconfig >> b/configs/birdland_bav335a_defconfig >> index 61518f5..be02764 100644 >> --- a/configs/birdland_bav335a_defconfig >> +++ b/configs/birdland_bav335a_defconfig >> @@ -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" >> diff --git a/configs/birdland_bav335b_defconfig >> b/configs/birdland_bav335b_defconfig >> index c7360c3..311d175 100644 >> --- a/configs/birdland_bav335b_defconfig >> +++ b/configs/birdland_bav335b_defconfig >> @@ -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" >> diff --git a/configs/brppt1_mmc_defconfig >> b/configs/brppt1_mmc_defconfig >> index c41a7b4..a3303b9 100644 >> --- a/configs/brppt1_mmc_defconfig >> +++ b/configs/brppt1_mmc_defconfig >> @@ -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 >> diff --git a/configs/brppt1_nand_defconfig >> b/configs/brppt1_nand_defconfig >> index 3844413..1fcc0e2 100644 >> --- a/configs/brppt1_nand_defconfig >> +++ b/configs/brppt1_nand_defconfig >> @@ -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 >> diff --git a/configs/brppt1_spi_defconfig >> b/configs/brppt1_spi_defconfig >> index 25d8837..7d5d641 100644 >> --- a/configs/brppt1_spi_defconfig >> +++ b/configs/brppt1_spi_defconfig >> @@ -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 >> diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig >> index 0c2d7ed..9271e46 100644 >> --- a/configs/brxre1_defconfig >> +++ b/configs/brxre1_defconfig >> @@ -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 >> diff --git a/configs/chiliboard_defconfig >> b/configs/chiliboard_defconfig >> index bc69df0..b0ed5a5 100644 >> --- a/configs/chiliboard_defconfig >> +++ b/configs/chiliboard_defconfig >> @@ -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 >> diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig >> index 819a95b..b821daa 100644 >> --- a/configs/cm_t3517_defconfig >> +++ b/configs/cm_t3517_defconfig >> @@ -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 >> diff --git a/configs/draco_defconfig b/configs/draco_defconfig >> index be0105f..f99cae5 100644 >> --- a/configs/draco_defconfig >> +++ b/configs/draco_defconfig >> @@ -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" >> diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig >> index 8e8ef6f..ab55c4e 100644 >> --- a/configs/etamin_defconfig >> +++ b/configs/etamin_defconfig >> @@ -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" >> diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig >> index 0ddf64c..b06912a 100644 >> --- a/configs/kc1_defconfig >> +++ b/configs/kc1_defconfig >> @@ -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 >> diff --git a/configs/omap3_beagle_defconfig >> b/configs/omap3_beagle_defconfig >> index ad72079..b360cc9 100644 >> --- a/configs/omap3_beagle_defconfig >> +++ b/configs/omap3_beagle_defconfig >> @@ -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" >> diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig >> index 5103e9f..8ff59c7 100644 >> --- a/configs/omap3_evm_defconfig >> +++ b/configs/omap3_evm_defconfig >> @@ -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 >> diff --git a/configs/omap3_logic_defconfig >> b/configs/omap3_logic_defconfig >> index 5590b9a..2908dc5 100644 >> --- a/configs/omap3_logic_defconfig >> +++ b/configs/omap3_logic_defconfig >> @@ -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" >> diff --git a/configs/pcm051_rev1_defconfig >> b/configs/pcm051_rev1_defconfig >> index 273fc30..3a89ce4 100644 >> --- a/configs/pcm051_rev1_defconfig >> +++ b/configs/pcm051_rev1_defconfig >> @@ -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 >> diff --git a/configs/pcm051_rev3_defconfig >> b/configs/pcm051_rev3_defconfig >> index f1ddaa6..cea3145 100644 >> --- a/configs/pcm051_rev3_defconfig >> +++ b/configs/pcm051_rev3_defconfig >> @@ -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 >> diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig >> index 4bb6245..89d236d 100644 >> --- a/configs/pengwyn_defconfig >> +++ b/configs/pengwyn_defconfig >> @@ -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 >> diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig >> index 0ec1591..48b4d2c 100644 >> --- a/configs/pxm2_defconfig >> +++ b/configs/pxm2_defconfig >> @@ -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" >> diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig >> index 5ef1740..b57592b 100644 >> --- a/configs/rastaban_defconfig >> +++ b/configs/rastaban_defconfig >> @@ -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" >> diff --git a/configs/rut_defconfig b/configs/rut_defconfig >> index 1711fc7..02e9732 100644 >> --- a/configs/rut_defconfig >> +++ b/configs/rut_defconfig >> @@ -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" >> diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig >> index a8a592f..f6cbb69 100644 >> --- a/configs/sniper_defconfig >> +++ b/configs/sniper_defconfig >> @@ -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 >> diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig >> index 2575c00..011f4b0 100644 >> --- a/configs/thuban_defconfig >> +++ b/configs/thuban_defconfig >> @@ -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" >> diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb- >> new/Kconfig >> index caba42c..2bdab5c 100644 >> --- a/drivers/usb/musb-new/Kconfig >> +++ b/drivers/usb/musb-new/Kconfig >> @@ -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 >> diff --git a/include/configs/am335x_evm.h >> b/include/configs/am335x_evm.h >> index 856c546..846f5c9 100644 >> --- a/include/configs/am335x_evm.h >> +++ b/include/configs/am335x_evm.h >> @@ -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 >> diff --git a/include/configs/am3517_evm.h >> b/include/configs/am3517_evm.h >> index 33ed85e..d9d2462 100644 >> --- a/include/configs/am3517_evm.h >> +++ b/include/configs/am3517_evm.h >> @@ -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 >> >> diff --git a/include/configs/baltos.h b/include/configs/baltos.h >> index 3fc9e2f..e438105 100644 >> --- a/include/configs/baltos.h >> +++ b/include/configs/baltos.h >> @@ -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 >> diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h >> index 8917bbe..ab0082e 100644 >> --- a/include/configs/bav335x.h >> +++ b/include/configs/bav335x.h >> @@ -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 >> diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h >> index 2dadcae..0d80c6d 100644 >> --- a/include/configs/brppt1.h >> +++ b/include/configs/brppt1.h >> @@ -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 >> diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h >> index 8f92d7a..7125c86 100644 >> --- a/include/configs/brxre1.h >> +++ b/include/configs/brxre1.h >> @@ -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 >> diff --git a/include/configs/chiliboard.h >> b/include/configs/chiliboard.h >> index 92fd235..835b9dc 100644 >> --- a/include/configs/chiliboard.h >> +++ b/include/configs/chiliboard.h >> @@ -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 >> diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h >> index a472b9f..1737f88 100644 >> --- a/include/configs/cm_t3517.h >> +++ b/include/configs/cm_t3517.h >> @@ -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 */ >> diff --git a/include/configs/kc1.h b/include/configs/kc1.h >> index 8d8dc26..94c3d0a 100644 >> --- a/include/configs/kc1.h >> +++ b/include/configs/kc1.h >> @@ -115,9 +115,6 @@ >> * USB gadget >> */ >> >> -#define CONFIG_USB_MUSB_PIO_ONLY >> -#define CONFIG_USB_MUSB_OMAP2PLUS >> - >> /* >> * Environment >> */ >> diff --git a/include/configs/omap3_beagle.h >> b/include/configs/omap3_beagle.h >> index 394bfb7..f21a843 100644 >> --- a/include/configs/omap3_beagle.h >> +++ b/include/configs/omap3_beagle.h >> @@ -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 */ >> diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h >> index 42f2153..0eefb84 100644 >> --- a/include/configs/omap3_evm.h >> +++ b/include/configs/omap3_evm.h >> @@ -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 >> diff --git a/include/configs/omap3_logic.h >> b/include/configs/omap3_logic.h >> index b095814..1e4e42a 100644 >> --- a/include/configs/omap3_logic.h >> +++ b/include/configs/omap3_logic.h >> @@ -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 >> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h >> index 79f3f48..9482501 100644 >> --- a/include/configs/pcm051.h >> +++ b/include/configs/pcm051.h >> @@ -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 >> diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h >> index 8afd64e..d1ddb15 100644 >> --- a/include/configs/pengwyn.h >> +++ b/include/configs/pengwyn.h >> @@ -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 >> diff --git a/include/configs/pic32mzdask.h >> b/include/configs/pic32mzdask.h >> index 97636fe..0bb5126 100644 >> --- a/include/configs/pic32mzdask.h >> +++ b/include/configs/pic32mzdask.h >> @@ -80,7 +80,6 @@ >> /*-------------------------------------------------- >> * USB Configuration >> */ >> -#define CONFIG_USB_MUSB_PIO_ONLY >> >> /*------------------------------------------------------------------- >> ---- >> * File System Configuration >> diff --git a/include/configs/siemens-am33x-common.h >> b/include/configs/siemens-am33x-common.h >> index 78708a2..5da5a08 100644 >> --- a/include/configs/siemens-am33x-common.h >> +++ b/include/configs/siemens-am33x-common.h >> @@ -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 >> diff --git a/include/configs/sniper.h b/include/configs/sniper.h >> index 5809942..09b5a73 100644 >> --- a/include/configs/sniper.h >> +++ b/include/configs/sniper.h >> @@ -113,8 +113,6 @@ >> * USB gadget >> */ >> >> -#define CONFIG_USB_MUSB_PIO_ONLY >> -#define CONFIG_USB_MUSB_OMAP2PLUS >> #define CONFIG_TWL4030_USB >> >> /* >> diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi- >> common.h >> index 3855c56..582aba2 100644 >> --- a/include/configs/sunxi-common.h >> +++ b/include/configs/sunxi-common.h >> @@ -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 >> diff --git a/scripts/config_whitelist.txt >> b/scripts/config_whitelist.txt >> index 43a4ff0..97d27fc 100644 >> --- a/scripts/config_whitelist.txt >> +++ b/scripts/config_whitelist.txt >> @@ -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/
diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index 0ef9f42..bb7c31b 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -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" diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig index 55e0ebd..ccb5431 100644 --- a/configs/am335x_boneblack_defconfig +++ b/configs/am335x_boneblack_defconfig @@ -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" diff --git a/configs/am335x_boneblack_vboot_defconfig b/configs/am335x_boneblack_vboot_defconfig index fe5b9e7..dc584d8 100644 --- a/configs/am335x_boneblack_vboot_defconfig +++ b/configs/am335x_boneblack_vboot_defconfig @@ -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" diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 9c97009..9e860ce 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -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" diff --git a/configs/am335x_evm_nor_defconfig b/configs/am335x_evm_nor_defconfig index 1813003..cfdd259 100644 --- a/configs/am335x_evm_nor_defconfig +++ b/configs/am335x_evm_nor_defconfig @@ -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" diff --git a/configs/am335x_evm_norboot_defconfig b/configs/am335x_evm_norboot_defconfig index b38d7f6..862f238 100644 --- a/configs/am335x_evm_norboot_defconfig +++ b/configs/am335x_evm_norboot_defconfig @@ -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" diff --git a/configs/am335x_evm_spiboot_defconfig b/configs/am335x_evm_spiboot_defconfig index 7a20576..2afdc05 100644 --- a/configs/am335x_evm_spiboot_defconfig +++ b/configs/am335x_evm_spiboot_defconfig @@ -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" diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index 1e80017..cfdb00c 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -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" diff --git a/configs/am335x_hs_evm_defconfig b/configs/am335x_hs_evm_defconfig index 78cf48d..acb8362 100644 --- a/configs/am335x_hs_evm_defconfig +++ b/configs/am335x_hs_evm_defconfig @@ -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" diff --git a/configs/am335x_hs_evm_uart_defconfig b/configs/am335x_hs_evm_uart_defconfig index 09aab29..98f770d 100644 --- a/configs/am335x_hs_evm_uart_defconfig +++ b/configs/am335x_hs_evm_uart_defconfig @@ -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 diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index e6c17c7..ace7ff2 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -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 diff --git a/configs/birdland_bav335a_defconfig b/configs/birdland_bav335a_defconfig index 61518f5..be02764 100644 --- a/configs/birdland_bav335a_defconfig +++ b/configs/birdland_bav335a_defconfig @@ -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" diff --git a/configs/birdland_bav335b_defconfig b/configs/birdland_bav335b_defconfig index c7360c3..311d175 100644 --- a/configs/birdland_bav335b_defconfig +++ b/configs/birdland_bav335b_defconfig @@ -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" diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig index c41a7b4..a3303b9 100644 --- a/configs/brppt1_mmc_defconfig +++ b/configs/brppt1_mmc_defconfig @@ -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 diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig index 3844413..1fcc0e2 100644 --- a/configs/brppt1_nand_defconfig +++ b/configs/brppt1_nand_defconfig @@ -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 diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig index 25d8837..7d5d641 100644 --- a/configs/brppt1_spi_defconfig +++ b/configs/brppt1_spi_defconfig @@ -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 diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig index 0c2d7ed..9271e46 100644 --- a/configs/brxre1_defconfig +++ b/configs/brxre1_defconfig @@ -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 diff --git a/configs/chiliboard_defconfig b/configs/chiliboard_defconfig index bc69df0..b0ed5a5 100644 --- a/configs/chiliboard_defconfig +++ b/configs/chiliboard_defconfig @@ -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 diff --git a/configs/cm_t3517_defconfig b/configs/cm_t3517_defconfig index 819a95b..b821daa 100644 --- a/configs/cm_t3517_defconfig +++ b/configs/cm_t3517_defconfig @@ -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 diff --git a/configs/draco_defconfig b/configs/draco_defconfig index be0105f..f99cae5 100644 --- a/configs/draco_defconfig +++ b/configs/draco_defconfig @@ -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" diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig index 8e8ef6f..ab55c4e 100644 --- a/configs/etamin_defconfig +++ b/configs/etamin_defconfig @@ -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" diff --git a/configs/kc1_defconfig b/configs/kc1_defconfig index 0ddf64c..b06912a 100644 --- a/configs/kc1_defconfig +++ b/configs/kc1_defconfig @@ -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 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index ad72079..b360cc9 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -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" diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 5103e9f..8ff59c7 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -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 diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index 5590b9a..2908dc5 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -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" diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig index 273fc30..3a89ce4 100644 --- a/configs/pcm051_rev1_defconfig +++ b/configs/pcm051_rev1_defconfig @@ -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 diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig index f1ddaa6..cea3145 100644 --- a/configs/pcm051_rev3_defconfig +++ b/configs/pcm051_rev3_defconfig @@ -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 diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig index 4bb6245..89d236d 100644 --- a/configs/pengwyn_defconfig +++ b/configs/pengwyn_defconfig @@ -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 diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig index 0ec1591..48b4d2c 100644 --- a/configs/pxm2_defconfig +++ b/configs/pxm2_defconfig @@ -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" diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig index 5ef1740..b57592b 100644 --- a/configs/rastaban_defconfig +++ b/configs/rastaban_defconfig @@ -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" diff --git a/configs/rut_defconfig b/configs/rut_defconfig index 1711fc7..02e9732 100644 --- a/configs/rut_defconfig +++ b/configs/rut_defconfig @@ -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" diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index a8a592f..f6cbb69 100644 --- a/configs/sniper_defconfig +++ b/configs/sniper_defconfig @@ -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 diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig index 2575c00..011f4b0 100644 --- a/configs/thuban_defconfig +++ b/configs/thuban_defconfig @@ -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" diff --git a/drivers/usb/musb-new/Kconfig b/drivers/usb/musb-new/Kconfig index caba42c..2bdab5c 100644 --- a/drivers/usb/musb-new/Kconfig +++ b/drivers/usb/musb-new/Kconfig @@ -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 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 856c546..846f5c9 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -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 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 33ed85e..d9d2462 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -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 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 3fc9e2f..e438105 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -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 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 8917bbe..ab0082e 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -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 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index 2dadcae..0d80c6d 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -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 diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 8f92d7a..7125c86 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -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 diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h index 92fd235..835b9dc 100644 --- a/include/configs/chiliboard.h +++ b/include/configs/chiliboard.h @@ -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 diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index a472b9f..1737f88 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -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 */ diff --git a/include/configs/kc1.h b/include/configs/kc1.h index 8d8dc26..94c3d0a 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -115,9 +115,6 @@ * USB gadget */ -#define CONFIG_USB_MUSB_PIO_ONLY -#define CONFIG_USB_MUSB_OMAP2PLUS - /* * Environment */ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 394bfb7..f21a843 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 */ diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 42f2153..0eefb84 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index b095814..1e4e42a 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index 79f3f48..9482501 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -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 diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h index 8afd64e..d1ddb15 100644 --- a/include/configs/pengwyn.h +++ b/include/configs/pengwyn.h @@ -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 diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index 97636fe..0bb5126 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -80,7 +80,6 @@ /*-------------------------------------------------- * USB Configuration */ -#define CONFIG_USB_MUSB_PIO_ONLY /*----------------------------------------------------------------------- * File System Configuration diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 78708a2..5da5a08 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -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 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 5809942..09b5a73 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -113,8 +113,6 @@ * USB gadget */ -#define CONFIG_USB_MUSB_PIO_ONLY -#define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_TWL4030_USB /* diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 3855c56..582aba2 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -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 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43a4ff0..97d27fc 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -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
This converts the following to Kconfig: CONFIG_USB_MUSB_OMAP2PLUS CONFIG_USB_MUSB_PIO_ONLY Signed-off-by: Adam Ford <aford173@gmail.com>