Commit 747fed56d3876d7de89959f9a927901e02166151

Authored by Peter Robinson
Committed by Tom Warren
1 parent 02253d4d12

Kconfig: tegra: Migrate USB_EHCI_TEGRA

Migrate USB_EHCI_TEGRA from headers to Kconfig

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Cc: Tom Warren <twarren@nvidia.com>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Marek Vasut <marex@denx.de>
Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Cc: Peter.Chubb@data61.csiro.au
Cc: Lucas Stach <dev@lynxeye.de>
Cc: Stefan Agner <stefan.agner@toradex.com>
Cc: Alban Bedel <alban.bedel@avionic-design.de>
Cc: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

Showing 49 changed files with 30 additions and 73 deletions Side-by-side Diff

configs/apalis-tk1_defconfig
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_USB=y
48 48 CONFIG_DM_USB=y
49 49 CONFIG_USB_EHCI_HCD=y
  50 +CONFIG_USB_EHCI_TEGRA=y
50 51 CONFIG_USB_GADGET=y
51 52 CONFIG_USB_GADGET_MANUFACTURER="Toradex"
52 53 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
configs/apalis_t30_defconfig
... ... @@ -39,6 +39,7 @@
39 39 CONFIG_USB=y
40 40 CONFIG_DM_USB=y
41 41 CONFIG_USB_EHCI_HCD=y
  42 +CONFIG_USB_EHCI_TEGRA=y
42 43 CONFIG_USB_GADGET=y
43 44 CONFIG_USB_GADGET_MANUFACTURER="Toradex"
44 45 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
configs/beaver_defconfig
... ... @@ -43,6 +43,7 @@
43 43 CONFIG_USB=y
44 44 CONFIG_DM_USB=y
45 45 CONFIG_USB_EHCI_HCD=y
  46 +CONFIG_USB_EHCI_TEGRA=y
46 47 CONFIG_USB_GADGET=y
47 48 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
48 49 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/cardhu_defconfig
... ... @@ -37,6 +37,7 @@
37 37 CONFIG_USB=y
38 38 CONFIG_DM_USB=y
39 39 CONFIG_USB_EHCI_HCD=y
  40 +CONFIG_USB_EHCI_TEGRA=y
40 41 CONFIG_USB_HOST_ETHER=y
41 42 CONFIG_USB_ETHER_ASIX=y
configs/cei-tk1-som_defconfig
... ... @@ -46,6 +46,7 @@
46 46 CONFIG_USB=y
47 47 CONFIG_DM_USB=y
48 48 CONFIG_USB_EHCI_HCD=y
  49 +CONFIG_USB_EHCI_TEGRA=y
49 50 CONFIG_USB_GADGET=y
50 51 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
51 52 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/colibri_t20_defconfig
... ... @@ -48,6 +48,7 @@
48 48 CONFIG_USB=y
49 49 CONFIG_DM_USB=y
50 50 CONFIG_USB_EHCI_HCD=y
  51 +CONFIG_USB_EHCI_TEGRA=y
51 52 CONFIG_USB_ULPI_VIEWPORT=y
52 53 CONFIG_USB_ULPI=y
53 54 CONFIG_USB_GADGET=y
configs/colibri_t30_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_USB=y
34 34 CONFIG_DM_USB=y
35 35 CONFIG_USB_EHCI_HCD=y
  36 +CONFIG_USB_EHCI_TEGRA=y
36 37 CONFIG_USB_GADGET=y
37 38 CONFIG_USB_GADGET_MANUFACTURER="Toradex"
38 39 CONFIG_USB_GADGET_VENDOR_NUM=0x1b67
configs/dalmore_defconfig
... ... @@ -37,6 +37,7 @@
37 37 CONFIG_USB=y
38 38 CONFIG_DM_USB=y
39 39 CONFIG_USB_EHCI_HCD=y
  40 +CONFIG_USB_EHCI_TEGRA=y
40 41 CONFIG_USB_GADGET=y
41 42 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
42 43 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/e2220-1170_defconfig
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_USB=y
33 33 CONFIG_DM_USB=y
34 34 CONFIG_USB_EHCI_HCD=y
  35 +CONFIG_USB_EHCI_TEGRA=y
35 36 CONFIG_USB_GADGET=y
36 37 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
37 38 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/harmony_defconfig
... ... @@ -41,6 +41,7 @@
41 41 CONFIG_USB=y
42 42 CONFIG_DM_USB=y
43 43 CONFIG_USB_EHCI_HCD=y
  44 +CONFIG_USB_EHCI_TEGRA=y
44 45 CONFIG_USB_ULPI_VIEWPORT=y
45 46 CONFIG_USB_ULPI=y
46 47 CONFIG_USB_HOST_ETHER=y
configs/jetson-tk1_defconfig
... ... @@ -47,6 +47,7 @@
47 47 CONFIG_USB=y
48 48 CONFIG_DM_USB=y
49 49 CONFIG_USB_EHCI_HCD=y
  50 +CONFIG_USB_EHCI_TEGRA=y
50 51 CONFIG_USB_GADGET=y
51 52 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
52 53 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/medcom-wide_defconfig
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_USB=y
33 33 CONFIG_DM_USB=y
34 34 CONFIG_USB_EHCI_HCD=y
  35 +CONFIG_USB_EHCI_TEGRA=y
35 36 CONFIG_USB_HOST_ETHER=y
36 37 CONFIG_USB_ETHER_SMSC95XX=y
37 38 CONFIG_DM_VIDEO=y
configs/nyan-big_defconfig
... ... @@ -64,6 +64,7 @@
64 64 CONFIG_USB=y
65 65 CONFIG_DM_USB=y
66 66 CONFIG_USB_EHCI_HCD=y
  67 +CONFIG_USB_EHCI_TEGRA=y
67 68 CONFIG_USB_GADGET=y
68 69 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
69 70 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/p2371-0000_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_USB=y
34 34 CONFIG_DM_USB=y
35 35 CONFIG_USB_EHCI_HCD=y
  36 +CONFIG_USB_EHCI_TEGRA=y
36 37 CONFIG_USB_GADGET=y
37 38 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
38 39 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/p2371-2180_defconfig
... ... @@ -40,6 +40,7 @@
40 40 CONFIG_USB=y
41 41 CONFIG_DM_USB=y
42 42 CONFIG_USB_EHCI_HCD=y
  43 +CONFIG_USB_EHCI_TEGRA=y
43 44 CONFIG_USB_GADGET=y
44 45 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
45 46 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/p2571_defconfig
... ... @@ -33,6 +33,7 @@
33 33 CONFIG_USB=y
34 34 CONFIG_DM_USB=y
35 35 CONFIG_USB_EHCI_HCD=y
  36 +CONFIG_USB_EHCI_TEGRA=y
36 37 CONFIG_USB_GADGET=y
37 38 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
38 39 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/paz00_defconfig
... ... @@ -30,6 +30,7 @@
30 30 CONFIG_USB=y
31 31 CONFIG_DM_USB=y
32 32 CONFIG_USB_EHCI_HCD=y
  33 +CONFIG_USB_EHCI_TEGRA=y
33 34 CONFIG_USB_HOST_ETHER=y
34 35 CONFIG_USB_ETHER_ASIX=y
35 36 CONFIG_DM_VIDEO=y
configs/plutux_defconfig
... ... @@ -27,6 +27,7 @@
27 27 CONFIG_USB=y
28 28 CONFIG_DM_USB=y
29 29 CONFIG_USB_EHCI_HCD=y
  30 +CONFIG_USB_EHCI_TEGRA=y
30 31 CONFIG_USB_HOST_ETHER=y
31 32 CONFIG_USB_ETHER_SMSC95XX=y
configs/seaboard_defconfig
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_USB=y
33 33 CONFIG_DM_USB=y
34 34 CONFIG_USB_EHCI_HCD=y
  35 +CONFIG_USB_EHCI_TEGRA=y
35 36 CONFIG_USB_ULPI_VIEWPORT=y
36 37 CONFIG_USB_ULPI=y
37 38 CONFIG_USB_KEYBOARD=y
configs/tec-ng_defconfig
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_USB=y
33 33 CONFIG_DM_USB=y
34 34 CONFIG_USB_EHCI_HCD=y
  35 +CONFIG_USB_EHCI_TEGRA=y
35 36 CONFIG_USB_HOST_ETHER=y
36 37 CONFIG_USB_ETHER_SMSC95XX=y
configs/tec_defconfig
... ... @@ -32,6 +32,7 @@
32 32 CONFIG_USB=y
33 33 CONFIG_DM_USB=y
34 34 CONFIG_USB_EHCI_HCD=y
  35 +CONFIG_USB_EHCI_TEGRA=y
35 36 CONFIG_USB_HOST_ETHER=y
36 37 CONFIG_USB_ETHER_SMSC95XX=y
37 38 CONFIG_DM_VIDEO=y
configs/trimslice_defconfig
... ... @@ -38,6 +38,7 @@
38 38 CONFIG_USB=y
39 39 CONFIG_DM_USB=y
40 40 CONFIG_USB_EHCI_HCD=y
  41 +CONFIG_USB_EHCI_TEGRA=y
41 42 CONFIG_USB_HOST_ETHER=y
42 43 CONFIG_USB_ETHER_ASIX=y
configs/venice2_defconfig
... ... @@ -36,6 +36,7 @@
36 36 CONFIG_USB=y
37 37 CONFIG_DM_USB=y
38 38 CONFIG_USB_EHCI_HCD=y
  39 +CONFIG_USB_EHCI_TEGRA=y
39 40 CONFIG_USB_GADGET=y
40 41 CONFIG_USB_GADGET_MANUFACTURER="NVIDIA"
41 42 CONFIG_USB_GADGET_VENDOR_NUM=0x0955
configs/ventana_defconfig
... ... @@ -29,6 +29,7 @@
29 29 CONFIG_USB=y
30 30 CONFIG_DM_USB=y
31 31 CONFIG_USB_EHCI_HCD=y
  32 +CONFIG_USB_EHCI_TEGRA=y
32 33 CONFIG_USB_ULPI_VIEWPORT=y
33 34 CONFIG_USB_ULPI=y
34 35 CONFIG_USB_KEYBOARD=y
drivers/usb/host/Kconfig
... ... @@ -179,6 +179,12 @@
179 179 help
180 180 Enables support for the PCI-based EHCI controller.
181 181  
  182 +config USB_EHCI_TEGRA
  183 + bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
  184 + depends on TEGRA
  185 + ---help---
  186 + Enable support for Tegra on-chip EHCI USB controller
  187 +
182 188 config USB_EHCI_ZYNQ
183 189 bool "Support for Xilinx Zynq on-chip EHCI USB controller"
184 190 depends on ARCH_ZYNQ
include/configs/apalis-tk1.h
... ... @@ -27,9 +27,6 @@
27 27 #define CONFIG_SYS_MMC_ENV_DEV 0
28 28 #define CONFIG_SYS_MMC_ENV_PART 1
29 29  
30   -/* USB host support */
31   -#define CONFIG_USB_EHCI_TEGRA
32   -
33 30 /* PCI host support */
34 31 #undef CONFIG_PCI_SCAN_SHOW
35 32  
include/configs/apalis_t30.h
... ... @@ -24,9 +24,6 @@
24 24 #define CONFIG_SYS_MMC_ENV_DEV 0
25 25 #define CONFIG_SYS_MMC_ENV_PART 1
26 26  
27   -/* USB host support */
28   -#define CONFIG_USB_EHCI_TEGRA
29   -
30 27 /* PCI networking support */
31 28 #define CONFIG_E1000_NO_NVM
32 29  
include/configs/beaver.h
... ... @@ -33,9 +33,6 @@
33 33 #define CONFIG_SF_DEFAULT_SPEED 24000000
34 34 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
35 35  
36   -/* USB Host support */
37   -#define CONFIG_USB_EHCI_TEGRA
38   -
39 36 #include "tegra-common-usb-gadget.h"
40 37 #include "tegra-common-post.h"
41 38  
include/configs/cardhu.h
... ... @@ -37,9 +37,6 @@
37 37 #define CONFIG_SF_DEFAULT_SPEED 24000000
38 38 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
39 39  
40   -/* USB Host support */
41   -#define CONFIG_USB_EHCI_TEGRA
42   -
43 40 #include "tegra-common-post.h"
44 41  
45 42 #endif /* __CONFIG_H */
include/configs/cei-tk1-som.h
... ... @@ -32,9 +32,6 @@
32 32 #define CONFIG_SF_DEFAULT_SPEED 24000000
33 33 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
34 34  
35   -/* USB Host support */
36   -#define CONFIG_USB_EHCI_TEGRA
37   -
38 35 #include "tegra-common-usb-gadget.h"
39 36 #include "tegra-common-post.h"
40 37  
include/configs/colibri_t20.h
... ... @@ -17,10 +17,6 @@
17 17  
18 18 #define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2
19 19  
20   -/* USB host support */
21   -#define CONFIG_USB_EHCI_TEGRA
22   -#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
23   -
24 20 /* General networking support */
25 21 #define CONFIG_IP_DEFRAG
26 22 #define CONFIG_TFTP_BLOCKSIZE 1536
include/configs/colibri_t30.h
... ... @@ -26,9 +26,6 @@
26 26 #define CONFIG_SYS_MMC_ENV_DEV 0
27 27 #define CONFIG_SYS_MMC_ENV_PART 1
28 28  
29   -/* USB host support */
30   -#define CONFIG_USB_EHCI_TEGRA
31   -
32 29 /* General networking support */
33 30 #define CONFIG_IP_DEFRAG
34 31 #define CONFIG_TFTP_BLOCKSIZE 16352
include/configs/dalmore.h
... ... @@ -29,9 +29,6 @@
29 29 #define CONFIG_SF_DEFAULT_SPEED 24000000
30 30 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
31 31  
32   -/* USB Host support */
33   -#define CONFIG_USB_EHCI_TEGRA
34   -
35 32 #include "tegra-common-usb-gadget.h"
36 33 #include "tegra-common-post.h"
37 34  
include/configs/e2220-1170.h
... ... @@ -27,9 +27,6 @@
27 27 #define CONFIG_SF_DEFAULT_SPEED 24000000
28 28 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
29 29  
30   -/* USB2.0 Host support */
31   -#define CONFIG_USB_EHCI_TEGRA
32   -
33 30 #include "tegra-common-usb-gadget.h"
34 31 #include "tegra-common-post.h"
35 32  
include/configs/harmony.h
... ... @@ -32,9 +32,6 @@
32 32 /* Environment in NAND (which is 512M), aligned to start of last sector */
33 33 #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sector size */
34 34  
35   -/* USB Host support */
36   -#define CONFIG_USB_EHCI_TEGRA
37   -
38 35 #include "tegra-common-post.h"
39 36  
40 37 #endif /* __CONFIG_H */
include/configs/jetson-tk1.h
... ... @@ -28,9 +28,6 @@
28 28 #define CONFIG_SF_DEFAULT_SPEED 24000000
29 29 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
30 30  
31   -/* USB Host support */
32   -#define CONFIG_USB_EHCI_TEGRA
33   -
34 31 #include "tegra-common-usb-gadget.h"
35 32 #include "tegra-common-post.h"
36 33  
include/configs/medcom-wide.h
... ... @@ -25,9 +25,6 @@
25 25 /* Environment in NAND, aligned to start of last sector */
26 26 #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
27 27  
28   -/* USB host support */
29   -#define CONFIG_USB_EHCI_TEGRA
30   -
31 28 #include "tegra-common-post.h"
32 29  
33 30 #endif /* __CONFIG_H */
include/configs/nyan-big.h
... ... @@ -31,9 +31,6 @@
31 31 #define CONFIG_SF_DEFAULT_SPEED 24000000
32 32 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
33 33  
34   -/* USB Host support */
35   -#define CONFIG_USB_EHCI_TEGRA
36   -
37 34 #define CONFIG_KEYBOARD
38 35  
39 36 #undef CONFIG_LOADADDR
include/configs/p2371-0000.h
... ... @@ -27,9 +27,6 @@
27 27 #define CONFIG_SF_DEFAULT_SPEED 24000000
28 28 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
29 29  
30   -/* USB2.0 Host support */
31   -#define CONFIG_USB_EHCI_TEGRA
32   -
33 30 #include "tegra-common-usb-gadget.h"
34 31 #include "tegra-common-post.h"
35 32  
include/configs/p2371-2180.h
... ... @@ -27,9 +27,6 @@
27 27 #define CONFIG_SF_DEFAULT_SPEED 24000000
28 28 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
29 29  
30   -/* USB2.0 Host support */
31   -#define CONFIG_USB_EHCI_TEGRA
32   -
33 30 #include "tegra-common-usb-gadget.h"
34 31 #include "tegra-common-post.h"
35 32  
include/configs/p2571.h
... ... @@ -28,9 +28,6 @@
28 28 #define CONFIG_SF_DEFAULT_SPEED 24000000
29 29 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
30 30  
31   -/* USB2.0 Host support */
32   -#define CONFIG_USB_EHCI_TEGRA
33   -
34 31 #include "tegra-common-usb-gadget.h"
35 32 #include "tegra-common-post.h"
36 33  
include/configs/paz00.h
... ... @@ -26,9 +26,6 @@
26 26 #define CONFIG_SYS_MMC_ENV_DEV 0
27 27 #define CONFIG_SYS_MMC_ENV_PART 2
28 28  
29   -/* USB Host support */
30   -#define CONFIG_USB_EHCI_TEGRA
31   -
32 29 #include "tegra-common-post.h"
33 30  
34 31 #endif /* __CONFIG_H */
include/configs/plutux.h
... ... @@ -25,9 +25,6 @@
25 25 /* Environment in NAND, aligned to start of last sector */
26 26 #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
27 27  
28   -/* USB host support */
29   -#define CONFIG_USB_EHCI_TEGRA
30   -
31 28 #include "tegra-common-post.h"
32 29  
33 30 #endif /* __CONFIG_H */
include/configs/seaboard.h
... ... @@ -31,9 +31,6 @@
31 31 #define CONFIG_SYS_MMC_ENV_DEV 0
32 32 #define CONFIG_SYS_MMC_ENV_PART 2
33 33  
34   -/* USB Host support */
35   -#define CONFIG_USB_EHCI_TEGRA
36   -
37 34 /* Enable keyboard */
38 35 #define CONFIG_TEGRA_KEYBOARD
39 36 #define CONFIG_KEYBOARD
include/configs/tec-ng.h
... ... @@ -27,9 +27,6 @@
27 27 #define CONFIG_SF_DEFAULT_SPEED 24000000
28 28 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
29 29  
30   -/* USB Host support */
31   -#define CONFIG_USB_EHCI_TEGRA
32   -
33 30 /* Tag support */
34 31 #define CONFIG_CMDLINE_TAG
35 32 #define CONFIG_SETUP_MEMORY_TAGS
include/configs/tec.h
... ... @@ -25,9 +25,6 @@
25 25 /* Environment in NAND, aligned to start of last sector */
26 26 #define CONFIG_ENV_OFFSET (SZ_512M - SZ_128K) /* 128K sectors */
27 27  
28   -/* USB host support */
29   -#define CONFIG_USB_EHCI_TEGRA
30   -
31 28 #include "tegra-common-post.h"
32 29  
33 30 #endif /* __CONFIG_H */
include/configs/trimslice.h
... ... @@ -30,9 +30,6 @@
30 30 /* 1MiB flash, environment located as high as possible */
31 31 #define CONFIG_ENV_OFFSET (SZ_1M - CONFIG_ENV_SIZE)
32 32  
33   -/* USB Host support */
34   -#define CONFIG_USB_EHCI_TEGRA
35   -
36 33 #include "tegra-common-post.h"
37 34  
38 35 #endif /* __CONFIG_H */
include/configs/venice2.h
... ... @@ -28,9 +28,6 @@
28 28 #define CONFIG_SF_DEFAULT_SPEED 24000000
29 29 #define CONFIG_SPI_FLASH_SIZE (4 << 20)
30 30  
31   -/* USB Host support */
32   -#define CONFIG_USB_EHCI_TEGRA
33   -
34 31 #include "tegra-common-usb-gadget.h"
35 32 #include "tegra-common-post.h"
36 33  
include/configs/ventana.h
... ... @@ -24,9 +24,6 @@
24 24 #define CONFIG_SYS_MMC_ENV_DEV 0
25 25 #define CONFIG_SYS_MMC_ENV_PART 2
26 26  
27   -/* USB Host support */
28   -#define CONFIG_USB_EHCI_TEGRA
29   -
30 27 #include "tegra-common-post.h"
31 28  
32 29 #endif /* __CONFIG_H */