On 10/12/2016 12:41 PM, Rajesh Bhagat wrote:
> This adds the required code to set up a ULPI USB port, for
> new NXP USB PHY used in QorIQ platforms.
> 
> To use this both CONFIG_USB_ULPI and CONFIG_USB_ULPI_VIEWPORT
> have to be set in the board configuration file.
> 
> Signed-off-by: Rajesh Bhagat <rajesh.bha...@nxp.com>
> ---
> Changes in v3:
>  - Rebased to u-boot-usb master
> 
> Changes in v2:
>  - Changes return value from -1 to ulpi_init ret value
> 
>  drivers/usb/host/ehci-fsl.c | 21 +++++++++++++++++++++
>  1 file changed, 21 insertions(+)
> 
> diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
> index 9c32921..85b810d 100644
> --- a/drivers/usb/host/ehci-fsl.c
> +++ b/drivers/usb/host/ehci-fsl.c
> @@ -17,6 +17,9 @@
>  #include <fsl_usb.h>
>  #include <fdt_support.h>
>  #include <dm.h>
> +#ifdef CONFIG_USB_ULPI
> +#include <usb/ulpi.h>
> +#endif

This ifdef is not needed, just include the file.

>  #include "ehci.h"
>  
> @@ -190,6 +193,10 @@ static int ehci_fsl_init(int index, struct usb_ehci 
> *ehci,
>       size_t len;
>       char current_usb_controller[5];
>  #endif
> +#ifdef CONFIG_USB_ULPI
> +     int ret;
> +     struct ulpi_viewport ulpi_vp;
> +#endif
>  #ifdef CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY
>       char usb_phy[5];
>  
> @@ -257,6 +264,20 @@ static int ehci_fsl_init(int index, struct usb_ehci 
> *ehci,
>               udelay(1000); /* delay required for PHY Clk to appear */
>               if (!usb_phy_clk_valid(ehci))
>                       return -EINVAL;
> +
> +#ifdef CONFIG_USB_ULPI
> +             ulpi_vp.viewport_addr = (u32)&ehci->ulpi_viewpoint;
> +             ulpi_vp.port_num = 0;
> +
> +             ret = ulpi_init(&ulpi_vp);
> +             if (ret) {
> +                     puts("NXP ULPI viewport init failed\n");
> +                     return ret;
> +             }
> +
> +             ulpi_set_vbus(&ulpi_vp, 1, 1);
> +             ulpi_set_vbus_indicator(&ulpi_vp, 1, 1, 1);

Please pull this whole block of code into separate function and do
something like

#ifdef CONFIG_USB_ULPI
static int ehci_fsl_ulpi_init(...)
{
 code
}
#else
static int ehci_fsl_ulpi_init(...)
{
 return 0;
}
#endif

Then just call ehci_fsl_ulpi_init().

> +#endif
>               out_le32(&(hcor)->or_portsc[0], PORT_PTS_ULPI);
>       }
>  
> 


-- 
Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to