Commit 86362221fc72fa74620232b79eec56fbfb1ff96f
Committed by
Tom Rini
1 parent
6931ab2fb4
Exists in
smarc_8mq_lf_v2020.04
and in
17 other branches
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
- configs/am335x_boneblack_defconfig
- configs/am335x_boneblack_vboot_defconfig
- configs/am335x_evm_defconfig
- configs/am335x_evm_nor_defconfig
- configs/am335x_evm_norboot_defconfig
- configs/am335x_evm_spiboot_defconfig
- configs/am335x_evm_usbspl_defconfig
- configs/am335x_hs_evm_defconfig
- configs/am335x_hs_evm_uart_defconfig
- configs/am3517_evm_defconfig
- configs/birdland_bav335a_defconfig
- configs/birdland_bav335b_defconfig
- configs/brppt1_mmc_defconfig
- configs/brppt1_nand_defconfig
- configs/brppt1_spi_defconfig
- configs/brxre1_defconfig
- configs/chiliboard_defconfig
- configs/cm_t3517_defconfig
- configs/draco_defconfig
- configs/etamin_defconfig
- configs/kc1_defconfig
- configs/omap3_beagle_defconfig
- configs/omap3_evm_defconfig
- configs/omap3_logic_defconfig
- configs/pcm051_rev1_defconfig
- configs/pcm051_rev3_defconfig
- configs/pengwyn_defconfig
- configs/pxm2_defconfig
- configs/rastaban_defconfig
- configs/rut_defconfig
- configs/sniper_defconfig
- configs/thuban_defconfig
- drivers/usb/musb-new/Kconfig
- include/configs/am335x_evm.h
- include/configs/am3517_evm.h
- include/configs/baltos.h
- include/configs/bav335x.h
- include/configs/brppt1.h
- include/configs/brxre1.h
- include/configs/chiliboard.h
- include/configs/cm_t3517.h
- include/configs/kc1.h
- include/configs/omap3_beagle.h
- include/configs/omap3_evm.h
- include/configs/omap3_logic.h
- include/configs/pcm051.h
- include/configs/pengwyn.h
- include/configs/pic32mzdask.h
- include/configs/siemens-am33x-common.h
- include/configs/sniper.h
- include/configs/sunxi-common.h
- scripts/config_whitelist.txt
configs/am335x_baltos_defconfig
configs/am335x_boneblack_defconfig
configs/am335x_boneblack_vboot_defconfig
configs/am335x_evm_defconfig
configs/am335x_evm_nor_defconfig
configs/am335x_evm_norboot_defconfig
configs/am335x_evm_spiboot_defconfig
configs/am335x_evm_usbspl_defconfig
configs/am335x_hs_evm_defconfig
configs/am335x_hs_evm_uart_defconfig
configs/am3517_evm_defconfig
configs/birdland_bav335a_defconfig
configs/birdland_bav335b_defconfig
configs/brppt1_mmc_defconfig
configs/brppt1_nand_defconfig
configs/brppt1_spi_defconfig
configs/brxre1_defconfig
configs/chiliboard_defconfig
configs/cm_t3517_defconfig
configs/draco_defconfig
configs/etamin_defconfig
configs/kc1_defconfig
configs/omap3_beagle_defconfig
configs/omap3_evm_defconfig
configs/omap3_logic_defconfig
configs/pcm051_rev1_defconfig
configs/pcm051_rev3_defconfig
configs/pengwyn_defconfig
configs/pxm2_defconfig
configs/rastaban_defconfig
configs/rut_defconfig
configs/sniper_defconfig
configs/thuban_defconfig
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
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
include/configs/omap3_beagle.h
include/configs/omap3_evm.h
include/configs/omap3_logic.h
include/configs/pcm051.h
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
include/configs/siemens-am33x-common.h
include/configs/sniper.h
include/configs/sunxi-common.h
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 |