| Message ID | 1476268908-2122-3-git-send-email-rajesh.bhagat@nxp.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Marek Vasut |
| Headers | show |
On 10/12/2016 12:41 PM, Rajesh Bhagat wrote: > Add USB EHCI support for ls1012aqds platform > > Signed-off-by: Rajat Srivastava <rajat.srivastava@nxp.com> > Signed-off-by: Rajesh Bhagat <rajesh.bhagat@nxp.com> > --- > Changes in v3: > - Rebased to u-boot-usb master > > Changes in v2: > - None > > arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h | 1 + > include/configs/ls1012aqds.h | 2 ++ > include/usb/ehci-ci.h | 2 +- > 3 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > index df51871..14de100 100644 > --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h > @@ -34,6 +34,7 @@ > #define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) > #define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) > #define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) > +#define CONFIG_SYS_EHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x07600000) > #define CONFIG_SYS_PCIE1_ADDR (CONFIG_SYS_IMMR + 0x2400000) > #define CONFIG_SYS_PCIE2_ADDR (CONFIG_SYS_IMMR + 0x2500000) > #define CONFIG_SYS_PCIE3_ADDR (CONFIG_SYS_IMMR + 0x2600000) > diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h > index 54abf30..7566f1a 100644 > --- a/include/configs/ls1012aqds.h > +++ b/include/configs/ls1012aqds.h > @@ -118,6 +118,8 @@ > #ifdef CONFIG_HAS_FSL_DR_USB > #define CONFIG_USB_EHCI > #define CONFIG_USB_EHCI_FSL > +#define CONFIG_USB_ULPI > +#define CONFIG_USB_ULPI_VIEWPORT > #define CONFIG_EHCI_HCD_INIT_AFTER_RESET > #endif > > diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h > index 882aed4..38d557c 100644 > --- a/include/usb/ehci-ci.h > +++ b/include/usb/ehci-ci.h > @@ -159,7 +159,7 @@ > #elif defined(CONFIG_MPC512X) > #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC512x_USB1_ADDR > #define CONFIG_SYS_FSL_USB2_ADDR 0 > -#elif defined(CONFIG_LS102XA) > +#elif defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A) > #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR > #define CONFIG_SYS_FSL_USB2_ADDR 0 Is this block of macros needed at all ? If not, remove it even for LS102XA . > #endif >
diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h index df51871..14de100 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch2.h @@ -34,6 +34,7 @@ #define CONFIG_SYS_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x01f00000) #define CONFIG_SYS_XHCI_USB2_ADDR (CONFIG_SYS_IMMR + 0x02000000) #define CONFIG_SYS_XHCI_USB3_ADDR (CONFIG_SYS_IMMR + 0x02100000) +#define CONFIG_SYS_EHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x07600000) #define CONFIG_SYS_PCIE1_ADDR (CONFIG_SYS_IMMR + 0x2400000) #define CONFIG_SYS_PCIE2_ADDR (CONFIG_SYS_IMMR + 0x2500000) #define CONFIG_SYS_PCIE3_ADDR (CONFIG_SYS_IMMR + 0x2600000) diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 54abf30..7566f1a 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -118,6 +118,8 @@ #ifdef CONFIG_HAS_FSL_DR_USB #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL +#define CONFIG_USB_ULPI +#define CONFIG_USB_ULPI_VIEWPORT #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #endif diff --git a/include/usb/ehci-ci.h b/include/usb/ehci-ci.h index 882aed4..38d557c 100644 --- a/include/usb/ehci-ci.h +++ b/include/usb/ehci-ci.h @@ -159,7 +159,7 @@ #elif defined(CONFIG_MPC512X) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_MPC512x_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 -#elif defined(CONFIG_LS102XA) +#elif defined(CONFIG_LS102XA) || defined(CONFIG_ARCH_LS1012A) #define CONFIG_SYS_FSL_USB1_ADDR CONFIG_SYS_EHCI_USB1_ADDR #define CONFIG_SYS_FSL_USB2_ADDR 0 #endif