diff options
| -rw-r--r-- | arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 9 | ||||
| -rw-r--r-- | include/linux/usb/xhci-fsl.h | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h index e759b52..d34044a 100644 --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h @@ -397,13 +397,4 @@ struct ccsr_cci400 { u8 res_e004[0x10000 - 0xe004]; }; -/* USB-XHCI */ -#define FSL_XHCI_BASE 0x3100000 -#define FSL_OCP1_SCP_BASE 0x4a084c00 -#define FSL_OTG_WRAPPER_BASE 0x4A020000 - -#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS102XA_XHCI_USB1_ADDR -#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 -#define FSL_USB_XHCI_ADDR {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \ - CONFIG_SYS_FSL_XHCI_USB2_ADDR} #endif /* __ASM_ARCH_LS102XA_IMMAP_H_ */ diff --git a/include/linux/usb/xhci-fsl.h b/include/linux/usb/xhci-fsl.h index 8eaab2c..b07bf19 100644 --- a/include/linux/usb/xhci-fsl.h +++ b/include/linux/usb/xhci-fsl.h @@ -51,4 +51,11 @@ struct fsl_xhci { struct dwc3 *dwc3_reg; }; +#if defined(CONFIG_LS102XA) +#define CONFIG_SYS_FSL_XHCI_USB1_ADDR CONFIG_SYS_LS102XA_XHCI_USB1_ADDR +#define CONFIG_SYS_FSL_XHCI_USB2_ADDR 0 +#endif + +#define FSL_USB_XHCI_ADDR {CONFIG_SYS_FSL_XHCI_USB1_ADDR, \ + CONFIG_SYS_FSL_XHCI_USB2_ADDR} #endif /* _ASM_ARCH_XHCI_FSL_H_ */ |