[U-Boot] [PATCH 09/10 v2] arm: mvebu: Enable USB EHCI support on Armada XP

[Marek Vasut]

On Thursday, July 23, 2015 at 04:53:48 PM, Stefan Roese wrote:
> On 23.07.2015 16:17, Marek Vasut wrote:
> > On Thursday, July 23, 2015 at 01:02:46 PM, Stefan Roese wrote:
> >> This patch enables the USB EHCI support for the Marvell Armada XP (AXP)
> >> SoCs. In compatism to the Armada 38x (A38x), the AXP needs to configure
> >> the USB PLL and the USB PHY's specifically in U-Boot. The A38x has done
> >> this already in the bin_hdr (SPL U-Boot). Without this, accessing the
> >> controller registers in U-Boot or Linux will hang the CPU.
> >> 
> >> Additionally, the AXP uses a different USB EHCI base address. This
> >> patch also takes care of this by runtime SoC detection in the Marvell
> >> EHCI driver.
> > 
> > [...]
> > 
> >> diff --git a/drivers/usb/host/ehci-marvell.c
> >> b/drivers/usb/host/ehci-marvell.c index 03c489c..826e7f7 100644
> >> --- a/drivers/usb/host/ehci-marvell.c
> >> +++ b/drivers/usb/host/ehci-marvell.c
> >> @@ -33,7 +33,14 @@ DECLARE_GLOBAL_DATA_PTR;
> >> 
> >>    */
> >>   
> >>   #ifdef CONFIG_ARMADA_XP
> >> 
> >> -#define MVUSB0_BASE		MVEBU_USB20_BASE
> >> +/*
> >> + * Armada XP and Armada 38x have different base addresses for
> >> + * the USB 2.0 EHCI host controller. So we need to provide
> >> + * a mechnism to support both here.
> > 
> > mechanism (I can fix that myself)
> > 
> >> + */
> >> +#define MVUSB0_BASE					\
> >> +	(mvebu_soc_family() == MVEBU_SOC_A38X ?		\
> >> +	 MVEBU_USB20_BASE : MVEBU_AXP_USB_BASE)
> >> 
> >>   /*
> >>   
> >>    * Once all the older Marvell SoC's (Orion, Kirkwood) are converted
> > 
> > Do you want me to pick this via USB tree ?
> 
> If you have no objections, then it would be easer if Luka pushes all
> patches together. Since there might be conflicts in the arch/arm/ files
> otherwise.

OK!

Best regards,
Marek Vasut