diff options
| author | Tom Rini <trini@konsulko.com> | 2016-06-04 08:49:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-06-04 08:49:08 -0400 |
| commit | c41c649c2fdec7bf6ef84173597cc3feabdb7828 (patch) | |
| tree | a6b7e3d25eb9d62e5b9989040aa39ddd1c00a83a /include/linux | |
| parent | f15715afea3e7b576fad1f6877a073b65576a335 (diff) | |
| parent | ff78aa2ba19cda755b01818fb3caf2aca9236865 (diff) | |
| download | blackbird-obmc-uboot-c41c649c2fdec7bf6ef84173597cc3feabdb7828.tar.gz blackbird-obmc-uboot-c41c649c2fdec7bf6ef84173597cc3feabdb7828.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/usb/xhci-fsl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index c5e42e69fe..253eddf159 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -59,10 +59,14 @@ struct fsl_xhci { #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS2080A_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS2080A_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 -#elif defined(CONFIG_LS1043A) +#elif defined(CONFIG_LS1043A) || defined(CONFIG_LS1012A) #define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR #define CONFIG_SYS_FSL_XHCI_USB2_ADDR CONFIG_SYS_LS1043A_XHCI_USB2_ADDR #define CONFIG_SYS_FSL_XHCI_USB3_ADDR CONFIG_SYS_LS1043A_XHCI_USB3_ADDR +#elif defined(CONFIG_LS1012A) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS1043A_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 +#define CONFIG_SYS_FSL_XHCI_USB3_ADDR 0 #endif #define FSL_USB_XHCI_ADDR {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \ |
