| Message ID | 20200511075725.26665-3-frank.wang@rock-chips.com |
|---|---|
| State | Superseded |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | Add Rockchip RK3399 USB3.0 Host support | expand |
On 5/11/20 9:57 AM, Frank Wang wrote: [...] > @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) > if (ret) > return ret; > > + if (glue->resets.count < 1) { This condition is only true if count == 0 ? What's the purpose of this test ? > + ret = dwc3_glue_reset_init(child, glue); > + if (ret) > + return ret; > + } > + > while (child) { > enum usb_dr_mode dr_mode; > [...]
Hi Marek, On 2020/5/11 17:48, Marek Vasut wrote: > On 5/11/20 9:57 AM, Frank Wang wrote: > [...] > >> @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) >> if (ret) >> return ret; >> >> + if (glue->resets.count < 1) { > This condition is only true if count == 0 ? > What's the purpose of this test ? For previous dts of the Linux kernel, the reset phandles were in dwc3-glue nodes, however, they are moved recently into dwc3 that is a child node of dwc3-glue. So the above codes is to make compatible. >> + ret = dwc3_glue_reset_init(child, glue); >> + if (ret) >> + return ret; >> + } >> + >> while (child) { >> enum usb_dr_mode dr_mode; >> > [...] > > BR, Frank
On 5/12/20 3:08 AM, Frank Wang wrote: > Hi Marek, > > On 2020/5/11 17:48, Marek Vasut wrote: >> On 5/11/20 9:57 AM, Frank Wang wrote: >> [...] >> >>> @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) >>> if (ret) >>> return ret; >>> + if (glue->resets.count < 1) { >> This condition is only true if count == 0 ? >> What's the purpose of this test ? > > For previous dts of the Linux kernel, the reset phandles were in > dwc3-glue nodes, however, they are moved recently into dwc3 that is a > child node of dwc3-glue. > > So the above codes is to make compatible. Why doesn't it check for count == 0 then ?
Hi Marek, On 2020/5/12 15:26, Marek Vasut wrote: > On 5/12/20 3:08 AM, Frank Wang wrote: >> Hi Marek, >> >> On 2020/5/11 17:48, Marek Vasut wrote: >>> On 5/11/20 9:57 AM, Frank Wang wrote: >>> [...] >>> >>>> @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) >>>> if (ret) >>>> return ret; >>>> + if (glue->resets.count < 1) { >>> This condition is only true if count == 0 ? >>> What's the purpose of this test ? >> For previous dts of the Linux kernel, the reset phandles were in >> dwc3-glue nodes, however, they are moved recently into dwc3 that is a >> child node of dwc3-glue. >> >> So the above codes is to make compatible. > Why doesn't it check for count == 0 then ? > Will fix. BR, Frank
On 5/13/20 2:47 AM, Frank Wang wrote: > Hi Marek, > > On 2020/5/12 15:26, Marek Vasut wrote: >> On 5/12/20 3:08 AM, Frank Wang wrote: >>> Hi Marek, >>> >>> On 2020/5/11 17:48, Marek Vasut wrote: >>>> On 5/11/20 9:57 AM, Frank Wang wrote: >>>> [...] >>>> >>>>> @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) >>>>> if (ret) >>>>> return ret; >>>>> + if (glue->resets.count < 1) { >>>> This condition is only true if count == 0 ? >>>> What's the purpose of this test ? >>> For previous dts of the Linux kernel, the reset phandles were in >>> dwc3-glue nodes, however, they are moved recently into dwc3 that is a >>> child node of dwc3-glue. >>> >>> So the above codes is to make compatible. >> Why doesn't it check for count == 0 then ? >> > Will fix. Thanks.
diff --git a/drivers/usb/dwc3/dwc3-generic.c b/drivers/usb/dwc3/dwc3-generic.c index eabd53a36d..359460eb13 100644 --- a/drivers/usb/dwc3/dwc3-generic.c +++ b/drivers/usb/dwc3/dwc3-generic.c @@ -24,6 +24,12 @@ #include <clk.h> #include <usb/xhci.h> +struct dwc3_glue_data { + struct clk_bulk clks; + struct reset_ctl_bulk resets; + fdt_addr_t regs; +}; + struct dwc3_generic_plat { fdt_addr_t base; u32 maximum_speed; @@ -47,6 +53,7 @@ static int dwc3_generic_probe(struct udevice *dev, int rc; struct dwc3_generic_plat *plat = dev_get_platdata(dev); struct dwc3 *dwc3 = &priv->dwc3; + struct dwc3_glue_data *glue = dev_get_platdata(dev->parent); dwc3->dev = dev; dwc3->maximum_speed = plat->maximum_speed; @@ -55,10 +62,22 @@ static int dwc3_generic_probe(struct udevice *dev, dwc3_of_parse(dwc3); #endif + /* + * It must hold whole USB3.0 OTG controller in resetting to hold pipe + * power state in P2 before initializing TypeC PHY on RK3399 platform. + */ + if (device_is_compatible(dev->parent, "rockchip,rk3399-dwc3")) { + reset_assert_bulk(&glue->resets); + udelay(1); + } + rc = dwc3_setup_phy(dev, &priv->phys); if (rc) return rc; + if (device_is_compatible(dev->parent, "rockchip,rk3399-dwc3")) + reset_deassert_bulk(&glue->resets); + priv->base = map_physmem(plat->base, DWC3_OTG_REGS_END, MAP_NOCACHE); dwc3->regs = priv->base + DWC3_GLOBALS_REGS_START; @@ -186,12 +205,6 @@ U_BOOT_DRIVER(dwc3_generic_host) = { }; #endif -struct dwc3_glue_data { - struct clk_bulk clks; - struct reset_ctl_bulk resets; - fdt_addr_t regs; -}; - struct dwc3_glue_ops { void (*select_dr_mode)(struct udevice *dev, int index, enum usb_dr_mode mode); @@ -394,6 +407,12 @@ static int dwc3_glue_probe(struct udevice *dev) if (ret) return ret; + if (glue->resets.count < 1) { + ret = dwc3_glue_reset_init(child, glue); + if (ret) + return ret; + } + while (child) { enum usb_dr_mode dr_mode; @@ -424,6 +443,8 @@ static const struct udevice_id dwc3_glue_ids[] = { { .compatible = "ti,dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am437x-dwc3", .data = (ulong)&ti_ops }, { .compatible = "ti,am654-dwc3" }, + { .compatible = "rockchip,rk3328-dwc3" }, + { .compatible = "rockchip,rk3399-dwc3" }, { } };