From: Vignesh R <vigneshr@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 03/11] am437x: board: do not register usb devices when CONFIG_DM_USB is defined
Date: Tue, 23 May 2017 17:25:38 +0530 [thread overview]
Message-ID: <20170523115546.399-4-vigneshr@ti.com> (raw)
In-Reply-To: <20170523115546.399-1-vigneshr@ti.com>
From: Mugunthan V N <mugunthanvnm@ti.com>
Do not register usb devices when CONFIG_DM_USB is define.
Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: Vignesh R <vigneshr@ti.com>
---
board/ti/am43xx/board.c | 10 ++--------
configs/am43xx_evm_usbhost_boot_defconfig | 1 +
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c
index 3797ac2adabb..f6b36949f756 100644
--- a/board/ti/am43xx/board.c
+++ b/board/ti/am43xx/board.c
@@ -624,7 +624,7 @@ int board_late_init(void)
}
#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_HIGH,
.base = USB_OTG_SS1_BASE,
@@ -660,13 +660,10 @@ static struct ti_usb_phy_device usb_phy2_device = {
.usb2_phy_power = (void *)USB2_PHY2_POWER,
.index = 1,
};
-#endif /* CONFIG_USB_DWC3 */
-#if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP)
int omap_xhci_board_usb_init(int index, enum usb_init_type init)
{
enable_usb_clocks(index);
-#ifdef CONFIG_USB_DWC3
switch (index) {
case 0:
if (init == USB_INIT_DEVICE) {
@@ -689,14 +686,12 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init)
default:
printf("Invalid Controller Index\n");
}
-#endif
return 0;
}
int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
{
-#ifdef CONFIG_USB_DWC3
switch (index) {
case 0:
case 1:
@@ -709,12 +704,11 @@ int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init)
default:
printf("Invalid Controller Index\n");
}
-#endif
disable_usb_clocks(index);
return 0;
}
-#endif /* defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) */
+#endif /* defined(CONFIG_USB_DWC3) && !defined(CONFIG_DM_USB) */
#ifdef CONFIG_DRIVER_TI_CPSW
diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
index a98a97fa427c..89d2ba8d8315 100644
--- a/configs/am43xx_evm_usbhost_boot_defconfig
+++ b/configs/am43xx_evm_usbhost_boot_defconfig
@@ -69,6 +69,7 @@ CONFIG_USB_DWC3_PHY_OMAP=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_SPL_USB_GADGET_SUPPORT=y
CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
CONFIG_G_DNL_VENDOR_NUM=0x0403
CONFIG_G_DNL_PRODUCT_NUM=0xbd00
--
2.13.0
next prev parent reply other threads:[~2017-05-23 11:55 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 11:55 [U-Boot] [PATCH 00/11] driver model bring-up of dwc3 usb peripheral Vignesh R
2017-05-23 11:55 ` [U-Boot] [PATCH 01/11] drivers: usb: dwc3: remove devm_zalloc from linux_compact Vignesh R
2017-05-31 3:50 ` Simon Glass
2017-05-23 11:55 ` [U-Boot] [PATCH 02/11] drivers: usb: dwc3-omap: move usb_gadget_handle_interrupts from board files to drivers Vignesh R
2017-05-31 3:50 ` Simon Glass
2017-05-23 11:55 ` Vignesh R [this message]
2017-05-31 3:50 ` [U-Boot] [PATCH 03/11] am437x: board: do not register usb devices when CONFIG_DM_USB is defined Simon Glass
2017-05-23 11:55 ` [U-Boot] [PATCH 04/11] omap5/am57xx/dra7xx: " Vignesh R
2017-05-31 3:50 ` Simon Glass
2017-05-23 11:55 ` [U-Boot] [PATCH 05/11] drivers: usb: dwc3: add ti dwc3 misc driver for wrapper Vignesh R
2017-05-31 3:50 ` Simon Glass
2017-05-31 5:06 ` Vignesh R
2017-05-31 5:06 ` Vignesh R
2017-05-23 11:55 ` [U-Boot] [PATCH 06/11] drivers: usb: common: add support to get maximum speed from dt Vignesh R
2017-05-31 3:50 ` Simon Glass
2017-05-23 11:55 ` [U-Boot] [PATCH 07/11] drivers: usb: dwc3: add ti dwc3 peripheral driver with driver model support Vignesh R
2017-05-23 11:55 ` [U-Boot] [PATCH 08/11] dwc3: Add support for USB device boot Vignesh R
2017-05-31 3:50 ` Simon Glass
2017-05-31 6:03 ` Vignesh R
2017-05-23 11:55 ` [U-Boot] [PATCH 09/11] am43xx: Add USB device boot support Vignesh R
2017-05-23 11:55 ` [U-Boot] [PATCH 10/11] configs: am43xx: Enable configs to support USB device boot Vignesh R
2017-05-23 11:55 ` [U-Boot] [PATCH 11/11] ARM: am437x-gp-evm-u-boot.dtsi: Enable nodes for " Vignesh R
2017-05-24 4:25 ` Lokesh Vutla
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=20170523115546.399-4-vigneshr@ti.com \
--to=vigneshr@ti.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