diff options
| author | Tom Rini <trini@konsulko.com> | 2015-12-06 21:52:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-12-06 21:52:40 -0500 |
| commit | 2311335d4c5ad6496b3447746a88ecb371e4c71c (patch) | |
| tree | a990344632d5abb4f184599bfff9f044fb49e5cc /include | |
| parent | 540fcbca7e960b2855e7666fff8f11a7119341ee (diff) | |
| parent | 6af4e2782d1300015ab1c3c28e9faa5c96d93f19 (diff) | |
| download | u-boot-2311335d4c5ad6496b3447746a88ecb371e4c71c.tar.gz | |
Merge git://git.denx.de/u-boot-usb
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/xilinx_zynqmp.h | 8 | ||||
| -rw-r--r-- | include/configs/xilinx_zynqmp_ep.h | 2 | ||||
| -rw-r--r-- | include/fsl_usb.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/dwc3.h | 1 |
4 files changed, 11 insertions, 1 deletions
diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 6b8b9f83e9..474bbaff05 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -107,6 +107,14 @@ #define CONFIG_SYS_LOAD_ADDR 0x8000000 #if defined(CONFIG_ZYNQMP_USB) +#define CONFIG_USB_XHCI_DWC3 +#define CONFIG_USB_XHCI +#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 +#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 +#define CONFIG_CMD_USB +#define CONFIG_USB_STORAGE +#define CONFIG_USB_XHCI_ZYNQMP + #define CONFIG_USB_DWC3 #define CONFIG_USB_DWC3_GADGET diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index 8bdb5c9c6d..b7d506e5e7 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -24,6 +24,8 @@ #define CONFIG_SYS_I2C_ZYNQ #define CONFIG_ZYNQ_EEPROM #define CONFIG_AHCI +#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \ + ZYNQMP_USB1_XHCI_BASEADDR} #include <configs/xilinx_zynqmp.h> diff --git a/include/fsl_usb.h b/include/fsl_usb.h index 8e3ddedfad..187e384305 100644 --- a/include/fsl_usb.h +++ b/include/fsl_usb.h @@ -181,6 +181,7 @@ static inline bool has_erratum_a007792(void) switch (soc) { case SVR_T4240: case SVR_T4160: + case SVR_T4080: return IS_SVR_REV(svr, 2, 0); case SVR_T1024: case SVR_T1023: diff --git a/include/linux/usb/dwc3.h b/include/linux/usb/dwc3.h index dd934a0e65..6d1e36505d 100644 --- a/include/linux/usb/dwc3.h +++ b/include/linux/usb/dwc3.h @@ -204,7 +204,6 @@ struct dwc3 { /* offset: 0xC100 */ void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode); void dwc3_core_soft_reset(struct dwc3 *dwc3_reg); int dwc3_core_init(struct dwc3 *dwc3_reg); -void usb_phy_reset(struct dwc3 *dwc3_reg); void dwc3_set_fladj(struct dwc3 *dwc3_reg, u32 val); #endif #endif /* __DWC3_H_ */ |