From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vagrant Cascadian Date: Thu, 07 Jun 2018 23:37:11 -0700 Subject: [U-Boot] [U-Boot, 2/2] usb: sunxi: sun50i: enable OHCI0 clock when OHCI1 is in use In-Reply-To: <20180606033831.20693-2-anarsoul@gmail.com> References: <20180606033831.20693-2-anarsoul@gmail.com> Message-ID: <87po11bx7s.fsf@aikidev.net> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On 2018-06-05, Vasily Khoruzhick wrote: > On A64 OHCI1 clock source is OHCI0 clock, so we need to enable OHCI0 > clock when OHCI1 is in use. > > Fixes commit dd3228170ad7 ("usb: sunxi: Switch to use generic-phy") > > Signed-off-by: Vasily Khoruzhick > --- > drivers/usb/host/ohci-sunxi.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) Tested loading kernel+initrd+dtb on pine64+ Tested-by: Vagrant Cascadian live well, vagrant > diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c > index ce2b47a5c4..5661557a3d 100644 > --- a/drivers/usb/host/ohci-sunxi.c > +++ b/drivers/usb/host/ohci-sunxi.c > @@ -36,6 +36,7 @@ static int ohci_usb_probe(struct udevice *dev) > struct ohci_sunxi_priv *priv = dev_get_priv(dev); > struct ohci_regs *regs = (struct ohci_regs *)devfdt_get_addr(dev); > int extra_ahb_gate_mask = 0; > + int extra_usb_gate_mask = 0; > int phys, ret; > > priv->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; > @@ -78,13 +79,17 @@ no_phy: > extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0; > #endif > priv->usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK; > +#ifdef CONFIG_MACH_SUN50I > + extra_usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK; > +#endif > priv->ahb_gate_mask <<= phys * AHB_CLK_DIST; > extra_ahb_gate_mask <<= phys * AHB_CLK_DIST; > priv->usb_gate_mask <<= phys; > > setbits_le32(&priv->ccm->ahb_gate0, > priv->ahb_gate_mask | extra_ahb_gate_mask); > - setbits_le32(&priv->ccm->usb_clk_cfg, priv->usb_gate_mask); > + setbits_le32(&priv->ccm->usb_clk_cfg, > + priv->usb_gate_mask | extra_usb_gate_mask); > #ifdef CONFIG_SUNXI_GEN_SUN6I > setbits_le32(&priv->ccm->ahb_reset0_cfg, > priv->ahb_gate_mask | extra_ahb_gate_mask); -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 832 bytes Desc: not available URL: