u-boot.lists.denx.de archive mirror
 help / color / mirror / Atom feed
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 06/17] Convert CONFIG_USB_XHCI_OMAP to Kconfig
Date: Sun, 12 Sep 2021 20:32:22 -0400	[thread overview]
Message-ID: <20210913003233.4125-6-trini@konsulko.com> (raw)
In-Reply-To: <20210913003233.4125-1-trini@konsulko.com>

This converts the following to Kconfig:
   CONFIG_USB_XHCI_OMAP

Signed-off-by: Tom Rini <trini@konsulko.com>
---
 configs/am43xx_evm_defconfig              |  1 +
 configs/am43xx_evm_qspiboot_defconfig     |  1 +
 configs/am43xx_evm_rtconly_defconfig      |  1 +
 configs/am43xx_evm_usbhost_boot_defconfig |  1 +
 configs/am43xx_hs_evm_defconfig           |  1 +
 configs/am57xx_evm_defconfig              |  1 +
 configs/am57xx_hs_evm_defconfig           |  1 +
 configs/am57xx_hs_evm_usb_defconfig       |  1 +
 configs/cm_t43_defconfig                  |  1 +
 configs/dra7xx_evm_defconfig              |  1 +
 configs/dra7xx_hs_evm_defconfig           |  1 +
 configs/dra7xx_hs_evm_usb_defconfig       |  1 +
 drivers/usb/host/Kconfig                  | 10 ++++++++++
 include/configs/am43xx_evm.h              |  1 -
 include/configs/am57xx_evm.h              |  3 ---
 include/configs/cm_t43.h                  |  3 ---
 include/configs/dra7xx_evm.h              |  3 ---
 17 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index d7b12f2c7b9b..b60090d4c3c1 100644
--- 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 6e593ef8f0c2..31b564b7ba9f 100644
--- 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 8b1792bd3028..a4450cc0d90b 100644
--- 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 8ee16a2572b9..9efeccc1e553 100644
--- 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 7e4bb34a0a49..f34013053fea 100644
--- 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 097518256849..9a038a6bc693 100644
--- 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 e07f6cfe1a2b..0a99df487e15 100644
--- 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 6cb8d0ea0f07..dbbe18d51b8d 100644
--- 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 eea9a74d3486..45b41d3fcaf7 100644
--- 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 53e4d82795eb..11dc022b6cc8 100644
--- 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 59d5a912cde9..c231991ea583 100644
--- 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 1e3a82511e49..09aa07379a8b 100644
--- 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 8957bb56a6be..e04cf9411ae5 100644
--- 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 a52b476976f2..00426597ee57 100644
--- 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 b8099995d74b..956844414f86 100644
--- 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 cd21c8de1f2f..fb6d8cfbf31a 100644
--- 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 42583e757618..361ee9663dbb 100644
--- 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
 
-- 
2.17.1


  parent reply	other threads:[~2021-09-13  0:34 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-13  0:32 [PATCH 01/17] am335x_guardian: Enable SPL_OF_CONTROL Tom Rini
2021-09-13  0:32 ` [PATCH 02/17] am335x_boneblack_vboot: " Tom Rini
2021-09-13  0:32 ` [PATCH 03/17] am335x: Remove legacy non-DM_USB code Tom Rini
2021-09-13  0:32 ` [PATCH 04/17] keystone2: Move CONFIG_AEMIF_CNTRL_BASE out of CONFIG namespace Tom Rini
2021-09-28 23:20   ` Tom Rini
2021-09-13  0:32 ` [PATCH 05/17] usb: phy: ti: Remove non-DM PHY code Tom Rini
2021-09-28 23:20   ` Tom Rini
2021-09-13  0:32 ` Tom Rini [this message]
2021-09-28 23:20   ` [PATCH 06/17] Convert CONFIG_USB_XHCI_OMAP to Kconfig Tom Rini
2021-09-13  0:32 ` [PATCH 07/17] compulab: Clean up some unused symbols Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 08/17] ti: keystone: Clean up or migrate some NAND related options Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 09/17] ti: keystone: dma: Migrate to Kconfig Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 10/17] omapl138_lcdk: Stop using CONFIG_MACH_OMAPL138_LCDK Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 11/17] usb: ehci-omap: Drop non-DM_USB legacy code Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 12/17] Convert CONFIG_OMAP_EHCI_PHY1_RESET_GPIO et al to Kconfig Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 13/17] am3517_evm: Remove unused comments/code Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 14/17] omap3_logic: " Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 15/17] omap4_panda: " Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 16/17] ti: keystone: Move away from CONFIG_SOC_KEYSTONE Tom Rini
2021-09-28 23:21   ` Tom Rini
2021-09-13  0:32 ` [PATCH 17/17] ti: keystone: Migrate CONFIG_SOC_K2* to Kconfig Tom Rini
2021-09-28 23:21   ` Tom Rini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210913003233.4125-6-trini@konsulko.com \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).