Skip to contentSkip to conversation

rock-pi-4: Enable USB3 Host

PATCH In review Jagan Teki 2 participants 9 messages Jul 7, 2020 – Jul 18, 2020 Arm Rockchip

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH v3 1/6 rock-pi-4: Enable USB3 Host

Enable USB3.0 Host support for RockPI-4 boards.

Note that the Upper USB3.0 port is marked as otg and lower USB3.0 port marked as host, so this below log capture when USB3.0 mass storage plug in at lower USB 3.0 port.

Log:
Bus usb@fe380000: USB EHCI 1.00
Bus usb@fe3c0000: USB EHCI 1.00
Bus dwc3: usb maximum-speed not found
Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.10
Bus dwc3: usb maximum-speed not found
Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.10
scanning bus usb@fe380000 for devices... 1 USB Device(s) found scanning bus usb@fe3c0000 for devices... 1 USB Device(s) found scanning bus dwc3 for devices... 1 USB Device(s) found scanning bus dwc3 for devices... cannot reset port 1!?
2 USB Device(s) found
scanning usb for storage devices... 1 Storage Device(s) found
=> usb tree
USB device tree:
1 Hub (480 Mb/s, 0mA)
u-boot EHCI Host Controller

1 Hub (480 Mb/s, 0mA)
u-boot EHCI Host Controller

1 Hub (5 Gb/s, 0mA)
U-Boot XHCI Host Controller

1 Hub (5 Gb/s, 0mA)
| U-Boot XHCI Host Controller
|
+-2 Mass Storage (5 Gb/s, 224mA)

       SanDisk Dual Drive 040130e3ee554b7078843f4eb331646

---
Changes for v3:
- collect kever review tag

 configs/rock-pi-4-rk3399_defconfig | 6 ++++++
 1 file changed, 6 insertions(+)
configs/rock-pi-4-rk3399_defconfig +6 -0
index 0d86fdc895..2487872219 100644
@@ -28,6 +28,7 @@ CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ROCKCHIP_GPIO=y
 CONFIG_SYS_I2C_ROCKCHIP=y
+CONFIG_MISC=y
 CONFIG_MMC_DW=y
 CONFIG_MMC_DW_ROCKCHIP=y
 CONFIG_MMC_SDHCI=y
@@ -35,11 +36,14 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_PHY_ROCKCHIP_INNO_USB2=y
+CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PMIC_RK8XX=y
 CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_RK8XX=y
 CONFIG_PWM_ROCKCHIP=y
 CONFIG_RAM_RK3399_LPDDR4=y
+CONFIG_DM_RESET=y
 CONFIG_BAUDRATE=1500000
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYSRESET=y
@@ -48,6 +52,8 @@ CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
Signature · 1 line
2.25.1
author
#1 lore raw

PATCH v3 2/6 rock-pi-4: Enable PCI/NVME

Enable PCI/NVME for M.2 Slot on RockPI-4 boards.

=> nvme info
Device 0: Vendor: 0x144d Rev: 2B2QEXM7 Prod: S4EUNG0MC10012Y
Type: Hard Disk
Capacity: 238475.1 MB = 232.8 GB (488397168 x 512)

---
Changes for v3:
- collect kever review tag

 configs/rock-pi-4-rk3399_defconfig | 3 +++
 1 file changed, 3 insertions(+)
configs/rock-pi-4-rk3399_defconfig +3 -0
index 2487872219..f3eeef0293 100644
@@ -18,6 +18,7 @@ CONFIG_TPL=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPT=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_PCI=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_TIME=y
@@ -36,6 +37,8 @@ CONFIG_MMC_SDHCI_ROCKCHIP=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
 CONFIG_GMAC_ROCKCHIP=y
+CONFIG_NVME=y
+CONFIG_PCI=y
 CONFIG_PHY_ROCKCHIP_INNO_USB2=y
 CONFIG_PHY_ROCKCHIP_TYPEC=y
 CONFIG_PMIC_RK8XX=y
Signature · 1 line
2.25.1
author
#2 lore raw

PATCH v3 3/6 rock-pi-4: Enable USB Gadget

In reply to Jagan Teki

Enable USB gadget for rock-pi-4 boards.

This would help to use fastboot by default.

Note: Connect the Host USB cable (Port A or C) to rock-pi-4 Upper USB 3.0 port.

---
Changes for v3:
- collect kever review tag

 configs/rock-pi-4-rk3399_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/rock-pi-4-rk3399_defconfig +2 -0
index f3eeef0293..a4b322074c 100644
@@ -8,6 +8,7 @@ CONFIG_NR_DRAM_BANKS=1
 CONFIG_DEBUG_UART_BASE=0xFF1A0000
 CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4.dtb"
 CONFIG_MISC_INIT_R=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
@@ -57,6 +58,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_GADGET=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
Signature · 1 line
2.25.1
author
#3 lore raw

PATCH v3 4/6 rock-pi-4: Enable HDMI output

In reply to Jagan Teki

Enable config options to get HDMI output on RockPI-4 boards.

---
Changes for v3:
- fix configs

 configs/rock-pi-4-rk3399_defconfig | 5 +++++
 1 file changed, 5 insertions(+)
configs/rock-pi-4-rk3399_defconfig +5 -0
index a4b322074c..98f71a50a5 100644
@@ -58,6 +58,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_KEYBOARD=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
@@ -65,5 +66,9 @@ CONFIG_USB_ETHER_ASIX88179=y
 CONFIG_USB_ETHER_MCS7830=y
 CONFIG_USB_ETHER_RTL8152=y
 CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
 CONFIG_SPL_TINY_MEMSET=y
 CONFIG_ERRNO_STR=y
Signature · 1 line
2.25.1
Reviewed-by on v3 4/6
#4 lore raw

Re: [PATCH v3 4/6] rock-pi-4: Enable HDMI output

Quoted 3 lines · Jagan Teki

Enable config options to get HDMI output on RockPI-4 boards.

Thanks,
- Kever

Quoted 29 lines

---
Changes for v3:
- fix configs

  configs/rock-pi-4-rk3399_defconfig | 5 +++++
  1 file changed, 5 insertions(+)
configs/rock-pi-4-rk3399_defconfig +5 -0
index a4b322074c..98f71a50a5 100644
@@ -58,6 +58,7 @@ CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_GENERIC=y
  CONFIG_USB_DWC3=y
  CONFIG_USB_DWC3_GENERIC=y
+CONFIG_USB_KEYBOARD=y
  CONFIG_USB_GADGET=y
  CONFIG_USB_HOST_ETHER=y
  CONFIG_USB_ETHER_ASIX=y
@@ -65,5 +66,9 @@ CONFIG_USB_ETHER_ASIX88179=y
  CONFIG_USB_ETHER_MCS7830=y
  CONFIG_USB_ETHER_RTL8152=y
  CONFIG_USB_ETHER_SMSC95XX=y
+CONFIG_DM_VIDEO=y
+CONFIG_DISPLAY=y
+CONFIG_VIDEO_ROCKCHIP=y
+CONFIG_DISPLAY_ROCKCHIP_HDMI=y
  CONFIG_SPL_TINY_MEMSET=y
  CONFIG_ERRNO_STR=y
author
#5 lore raw

PATCH v3 5/6 roc-rk3399-pc: Enable USB Gadget

In reply to Jagan Teki

Enable DWC3 core, gadget for roc-rk3399-pc board.

This would help to use fastboot by default.

---
Changes for v3:
- collect kever review tag

 configs/roc-pc-mezzanine-rk3399_defconfig | 3 +++
 configs/roc-pc-rk3399_defconfig           | 3 +++
 2 files changed, 6 insertions(+)
configs/roc-pc-mezzanine-rk3399_defconfig +3 -0
index b3c8f19e43..b2c370cc59 100644
@@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-mezzanine.dtb"
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
@@ -65,7 +66,9 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_ROCKCHIP_USB2_PHY=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_USB_GADGET=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
configs/roc-pc-rk3399_defconfig +3 -0
index edb327b46b..588d03952a 100644
@@ -13,6 +13,7 @@ CONFIG_DEBUG_UART_CLOCK=24000000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
 CONFIG_DEBUG_UART=y
+# CONFIG_ANDROID_BOOT_IMAGE is not set
 CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc.dtb"
 CONFIG_DISPLAY_BOARDINFO_LATE=y
 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
@@ -62,7 +63,9 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_GENERIC=y
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_GENERIC=y
+CONFIG_ROCKCHIP_USB2_PHY=y
 CONFIG_USB_KEYBOARD=y
+CONFIG_USB_GADGET=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_ASIX88179=y
Signature · 1 line
2.25.1
author
#6 lore raw

PATCH v3 6/6 roc-rk3399-pc: Update ENV offset, size

In reply to Jagan Teki

Adjust the ENV offset, size to fit into all images on 16MB flash.

---
Changes for v3:
- fix configs

 configs/roc-pc-mezzanine-rk3399_defconfig | 4 ++--
 configs/roc-pc-rk3399_defconfig           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
configs/roc-pc-mezzanine-rk3399_defconfig +2 -2
index b2c370cc59..f15dddc684 100644
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
-CONFIG_ENV_SIZE=0x6000
-CONFIG_ENV_OFFSET=0x460000
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
configs/roc-pc-rk3399_defconfig +2 -2
index 588d03952a..9ffde7f960 100644
@@ -1,8 +1,8 @@
 CONFIG_ARM=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_SYS_TEXT_BASE=0x00200000
-CONFIG_ENV_SIZE=0x6000
-CONFIG_ENV_OFFSET=0x460000
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000
 CONFIG_ENV_SECT_SIZE=0x1000
 CONFIG_SPL_DM_SPI=y
 CONFIG_ROCKCHIP_RK3399=y
Signature · 1 line
2.25.1
Reviewed-by on v3 6/6
#7 lore raw

Re: [PATCH v3 6/6] roc-rk3399-pc: Update ENV offset, size

Quoted 4 lines · Jagan Teki

Adjust the ENV offset, size to fit into all images on 16MB flash.

Thanks,
- Kever

Quoted 38 lines

---
Changes for v3:
- fix configs

  configs/roc-pc-mezzanine-rk3399_defconfig | 4 ++--
  configs/roc-pc-rk3399_defconfig           | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
configs/roc-pc-mezzanine-rk3399_defconfig +2 -2
index b2c370cc59..f15dddc684 100644
@@ -1,8 +1,8 @@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
-CONFIG_ENV_SIZE=0x6000
-CONFIG_ENV_OFFSET=0x460000
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SPL_DM_SPI=y
  CONFIG_ROCKCHIP_RK3399=y
configs/roc-pc-rk3399_defconfig +2 -2
index 588d03952a..9ffde7f960 100644
@@ -1,8 +1,8 @@
  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000
-CONFIG_ENV_SIZE=0x6000
-CONFIG_ENV_OFFSET=0x460000
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000
  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SPL_DM_SPI=y
  CONFIG_ROCKCHIP_RK3399=y
#8 lore raw

Re: [PATCH v3 6/6] roc-rk3399-pc: Update ENV offset, size

Quoted 7 lines · Kever Yang
Quoted 4 lines · Jagan Teki

Adjust the ENV offset, size to fit into all images on 16MB flash.

Applied to u-boot-rockchip master for this patch set, thanks.

Quoted 45 lines

Thanks,
- Kever

Quoted 38 lines

---
Changes for v3:
- fix configs

  configs/roc-pc-mezzanine-rk3399_defconfig | 4 ++-- configs/roc-pc-rk3399_defconfig           | 4 ++--

  2 files changed, 4 insertions(+), 4 deletions(-)
configs/roc-pc-mezzanine-rk3399_defconfig +0 -0
index b2c370cc59..f15dddc684 100644
@@ -1,8 +1,8 @@

  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000

configs/roc-pc-mezzanine-rk3399_defconfig +2 -2
-CONFIG_ENV_SIZE=0x6000
-CONFIG_ENV_OFFSET=0x460000
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000

  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SPL_DM_SPI=y
  CONFIG_ROCKCHIP_RK3399=y

configs/roc-pc-rk3399_defconfig +0 -0
index 588d03952a..9ffde7f960 100644
@@ -1,8 +1,8 @@

  CONFIG_ARM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_SYS_TEXT_BASE=0x00200000

configs/roc-pc-rk3399_defconfig +2 -2
-CONFIG_ENV_SIZE=0x6000
-CONFIG_ENV_OFFSET=0x460000
+CONFIG_ENV_SIZE=0x8000
+CONFIG_ENV_OFFSET=0x3F8000

  CONFIG_ENV_SECT_SIZE=0x1000
  CONFIG_SPL_DM_SPI=y
  CONFIG_ROCKCHIP_RK3399=y