V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ARM64: zynqmp: Wire up both USBs available on ZynqMP 

The second USB wasn't enabled. This patch fixes it.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2016-08-08 10:11:26 +02:00
parent 6ded73aa97
commit 275bd6d11f
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/xilinx/zynqmp/zynqmp.c
View File

@ -283,13 +283,20 @@ int checkboard(void)
} }
#ifdef CONFIG_USB_DWC3 #ifdef CONFIG_USB_DWC3
static struct dwc3_device dwc3_device_data = { static struct dwc3_device dwc3_device_data0 = {
.maximum_speed = USB_SPEED_HIGH, .maximum_speed = USB_SPEED_HIGH,
.base = ZYNQMP_USB0_XHCI_BASEADDR, .base = ZYNQMP_USB0_XHCI_BASEADDR,
.dr_mode = USB_DR_MODE_PERIPHERAL, .dr_mode = USB_DR_MODE_PERIPHERAL,
.index = 0, .index = 0,
}; };
static struct dwc3_device dwc3_device_data1 = {
.maximum_speed = USB_SPEED_HIGH,
.base = ZYNQMP_USB1_XHCI_BASEADDR,
.dr_mode = USB_DR_MODE_PERIPHERAL,
.index = 1,
};
int usb_gadget_handle_interrupts(void) int usb_gadget_handle_interrupts(void)
{ {
dwc3_uboot_handle_interrupt(0); dwc3_uboot_handle_interrupt(0);
@ -298,7 +305,16 @@ int usb_gadget_handle_interrupts(void)
int board_usb_init(int index, enum usb_init_type init) int board_usb_init(int index, enum usb_init_type init)
{ {
return dwc3_uboot_init(&dwc3_device_data); debug("%s: index %x\n", __func__, index);
switch (index) {
case 0:
return dwc3_uboot_init(&dwc3_device_data0);
case 1:
return dwc3_uboot_init(&dwc3_device_data1);
};
return -1;
} }
int board_usb_cleanup(int index, enum usb_init_type init) int board_usb_cleanup(int index, enum usb_init_type init)

2
include/configs/xilinx_zynqmp.h
View File

@ -108,7 +108,7 @@
#define CONFIG_SYS_LOAD_ADDR 0x8000000 #define CONFIG_SYS_LOAD_ADDR 0x8000000
#if defined(CONFIG_ZYNQMP_USB) #if defined(CONFIG_ZYNQMP_USB)
#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2
#define CONFIG_USB_XHCI_ZYNQMP #define CONFIG_USB_XHCI_ZYNQMP