diff mbox series

[1/2] poplar: add DWC2 OTG gadget support

Message ID 20181218095207.11620-2-shawn.guo@linaro.org
State Accepted
Commit e7ab6dfc65f3656bf0df9e818dc12ad33be26d44
Headers show
Series Enable fastboot support for Poplar board | expand

Commit Message

Shawn Guo Dec. 18, 2018, 9:52 a.m. UTC 
It enables DWC2 OTG gadget driver support for Poplar board.  As
usb2_phy_init() is being always called from board_init(), we can save
the call from board_usb_init().

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
 .../asm/arch-hi3798cv200/hi3798cv200.h        |  5 ++++
 board/hisilicon/poplar/poplar.c               | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)

Comments

Tom Rini Jan. 16, 2019, 2:40 a.m. UTC | #1 
On Tue, Dec 18, 2018 at 05:52:06PM +0800, Shawn Guo wrote:

> It enables DWC2 OTG gadget driver support for Poplar board.  As

> usb2_phy_init() is being always called from board_init(), we can save

> the call from board_usb_init().

> 

> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>


Applied to u-boot/master, thanks!

-- 
Tom
diff mbox series

Patch

diff --git a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h
index f97b1eb29f84..bb221e17e0ed 100644
--- a/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h
+++ b/arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h
@@ -13,11 +13,16 @@ 
 /* DEVICES */
 #define REG_BASE_MCI			0xF9830000
 #define REG_BASE_UART0			0xF8B00000
+#define HIOTG_BASE_ADDR			0xF98C0000
 
 /* PERI control registers (4KB) */
 	/* USB2 PHY01 configuration register */
 #define PERI_CTRL_USB0			(REG_BASE_PERI_CTRL + 0x120)
 
+	/* USB2 controller configuration register */
+#define PERI_CTRL_USB3			(REG_BASE_PERI_CTRL + 0x12c)
+#define USB2_2P_CHIPID			(1 << 28)
+
 /* PERI CRG registers (4KB) */
 	/* USB2 CTRL0 clock and soft reset */
 #define PERI_CRG46			(REG_BASE_CRG + 0xb8)
diff --git a/board/hisilicon/poplar/poplar.c b/board/hisilicon/poplar/poplar.c
index e1fbd5d0c669..af018ad2f8e4 100644
--- a/board/hisilicon/poplar/poplar.c
+++ b/board/hisilicon/poplar/poplar.c
@@ -168,6 +168,34 @@  int board_mmc_init(bd_t *bis)
 }
 #endif
 
+#if defined(CONFIG_USB_GADGET) && defined(CONFIG_USB_GADGET_DWC2_OTG)
+#include <usb.h>
+#include <usb/dwc2_udc.h>
+#include <g_dnl.h>
+
+static struct dwc2_plat_otg_data poplar_otg_data = {
+	.regs_otg = HIOTG_BASE_ADDR
+};
+
+static void set_usb_to_device(void)
+{
+	setbits_le32(PERI_CTRL_USB3, USB2_2P_CHIPID);
+}
+
+int board_usb_init(int index, enum usb_init_type init)
+{
+	set_usb_to_device();
+	return dwc2_udc_probe(&poplar_otg_data);
+}
+
+int g_dnl_bind_fixup(struct usb_device_descriptor *dev, const char *name)
+{
+	if (!env_get("serial#"))
+		g_dnl_set_serialnumber("0123456789POPLAR");
+	return 0;
+}
+#endif
+
 int board_init(void)
 {
 	usb2_phy_init();