[U-Boot] [PATCH 3/4] usb: ohci: ohci-da8xx: Enable da850-ohci driver with DM support

[Marek Vasut]

On 4/30/19 11:24 AM, Adam Ford wrote:
> On Mon, Apr 29, 2019 at 4:54 AM Marek Vasut <marex at denx.de> wrote:
>>
>> On 4/28/19 11:45 PM, Adam Ford wrote:
>>> This patch reuses some former code for the hawkboard, combines it
>>> with some some similar DM_USB compatible code for the OHCI driver,
>>> and enables the use of the da850's OHCI controller with DM_USB
>>> compatibility.
>>>
>>> Signed-off-by: Adam Ford <aford173 at gmail.com>
>>>
>>> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
>>> index 0fbc115801..0d8ab3b651 100644
>>> --- a/drivers/usb/host/Kconfig
>>> +++ b/drivers/usb/host/Kconfig
>>> @@ -239,6 +239,11 @@ config USB_OHCI_GENERIC
>>>       ---help---
>>>         Enables support for generic OHCI controller.
>>>
>>> +config USB_OHCI_DA8XX
>>> +     bool "Support for da850 OHCI USB controller"
>>> +     help
>>> +       Enable support for the da850 USB controller.
>>> +
>>>  endif # USB_OHCI_HCD
>>>
>>>  config USB_UHCI_HCD
>>> diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
>>> index 47ad3f34d5..0f38791973 100644
>>> --- a/drivers/usb/host/ohci-da8xx.c
>>> +++ b/drivers/usb/host/ohci-da8xx.c
>>> @@ -4,9 +4,63 @@
>>>   */
>>>
>>>  #include <common.h>
>>> -
>>> +#include <asm/io.h>
>>> +#include <clk.h>
>>> +#include <dm.h>
>>> +#include <dm/ofnode.h>
>>> +#include <generic-phy.h>
>>> +#include <reset.h>
>>> +#include "ohci.h"
>>>  #include <asm/arch/da8xx-usb.h>
>>>
>>> +struct da8xx_ohci {
>>> +     ohci_t ohci;
>>> +     struct clk *clocks;     /* clock list */
>>> +     struct phy phy;
>>> +     int clock_count;        /* number of clock in clock list */
>>> +};
>>> +
>>> +static int usb_phy_on(void)
>>> +{
>>> +     u32 timeout;
>>> +     u32 cfgchip2;
>>> +
>>> +     cfgchip2 = readl(&davinci_syscfg_regs->cfgchip2);
>>> +
>>> +     cfgchip2 &= ~(CFGCHIP2_RESET | CFGCHIP2_PHYPWRDN | CFGCHIP2_OTGPWRDN |
>>> +                   CFGCHIP2_OTGMODE | CFGCHIP2_REFFREQ |
>>> +                   CFGCHIP2_USB1PHYCLKMUX);
>>> +     cfgchip2 |= CFGCHIP2_SESENDEN | CFGCHIP2_VBDTCTEN | CFGCHIP2_PHY_PLLON |
>>> +                 CFGCHIP2_REFFREQ_24MHZ | CFGCHIP2_USB2PHYCLKMUX |
>>> +                 CFGCHIP2_USB1SUSPENDM;
>>> +
>>> +     writel(cfgchip2, &davinci_syscfg_regs->cfgchip2);
>>> +
>>> +     /* wait until the usb phy pll locks */
>>> +     timeout = 0x7FFFFFF;
>>> +
>>> +     while (timeout--) {
>>
>> Use get_timer() for the timeout.
>>
>>> +             if (readl(&davinci_syscfg_regs->cfgchip2) & CFGCHIP2_PHYCLKGD)
>>> +                     return 1;
>>> +     }
>>> +
>>> +     /* USB phy was not turned on */
>>> +     return 0;
>>> +}
>>> +
>>> +static void usb_phy_off(void)
>>> +{
>>> +     u32 cfgchip2;
>>> +
>>> +     /*
>>> +      * Power down the on-chip PHY.
>>> +      */
>>> +     cfgchip2 = readl(&davinci_syscfg_regs->cfgchip2);
>>> +     cfgchip2 &= ~(CFGCHIP2_PHY_PLLON | CFGCHIP2_USB1SUSPENDM);
>>> +     cfgchip2 |= CFGCHIP2_PHYPWRDN | CFGCHIP2_OTGPWRDN | CFGCHIP2_RESET;
>>> +     writel(cfgchip2, &davinci_syscfg_regs->cfgchip2);
>>
>> clrsetbits
> 
> Marek - I will be submitting a V2 with your suggestions.  It seems
> like some of the segments are going to be applied, do you want just do
> a V2 on the this one, or re-submit the whole series?

Just 3/4 and 4/4 is enough. Rebase on u-boot-usb/master and make sure
not to drop $subject from the cover letter (this series has it empty,
which made me almost miss it)

-- 
Best regards,
Marek Vasut