[U-Boot] [PATCH 1/3] usb: tegra: fix PHY selection code

Marek Vasut
2014-05-02T04:47:35Z

On Thursday, May 01, 2014 at 06:56:24 PM, Stephen Warren wrote:
> On 05/01/2014 04:49 AM, Marek Vasut wrote:
> > On Wednesday, April 30, 2014 at 11:09:55 PM, Stephen Warren wrote:
> >> From: Stephen Warren <swarren@nvidia.com>
> >>
> >> The TRM for Tegra30 and later all state that USBMODE_CM_HC must be set
> >> before writing to hostpc1_devlc to select which PHY to use for a USB
> >> controller. However, neither init_{utmi,ulpi}_usb_controller() do this
> >> today, so the register writes they perform for PHY selection do not
> >> work.
> >>
> >> For the UTMI case, this was hacked around in commit 7e44d9320ed4 "ARM:
> >> Tegra: USB: EHCI: Add support for Tegra30/Tegra114" by adding code to
> >> ehci_hcd_init() which sets USBMODE_CM_HC and duplicates the PHY
> >> selection register write. This code doesn't cover the ULPI case, so I
> >> wouldn't be surprised if ULPI doesn't work with the current code, unless
> >> the ordering requirement only ends up being an issue in HW for UTMI not
> >> ULPI.
> >>
> >> This patch fixes init_{utmi,ulpi}_usb_controller() to correctly set
> >> USBMODE_CM_HC before selecting the PHY. Now that this works, we can
> >> remove the duplicate UTMI-specific code in ehci_hcd_init(), thus
> >> simplifying that function.
> >
> > This doesn't apply on u-boot-usb/master , so I cannot pick this, sorry .
>
> Ah right. That's because I'm working on top of a merge of
> u-boot-arm/master and u-boot/master, and that includes the following
> changes to the Tegra USB driver that went in through u-boot-tegra/master
> -> u-boot-arm/master rather than the USB tree:
>
> 8f9fd6caafb8 usb: tegra: combine header file
> b1d615f3f102 usb: tegra: fix PHY configuration
> b03f4b3742a7 usb: tegra: fix USB2 powerdown for Tegra30 and later
>
> What's the best fix here:
>
> * Wait until the previous patches get into u-boot/master, and
> u-boot-usb/master picks them up, and then apply this series.
>
> * Apply this series to u-boot-tegra/master with your ack?
>
> There's little point my rebasing this series on top of
> u-boot-usb/master, and applying it right now, since that will just cause
> the same conflicts when u-boot-usb/master gets merged into u-boot/master.

Fine, can you poke me when this happens so I can apply ?

Thanks!

Best regards,
Marek Vasut