Commit 86362221fc72fa74620232b79eec56fbfb1ff96f

Authored by Adam Ford
Committed by Tom Rini
1 parent 6931ab2fb4

Convert CONFIG_USB_MUSB_OMAP2PLUS et al to Kconfig

This converts the following to Kconfig:
   CONFIG_USB_MUSB_OMAP2PLUS
   CONFIG_USB_MUSB_AM35X
   CONFIG_USB_MUSB_DSPS
   CONFIG_USB_MUSB_PIO_ONLY

Signed-off-by: Adam Ford <aford173@gmail.com>

Showing 53 changed files with 50 additions and 43 deletions Side-by-side Diff

configs/am335x_baltos_defconfig
... ... @@ -55,6 +55,7 @@
55 55 CONFIG_USB=y
56 56 CONFIG_USB_MUSB_HOST=y
57 57 CONFIG_USB_MUSB_GADGET=y
  58 +CONFIG_USB_MUSB_DSPS=y
58 59 CONFIG_USB_STORAGE=y
59 60 CONFIG_USB_GADGET=y
60 61 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_USB=y
34 34 CONFIG_USB_MUSB_HOST=y
35 35 CONFIG_USB_MUSB_GADGET=y
  36 +CONFIG_USB_MUSB_DSPS=y
36 37 CONFIG_USB_STORAGE=y
37 38 CONFIG_USB_GADGET=y
38 39 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_boneblack_vboot_defconfig
... ... @@ -43,6 +43,7 @@
43 43 CONFIG_USB=y
44 44 CONFIG_USB_MUSB_HOST=y
45 45 CONFIG_USB_MUSB_GADGET=y
  46 +CONFIG_USB_MUSB_DSPS=y
46 47 CONFIG_USB_STORAGE=y
47 48 CONFIG_USB_GADGET=y
48 49 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_defconfig
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_USB_MUSB_HOST=y
48 48 CONFIG_USB_MUSB_GADGET=y
49 49 CONFIG_USB_MUSB_TI=y
  50 +CONFIG_USB_MUSB_DSPS=y
50 51 CONFIG_USB_STORAGE=y
51 52 CONFIG_USB_GADGET=y
52 53 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_nor_defconfig
... ... @@ -34,6 +34,7 @@
34 34 CONFIG_USB=y
35 35 CONFIG_USB_MUSB_HOST=y
36 36 CONFIG_USB_MUSB_GADGET=y
  37 +CONFIG_USB_MUSB_DSPS=y
37 38 CONFIG_USB_STORAGE=y
38 39 CONFIG_USB_GADGET=y
39 40 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_norboot_defconfig
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_USB=y
31 31 CONFIG_USB_MUSB_HOST=y
32 32 CONFIG_USB_MUSB_GADGET=y
  33 +CONFIG_USB_MUSB_DSPS=y
33 34 CONFIG_USB_STORAGE=y
34 35 CONFIG_USB_GADGET=y
35 36 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_spiboot_defconfig
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_USB=y
33 33 CONFIG_USB_MUSB_HOST=y
34 34 CONFIG_USB_MUSB_GADGET=y
  35 +CONFIG_USB_MUSB_DSPS=y
35 36 CONFIG_USB_STORAGE=y
36 37 CONFIG_USB_GADGET=y
37 38 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_evm_usbspl_defconfig
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_USB=y
39 39 CONFIG_USB_MUSB_HOST=y
40 40 CONFIG_USB_MUSB_GADGET=y
  41 +CONFIG_USB_MUSB_DSPS=y
41 42 CONFIG_USB_STORAGE=y
42 43 CONFIG_USB_GADGET=y
43 44 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_defconfig
... ... @@ -56,6 +56,7 @@
56 56 CONFIG_USB_MUSB_HOST=y
57 57 CONFIG_USB_MUSB_GADGET=y
58 58 CONFIG_USB_MUSB_TI=y
  59 +CONFIG_USB_MUSB_DSPS=y
59 60 CONFIG_USB_STORAGE=y
60 61 CONFIG_USB_GADGET=y
61 62 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/am335x_hs_evm_uart_defconfig
... ... @@ -53,6 +53,7 @@
53 53 CONFIG_USB_MUSB_HOST=y
54 54 CONFIG_USB_MUSB_GADGET=y
55 55 CONFIG_USB_MUSB_TI=y
  56 +CONFIG_USB_MUSB_DSPS=y
56 57 CONFIG_USB_STORAGE=y
57 58 CONFIG_USB_GADGET=y
58 59 CONFIG_USB_GADGET_DOWNLOAD=y
configs/am3517_evm_defconfig
... ... @@ -40,6 +40,7 @@
40 40 CONFIG_SYS_NS16550=y
41 41 CONFIG_USB=y
42 42 CONFIG_USB_MUSB_HOST=y
  43 +CONFIG_USB_MUSB_AM35X=y
43 44 # CONFIG_FAT_WRITE is not set
44 45 CONFIG_BCH=y
configs/birdland_bav335a_defconfig
... ... @@ -62,6 +62,7 @@
62 62 CONFIG_USB=y
63 63 CONFIG_USB_MUSB_HOST=y
64 64 CONFIG_USB_MUSB_GADGET=y
  65 +CONFIG_USB_MUSB_DSPS=y
65 66 CONFIG_USB_STORAGE=y
66 67 CONFIG_USB_GADGET=y
67 68 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/birdland_bav335b_defconfig
... ... @@ -62,6 +62,7 @@
62 62 CONFIG_USB=y
63 63 CONFIG_USB_MUSB_HOST=y
64 64 CONFIG_USB_MUSB_GADGET=y
  65 +CONFIG_USB_MUSB_DSPS=y
65 66 CONFIG_USB_STORAGE=y
66 67 CONFIG_USB_GADGET=y
67 68 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
configs/brppt1_mmc_defconfig
... ... @@ -55,6 +55,7 @@
55 55 CONFIG_SYS_NS16550=y
56 56 CONFIG_USB=y
57 57 CONFIG_USB_MUSB_HOST=y
  58 +CONFIG_USB_MUSB_DSPS=y
58 59 CONFIG_USB_STORAGE=y
59 60 CONFIG_SYS_WHITE_ON_BLACK=y
60 61 CONFIG_LCD=y
configs/brppt1_nand_defconfig
... ... @@ -57,6 +57,7 @@
57 57 CONFIG_SYS_NS16550=y
58 58 CONFIG_USB=y
59 59 CONFIG_USB_MUSB_HOST=y
  60 +CONFIG_USB_MUSB_DSPS=y
60 61 CONFIG_USB_STORAGE=y
61 62 CONFIG_SYS_WHITE_ON_BLACK=y
62 63 CONFIG_LCD=y
configs/brppt1_spi_defconfig
... ... @@ -65,6 +65,7 @@
65 65 CONFIG_OMAP3_SPI=y
66 66 CONFIG_USB=y
67 67 CONFIG_USB_MUSB_HOST=y
  68 +CONFIG_USB_MUSB_DSPS=y
68 69 CONFIG_USB_STORAGE=y
69 70 CONFIG_SYS_WHITE_ON_BLACK=y
70 71 CONFIG_LCD=y
configs/brxre1_defconfig
... ... @@ -56,6 +56,7 @@
56 56 CONFIG_SYS_NS16550=y
57 57 CONFIG_USB=y
58 58 CONFIG_USB_MUSB_HOST=y
  59 +CONFIG_USB_MUSB_DSPS=y
59 60 CONFIG_USB_STORAGE=y
60 61 CONFIG_SYS_WHITE_ON_BLACK=y
61 62 CONFIG_LCD=y
configs/chiliboard_defconfig
... ... @@ -45,6 +45,7 @@
45 45 CONFIG_OMAP3_SPI=y
46 46 CONFIG_USB=y
47 47 CONFIG_USB_MUSB_HOST=y
  48 +CONFIG_USB_MUSB_DSPS=y
48 49 CONFIG_USB_STORAGE=y
49 50 CONFIG_FAT_WRITE=y
50 51 CONFIG_LZO=y
configs/cm_t3517_defconfig
... ... @@ -48,6 +48,7 @@
48 48 CONFIG_OMAP3_SPI=y
49 49 CONFIG_USB=y
50 50 CONFIG_USB_MUSB_HOST=y
  51 +CONFIG_USB_MUSB_AM35X=y
51 52 CONFIG_USB_STORAGE=y
52 53 CONFIG_LCD=y
53 54 CONFIG_OF_LIBFDT=y
configs/draco_defconfig
... ... @@ -64,6 +64,7 @@
64 64 CONFIG_USB=y
65 65 CONFIG_USB_MUSB_HOST=y
66 66 CONFIG_USB_MUSB_GADGET=y
  67 +CONFIG_USB_MUSB_DSPS=y
67 68 CONFIG_USB_STORAGE=y
68 69 CONFIG_USB_GADGET=y
69 70 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/etamin_defconfig
... ... @@ -64,6 +64,7 @@
64 64 CONFIG_USB=y
65 65 CONFIG_USB_MUSB_HOST=y
66 66 CONFIG_USB_MUSB_GADGET=y
  67 +CONFIG_USB_MUSB_DSPS=y
67 68 CONFIG_USB_STORAGE=y
68 69 CONFIG_USB_GADGET=y
69 70 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/kc1_defconfig
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_SYS_NS16550=y
39 39 CONFIG_USB=y
40 40 CONFIG_USB_MUSB_GADGET=y
  41 +CONFIG_USB_MUSB_OMAP2PLUS=y
41 42 CONFIG_USB_GADGET=y
42 43 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
43 44 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_beagle_defconfig
... ... @@ -52,6 +52,7 @@
52 52 CONFIG_USB=y
53 53 CONFIG_USB_EHCI_HCD=y
54 54 CONFIG_USB_MUSB_GADGET=y
  55 +CONFIG_USB_MUSB_OMAP2PLUS=y
55 56 CONFIG_USB_STORAGE=y
56 57 CONFIG_USB_GADGET=y
57 58 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/omap3_evm_defconfig
... ... @@ -57,6 +57,7 @@
57 57 CONFIG_USB=y
58 58 CONFIG_USB_EHCI_HCD=y
59 59 CONFIG_USB_MUSB_GADGET=y
  60 +CONFIG_USB_MUSB_OMAP2PLUS=y
60 61 CONFIG_USB_GADGET=y
61 62 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
62 63 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/omap3_logic_defconfig
... ... @@ -51,6 +51,7 @@
51 51 CONFIG_USB=y
52 52 CONFIG_USB_EHCI_HCD=y
53 53 CONFIG_USB_MUSB_GADGET=y
  54 +CONFIG_USB_MUSB_OMAP2PLUS=y
54 55 CONFIG_USB_STORAGE=y
55 56 CONFIG_USB_GADGET=y
56 57 CONFIG_USB_GADGET_MANUFACTURER="TI"
configs/pcm051_rev1_defconfig
... ... @@ -58,6 +58,7 @@
58 58 CONFIG_USB=y
59 59 CONFIG_USB_MUSB_HOST=y
60 60 CONFIG_USB_MUSB_GADGET=y
  61 +CONFIG_USB_MUSB_DSPS=y
61 62 CONFIG_USB_STORAGE=y
62 63 CONFIG_USB_GADGET=y
63 64 CONFIG_USB_ETHER=y
configs/pcm051_rev3_defconfig
... ... @@ -58,6 +58,7 @@
58 58 CONFIG_USB=y
59 59 CONFIG_USB_MUSB_HOST=y
60 60 CONFIG_USB_MUSB_GADGET=y
  61 +CONFIG_USB_MUSB_DSPS=y
61 62 CONFIG_USB_STORAGE=y
62 63 CONFIG_USB_GADGET=y
63 64 CONFIG_USB_ETHER=y
configs/pengwyn_defconfig
... ... @@ -62,6 +62,7 @@
62 62 CONFIG_USB=y
63 63 CONFIG_USB_MUSB_HOST=y
64 64 CONFIG_USB_MUSB_GADGET=y
  65 +CONFIG_USB_MUSB_DSPS=y
65 66 CONFIG_USB_STORAGE=y
66 67 CONFIG_USB_GADGET=y
67 68 CONFIG_FAT_WRITE=y
configs/pxm2_defconfig
... ... @@ -67,6 +67,7 @@
67 67 CONFIG_USB=y
68 68 CONFIG_USB_MUSB_HOST=y
69 69 CONFIG_USB_MUSB_GADGET=y
  70 +CONFIG_USB_MUSB_DSPS=y
70 71 CONFIG_USB_STORAGE=y
71 72 CONFIG_USB_GADGET=y
72 73 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rastaban_defconfig
... ... @@ -64,6 +64,7 @@
64 64 CONFIG_USB=y
65 65 CONFIG_USB_MUSB_HOST=y
66 66 CONFIG_USB_MUSB_GADGET=y
  67 +CONFIG_USB_MUSB_DSPS=y
67 68 CONFIG_USB_STORAGE=y
68 69 CONFIG_USB_GADGET=y
69 70 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/rut_defconfig
... ... @@ -68,6 +68,7 @@
68 68 CONFIG_USB=y
69 69 CONFIG_USB_MUSB_HOST=y
70 70 CONFIG_USB_MUSB_GADGET=y
  71 +CONFIG_USB_MUSB_DSPS=y
71 72 CONFIG_USB_STORAGE=y
72 73 CONFIG_USB_GADGET=y
73 74 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
configs/sniper_defconfig
... ... @@ -39,6 +39,7 @@
39 39 CONFIG_SYS_NS16550=y
40 40 CONFIG_USB=y
41 41 CONFIG_USB_MUSB_GADGET=y
  42 +CONFIG_USB_MUSB_OMAP2PLUS=y
42 43 CONFIG_USB_GADGET=y
43 44 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
44 45 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
configs/thuban_defconfig
... ... @@ -64,6 +64,7 @@
64 64 CONFIG_USB=y
65 65 CONFIG_USB_MUSB_HOST=y
66 66 CONFIG_USB_MUSB_GADGET=y
  67 +CONFIG_USB_MUSB_DSPS=y
67 68 CONFIG_USB_STORAGE=y
68 69 CONFIG_USB_GADGET=y
69 70 CONFIG_USB_GADGET_MANUFACTURER="Siemens AG"
drivers/usb/musb-new/Kconfig
... ... @@ -23,6 +23,16 @@
23 23 speed USB controller based on the Mentor Graphics
24 24 silicon IP.
25 25  
  26 +config USB_MUSB_OMAP2PLUS
  27 + tristate "OMAP2430 and onwards"
  28 + depends on ARCH_OMAP2PLUS
  29 +
  30 +config USB_MUSB_AM35X
  31 + bool "AM35x"
  32 +
  33 +config USB_MUSB_DSPS
  34 + bool "TI DSPS platforms"
  35 +
26 36 if USB_MUSB_HOST || USB_MUSB_GADGET
27 37  
28 38 config USB_MUSB_PIC32
... ... @@ -41,4 +51,11 @@
41 51 used on almost all sunxi boards.
42 52  
43 53 endif
  54 +
  55 +config USB_MUSB_PIO_ONLY
  56 + bool "Disable DMA (always use PIO)"
  57 + default y if USB_MUSB_AM35X || USB_MUSB_PIC32 || USB_MUSB_OMAP2PLUS || USB_MUSB_DSPS || USB_MUSB_SUNXI
  58 + help
  59 + All data is copied between memory and FIFO by the CPU.
  60 + DMA controllers are ignored.
include/configs/am335x_evm.h
... ... @@ -228,8 +228,6 @@
228 228 * add mass storage support and for gadget we add both RNDIS ethernet
229 229 * and DFU.
230 230 */
231   -#define CONFIG_USB_MUSB_DSPS
232   -#define CONFIG_USB_MUSB_PIO_ONLY
233 231 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
234 232 #define CONFIG_AM335X_USB0
235 233 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
include/configs/am3517_evm.h
... ... @@ -42,8 +42,6 @@
42 42 * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard
43 43 * Enable CONFIG_USB_MUSB_GADGET for Device functionalities.
44 44 */
45   -#define CONFIG_USB_MUSB_AM35X
46   -#define CONFIG_USB_MUSB_PIO_ONLY
47 45  
48 46 #ifdef CONFIG_USB_MUSB_AM35X
49 47  
include/configs/baltos.h
... ... @@ -272,8 +272,6 @@
272 272 * add mass storage support and for gadget we add both RNDIS ethernet
273 273 * and DFU.
274 274 */
275   -#define CONFIG_USB_MUSB_DSPS
276   -#define CONFIG_USB_MUSB_PIO_ONLY
277 275 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
278 276 #define CONFIG_AM335X_USB0
279 277 #define CONFIG_AM335X_USB0_MODE MUSB_HOST
include/configs/bav335x.h
... ... @@ -394,8 +394,6 @@
394 394 * add mass storage support and for gadget we add both RNDIS ethernet
395 395 * and DFU.
396 396 */
397   -#define CONFIG_USB_MUSB_DSPS
398   -#define CONFIG_USB_MUSB_PIO_ONLY
399 397 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
400 398 #define CONFIG_AM335X_USB0
401 399 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
include/configs/brppt1.h
... ... @@ -210,8 +210,6 @@
210 210 #endif /* CONFIG_NAND */
211 211  
212 212 /* USB configuration */
213   -#define CONFIG_USB_MUSB_DSPS
214   -#define CONFIG_USB_MUSB_PIO_ONLY
215 213 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
216 214 #define CONFIG_AM335X_USB0
217 215 #define CONFIG_AM335X_USB0_MODE MUSB_HOST
include/configs/brxre1.h
... ... @@ -80,8 +80,6 @@
80 80 #define CONFIG_INITRD_TAG
81 81  
82 82 /* USB configuration */
83   -#define CONFIG_USB_MUSB_DSPS
84   -#define CONFIG_USB_MUSB_PIO_ONLY
85 83 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
86 84 #define CONFIG_AM335X_USB0
87 85 #define CONFIG_AM335X_USB0_MODE MUSB_HOST
include/configs/chiliboard.h
... ... @@ -152,9 +152,7 @@
152 152 /* NAND: SPL related configs */
153 153  
154 154 /* USB configuration */
155   -#define CONFIG_USB_MUSB_DSPS
156 155 #define CONFIG_ARCH_MISC_INIT
157   -#define CONFIG_USB_MUSB_PIO_ONLY
158 156 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
159 157 #define CONFIG_AM335X_USB1
160 158 #define CONFIG_AM335X_USB1_MODE MUSB_HOST
include/configs/cm_t3517.h
... ... @@ -78,14 +78,11 @@
78 78 115200}
79 79  
80 80 /* USB */
81   -#define CONFIG_USB_MUSB_AM35X
82 81  
83 82 #ifndef CONFIG_USB_MUSB_AM35X
84 83 #define CONFIG_USB_OMAP3
85 84 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 146
86 85 #define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 147
87   -#else /* !CONFIG_USB_MUSB_AM35X */
88   -#define CONFIG_USB_MUSB_PIO_ONLY
89 86 #endif /* CONFIG_USB_MUSB_AM35X */
90 87  
91 88 /* commands to include */
include/configs/kc1.h
... ... @@ -115,9 +115,6 @@
115 115 * USB gadget
116 116 */
117 117  
118   -#define CONFIG_USB_MUSB_PIO_ONLY
119   -#define CONFIG_USB_MUSB_OMAP2PLUS
120   -
121 118 /*
122 119 * Environment
123 120 */
include/configs/omap3_beagle.h
... ... @@ -62,8 +62,6 @@
62 62  
63 63 /* MUSB */
64 64 #define CONFIG_USB_OMAP3
65   -#define CONFIG_USB_MUSB_OMAP2PLUS
66   -#define CONFIG_USB_MUSB_PIO_ONLY
67 65 #define CONFIG_TWL4030_USB
68 66  
69 67 /* USB EHCI */
include/configs/omap3_evm.h
... ... @@ -75,8 +75,6 @@
75 75  
76 76 /* MUSB */
77 77 #define CONFIG_USB_OMAP3
78   -#define CONFIG_USB_MUSB_OMAP2PLUS
79   -#define CONFIG_USB_MUSB_PIO_ONLY
80 78  
81 79 /* USB EHCI */
82 80 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
include/configs/omap3_logic.h
... ... @@ -55,8 +55,6 @@
55 55 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* EEPROM AT24C64 */
56 56  
57 57 /* USB */
58   -#define CONFIG_USB_MUSB_OMAP2PLUS
59   -#define CONFIG_USB_MUSB_PIO_ONLY
60 58  
61 59 /* TWL4030 */
62 60 #define CONFIG_TWL4030_USB
include/configs/pcm051.h
... ... @@ -126,8 +126,6 @@
126 126 /*
127 127 * USB configuration
128 128 */
129   -#define CONFIG_USB_MUSB_DSPS
130   -#define CONFIG_USB_MUSB_PIO_ONLY
131 129 #define CONFIG_AM335X_USB0
132 130 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
133 131 #define CONFIG_AM335X_USB1
include/configs/pengwyn.h
... ... @@ -162,8 +162,6 @@
162 162 * board schematic and physical port wired to each. Then for host we
163 163 * add mass storage support.
164 164 */
165   -#define CONFIG_USB_MUSB_DSPS
166   -#define CONFIG_USB_MUSB_PIO_ONLY
167 165 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
168 166 #define CONFIG_AM335X_USB0
169 167 #define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
include/configs/pic32mzdask.h
... ... @@ -80,7 +80,6 @@
80 80 /*--------------------------------------------------
81 81 * USB Configuration
82 82 */
83   -#define CONFIG_USB_MUSB_PIO_ONLY
84 83  
85 84 /*-----------------------------------------------------------------------
86 85 * File System Configuration
include/configs/siemens-am33x-common.h
... ... @@ -168,8 +168,6 @@
168 168 /*
169 169 * USB configuration
170 170 */
171   -#define CONFIG_USB_MUSB_DSPS
172   -#define CONFIG_USB_MUSB_PIO_ONLY
173 171 #define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
174 172  
175 173 #define CONFIG_AM335X_USB0
include/configs/sniper.h
... ... @@ -113,8 +113,6 @@
113 113 * USB gadget
114 114 */
115 115  
116   -#define CONFIG_USB_MUSB_PIO_ONLY
117   -#define CONFIG_USB_MUSB_OMAP2PLUS
118 116 #define CONFIG_TWL4030_USB
119 117  
120 118 /*
include/configs/sunxi-common.h
... ... @@ -302,10 +302,6 @@
302 302 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 1
303 303 #endif
304 304  
305   -#ifdef CONFIG_USB_MUSB_SUNXI
306   -#define CONFIG_USB_MUSB_PIO_ONLY
307   -#endif
308   -
309 305 #ifdef CONFIG_USB_MUSB_GADGET
310 306 #define CONFIG_USB_FUNCTION_MASS_STORAGE
311 307 #endif
scripts/config_whitelist.txt
... ... @@ -4877,12 +4877,8 @@
4877 4877 CONFIG_USB_INVENTRA_DMA
4878 4878 CONFIG_USB_ISP1301_I2C_ADDR
4879 4879 CONFIG_USB_MAX_CONTROLLER_COUNT
4880   -CONFIG_USB_MUSB_AM35X
4881 4880 CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
4882   -CONFIG_USB_MUSB_DSPS
4883 4881 CONFIG_USB_MUSB_HCD
4884   -CONFIG_USB_MUSB_OMAP2PLUS
4885   -CONFIG_USB_MUSB_PIO_ONLY
4886 4882 CONFIG_USB_MUSB_TIMEOUT
4887 4883 CONFIG_USB_MUSB_TUSB6010
4888 4884 CONFIG_USB_MUSB_UDC