Skip to contentSkip to conversation

Enable fastboot support for Poplar board

PATCH New Shawn Guo 3 participants 7 messages Dec 18, 2018 – Jan 16, 2019 Arm (32-bit)

lore
Share & tools
lore

Shawn Guo

author
#0 lore raw

cover Enable fastboot support for Poplar board

It enables DWC2 OTG gadget driver and fastboot support for Poplar board.

Shawn Guo (2):
poplar: add DWC2 OTG gadget support
poplar_defconfig: enable fastboot support

 .../asm/arch-hi3798cv200/hi3798cv200.h        |  5 ++++
 board/hisilicon/poplar/poplar.c               | 28 +++++++++++++++++++
 configs/poplar_defconfig                      | 14 ++++++++++
 3 files changed, 47 insertions(+)
Signature · 1 line
2.18.0
author
#1 lore raw

PATCH 1/2 poplar: add DWC2 OTG gadget support

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().

---
 .../asm/arch-hi3798cv200/hi3798cv200.h        |  5 ++++
 board/hisilicon/poplar/poplar.c               | 28 +++++++++++++++++++
 2 files changed, 33 insertions(+)
arch/arm/include/asm/arch-hi3798cv200/hi3798cv200.h +5 -0
index f97b1eb29f84..bb221e17e0ed 100644
@@ -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)
board/hisilicon/poplar/poplar.c +28 -0
index e1fbd5d0c669..af018ad2f8e4 100644
@@ -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();
Signature · 1 line
2.18.0
#2 lore raw

PATCH 1/2 poplar: add DWC2 OTG gadget support

Quoted 5 lines · Shawn Guo

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().

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190115/6501cf8f/attachment.sig>
author
#3 lore raw

PATCH 2/2 poplar_defconfig: enable fastboot support

In reply to Shawn Guo

It enables fastboot support on Poplar board by using DWC2 OTG gadget driver.

---
 configs/poplar_defconfig | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
configs/poplar_defconfig +14 -0
index 946e7caf6bea..48e9c6eaac26 100644
@@ -6,6 +6,13 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_NR_DRAM_BANKS=2
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="poplar# "
+CONFIG_FASTBOOT=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_CMD_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x20000000
+CONFIG_FASTBOOT_BUF_SIZE=0x10000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_CMD_MMC=y
 CONFIG_CMD_USB=y
 # CONFIG_ISO_PARTITION is not set
@@ -18,6 +25,13 @@ CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DWC2_OTG=y
+CONFIG_USB_GADGET_DWC2_OTG_PHY_BUS_WIDTH_8=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_GADGET_MANUFACTURER="HiSilicon"
+CONFIG_USB_GADGET_VENDOR_NUM=0x18d1
+CONFIG_USB_GADGET_PRODUCT_NUM=0xd00d
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_FAT_WRITE=y
Signature · 1 line
2.18.0
#4 lore raw

PATCH 2/2 poplar_defconfig: enable fastboot support

Quoted 4 lines · Shawn Guo

It enables fastboot support on Poplar board by using DWC2 OTG gadget driver.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190115/f647f65e/attachment.sig>
#5 lore raw

cover Enable fastboot support for Poplar board

In reply to Shawn Guo
Quoted 6 lines · Shawn Guo

It enables DWC2 OTG gadget driver and fastboot support for Poplar board.

Shawn Guo (2):
poplar: add DWC2 OTG gadget support
poplar_defconfig: enable fastboot support

Hi Tom,

Are you okay with these two patches?

Shawn

#6 lore raw

cover Enable fastboot support for Poplar board

Quoted 11 lines · Shawn Guo
Quoted 6 lines · Shawn Guo

It enables DWC2 OTG gadget driver and fastboot support for Poplar board.

Shawn Guo (2):
poplar: add DWC2 OTG gadget support
poplar_defconfig: enable fastboot support

Hi Tom,

Are you okay with these two patches?

Yes, but I'll pick them up once the merge window opens again.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190114/df2f8a39/attachment.sig>