[U-Boot] [PATCH v2 04/13] omap5/am57xx/dra7xx: board: do not register usb devices when CONFIG_DM_USB is defined

[Vignesh R]

From: Mugunthan V N <mugunthanvnm at ti.com>

Do not register usb devices when CONFIG_DM_USB is defined.

Signed-off-by: Mugunthan V N <mugunthanvnm at ti.com>
Signed-off-by: Vignesh R <vigneshr at ti.com>
Reviewed-by: Simon Glass <sjg at chromium.org>
---
 board/ti/am57xx/board.c   | 2 +-
 board/ti/dra7xx/evm.c     | 2 +-
 board/ti/omap5_uevm/evm.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 808145526299..2b466dd6a39b 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -746,7 +746,7 @@ int spl_start_uboot(void)
 }
 #endif
 
-#ifdef CONFIG_USB_DWC3
+#if defined(CONFIG_USB_DWC3) && !defined(CONFIG_DM_USB)
 static struct dwc3_device usb_otg_ss2 = {
 	.maximum_speed = USB_SPEED_HIGH,
 	.base = DRA7_USB_OTG_SS2_BASE,
diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c
index da6bb7d2c7ba..1a72ff67c6df 100644
--- a/board/ti/dra7xx/evm.c
+++ b/board/ti/dra7xx/evm.c
@@ -712,7 +712,7 @@ int board_mmc_init(bd_t *bis)
 }
 #endif
 
-#ifdef CONFIG_USB_DWC3
+#if defined(CONFIG_USB_DWC3) && !defined(CONFIG_DM_USB)
 static struct dwc3_device usb_otg_ss1 = {
 	.maximum_speed = USB_SPEED_SUPER,
 	.base = DRA7_USB_OTG_SS1_BASE,
diff --git a/board/ti/omap5_uevm/evm.c b/board/ti/omap5_uevm/evm.c
index 7e7ce5925931..cf6fb6072554 100644
--- a/board/ti/omap5_uevm/evm.c
+++ b/board/ti/omap5_uevm/evm.c
@@ -60,7 +60,7 @@ struct tca642x_bank_info tca642x_init[] = {
 	  .configuration_reg = 0x40 },
 };
 
-#ifdef CONFIG_USB_DWC3
+#if defined(CONFIG_USB_DWC3) && !defined(CONFIG_DM_USB)
 static struct dwc3_device usb_otg_ss = {
 	.maximum_speed = USB_SPEED_SUPER,
 	.base = OMAP5XX_USB_OTG_SS_BASE,
-- 
2.13.0