Convert CONFIG_USB_XHCI_OMAP to Kconfig

This converts the following to Kconfig:
   CONFIG_USB_XHCI_OMAP

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index d7b12f2c7b9bc633a01226321f43b8d5e7a823e2..b60090d4c3c19395a91b815ac1b8ea7dc4219534 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -78,6 +78,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y

diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
index 6e593ef8f0c25bd17d0ee5a0bd8638e782e0914b..31b564b7ba9f32bb24069d4d326d4d82dfe251aa 100644 (file)
--- a/configs/am43xx_evm_qspiboot_defconfig
+++ b/configs/am43xx_evm_qspiboot_defconfig
@@ -57,6 +57,7 @@ CONFIG_TI_QSPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y

diff --git a/configs/am43xx_evm_rtconly_defconfig b/configs/am43xx_evm_rtconly_defconfig
index 8b1792bd30284d35f8a391e9ab981a42c8561641..a4450cc0d90bf9c1d7fe25e4ba9ce1c6cc259b47 100644 (file)
--- a/configs/am43xx_evm_rtconly_defconfig
+++ b/configs/am43xx_evm_rtconly_defconfig
@@ -60,6 +60,7 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y

diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index 8ee16a2572b974d9e52e3b58f329697447505efc..9efeccc1e5537a002334711858103661c70dc131 100644 (file)
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -79,6 +79,7 @@ CONFIG_OMAP_TIMER=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y

diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index 7e4bb34a0a49922d27b83cb528bca1c7f122e913..f34013053fea2d0c6eaeaa1aa275363f3fa16c27 100644 (file)
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -83,6 +83,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y

diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig
index 097518256849b0a7a72d322b42a2c53372794c5d..9a038a6bc69332454b005262d22d9944051b0833 100644 (file)
--- a/configs/am57xx_evm_defconfig
+++ b/configs/am57xx_evm_defconfig
@@ -108,6 +108,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y

diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig
index e07f6cfe1a2bbc5e3b06cd868d488ef23ad0f1a9..0a99df487e1506b75ec0b7508829090f4a62ee34 100644 (file)
--- a/configs/am57xx_hs_evm_defconfig
+++ b/configs/am57xx_hs_evm_defconfig
@@ -104,6 +104,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y

diff --git a/configs/am57xx_hs_evm_usb_defconfig b/configs/am57xx_hs_evm_usb_defconfig
index 6cb8d0ea0f070f0502af778e8239deb4f7040ab8..dbbe18d51b8d899e37dd173c96444ade5728b4fe 100644 (file)
--- a/configs/am57xx_hs_evm_usb_defconfig
+++ b/configs/am57xx_hs_evm_usb_defconfig
@@ -112,6 +112,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y

diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index eea9a74d34864196edd4e721188e97b6a176883a..45b41d3fcaf724b2f0e03839869c8098e8300bbc 100644 (file)
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -91,3 +91,4 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y

diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig
index 53e4d82795eb704991991cd8c2231c8aafdf2cf1..11dc022b6cc896b56304a8b553e3c228eefc69b3 100644 (file)
--- a/configs/dra7xx_evm_defconfig
+++ b/configs/dra7xx_evm_defconfig
@@ -124,6 +124,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y

diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig
index 59d5a912cde94f17b2fa3e0a30340099a4d9493f..c231991ea5835e36e577dfc63917182ab11058e4 100644 (file)
--- a/configs/dra7xx_hs_evm_defconfig
+++ b/configs/dra7xx_hs_evm_defconfig
@@ -127,6 +127,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_GENERIC=y

diff --git a/configs/dra7xx_hs_evm_usb_defconfig b/configs/dra7xx_hs_evm_usb_defconfig
index 1e3a82511e4964f73abb20d0a276a9e4887ab885..09aa07379a8badb37bf47b1a604014c0f03ba03d 100644 (file)
--- a/configs/dra7xx_hs_evm_usb_defconfig
+++ b/configs/dra7xx_hs_evm_usb_defconfig
@@ -121,6 +121,7 @@ CONFIG_DM_USB_GADGET=y
 CONFIG_SPL_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_XHCI_OMAP=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_GADGET=y

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 8957bb56a6be734937e474bd28be78f9befd6b7a..e04cf9411ae5d8fde76911424db1e84bf0d79b92 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -57,6 +57,16 @@ config USB_XHCI_OCTEON
          family SoCs. This is a driver for the dwc3 to provide the glue logic
          to configure the controller.
 
+config USB_XHCI_OMAP
+       bool "Support for TI OMAP family xHCI USB controller"
+       depends on ARCH_OMAP2PLUS
+       help
+         Enables support for the on-chip xHCI controller found on some TI SoC
+         families.  Note that some families have multiple contollers while
+         others only have something such as DesignWare-based controllers.
+         Consult the SoC documentation to determine if this option applies
+         to your hardware.
+
 config USB_XHCI_PCI
        bool "Support for PCI-based xHCI USB controller"
        depends on DM_USB

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index a52b476976f2e04d25d55fa4b2c57ea84dad0275..00426597ee57a896b0c4d507cb5327f0c906efcc 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -54,7 +54,6 @@
 
 #if defined(CONFIG_SPL_USB_HOST) || !defined(CONFIG_SPL_BUILD)
 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION              1
-#define CONFIG_USB_XHCI_OMAP
 #endif
 
 #if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_GADGET)

diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h
index b8099995d74b1ee8c433aff884ff30b5ed45c599..956844414f86389e42bc45554db822dd248a94ff 100644 (file)
--- a/include/configs/am57xx_evm.h
+++ b/include/configs/am57xx_evm.h
@@ -48,9 +48,6 @@
 #define CONFIG_NET_RETRY_COUNT         10
 #define PHY_ANEG_TIMEOUT       8000    /* PHY needs longer aneg time at 1G */
 
-/* USB xHCI HOST */
-#define CONFIG_USB_XHCI_OMAP
-
 /* SATA */
 #define CONFIG_SCSI_AHCI_PLAT
 #define CONFIG_SYS_SCSI_MAX_SCSI_ID    1

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index cd21c8de1f2f57aa220f27a1836220dd29563ff2..fb6d8cfbf31aa1ec09c3052ba83cb18c92ce5ccb 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -45,9 +45,6 @@
 /* CPSW Ethernet support */
 #define CONFIG_SYS_RX_ETH_BUFFER       64
 
-/* USB support */
-#define CONFIG_USB_XHCI_OMAP
-
 /* Power */
 #define CONFIG_POWER_TPS65218
 

diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 42583e75761854054b6b4f934696c29bd6cf3245..361ee9663dbb9a090933a895d81d101bf1676e48 100644 (file)
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -74,9 +74,6 @@
 
 /* SPI SPL */
 
-/* USB xHCI HOST */
-#define CONFIG_USB_XHCI_OMAP
-
 /* SATA */
 #define CONFIG_SCSI_AHCI_PLAT