usb: sunxi: Switch to use generic-phy

[u-boot] / drivers / usb / host / ehci-sunxi.c

diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c
index cf3dcc43274fb26957712c092ac12e635d7aed5d..360efc9116086f2b021bdfe1b471516a5a3fb104 100644 (file)
--- a/drivers/usb/host/ehci-sunxi.c
+++ b/drivers/usb/host/ehci-sunxi.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Sunxi ehci glue
  *
@@ -6,51 +7,85 @@
  *
  * Based on code from
  * Allwinner Technology Co., Ltd. <www.allwinnertech.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <asm/arch/clock.h>
-#include <asm/arch/usb_phy.h>
 #include <asm/io.h>
 #include <dm.h>
 #include "ehci.h"
+#include <generic-phy.h>
+
+#ifdef CONFIG_SUNXI_GEN_SUN4I
+#define AHB_CLK_DIST           2
+#else
+#define AHB_CLK_DIST           1
+#endif
 
 struct ehci_sunxi_priv {
        struct ehci_ctrl ehci;
+       struct sunxi_ccm_reg *ccm;
        int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */
-       int phy_index;     /* Index of the usb-phy attached to this hcd */
+       struct phy phy;
 };
 
 static int ehci_usb_probe(struct udevice *dev)
 {
-       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
        struct usb_platdata *plat = dev_get_platdata(dev);
        struct ehci_sunxi_priv *priv = dev_get_priv(dev);
-       struct ehci_hccr *hccr = (struct ehci_hccr *)dev_get_addr(dev);
+       struct ehci_hccr *hccr = (struct ehci_hccr *)devfdt_get_addr(dev);
        struct ehci_hcor *hcor;
+       int extra_ahb_gate_mask = 0;
+       int phys, ret;
+
+       priv->ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
+       if (IS_ERR(priv->ccm))
+               return PTR_ERR(priv->ccm);
+
+       phys = dev_count_phandle_with_args(dev, "phys", "#phy-cells");
+       if (phys < 0) {
+               phys = 0;
+               goto no_phy;
+       }
+
+       ret = generic_phy_get_by_name(dev, "usb", &priv->phy);
+       if (ret) {
+               pr_err("failed to get %s usb PHY\n", dev->name);
+               return ret;
+       }
 
+       ret = generic_phy_init(&priv->phy);
+       if (ret) {
+               pr_err("failed to init %s USB PHY\n", dev->name);
+               return ret;
+       }
+
+       ret = generic_phy_power_on(&priv->phy);
+       if (ret) {
+               pr_err("failed to power on %s USB PHY\n", dev->name);
+               return ret;
+       }
+
+no_phy:
        /*
         * This should go away once we've moved to the driver model for
         * clocks resp. phys.
         */
        priv->ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_EHCI0;
-#ifdef CONFIG_MACH_SUN8I_H3
-       priv->ahb_gate_mask |= 1 << AHB_GATE_OFFSET_USB_OHCI0;
+#if defined(CONFIG_MACH_SUNXI_H3_H5) || defined(CONFIG_MACH_SUN50I)
+       extra_ahb_gate_mask = 1 << AHB_GATE_OFFSET_USB_OHCI0;
 #endif
-       priv->phy_index = ((u32)hccr - SUNXI_USB1_BASE) / 0x1000 + 1;
-       priv->ahb_gate_mask <<= priv->phy_index - 1;
+       priv->ahb_gate_mask <<= phys * AHB_CLK_DIST;
+       extra_ahb_gate_mask <<= phys * AHB_CLK_DIST;
 
-       setbits_le32(&ccm->ahb_gate0, priv->ahb_gate_mask);
+       setbits_le32(&priv->ccm->ahb_gate0,
+                    priv->ahb_gate_mask | extra_ahb_gate_mask);
 #ifdef CONFIG_SUNXI_GEN_SUN6I
-       setbits_le32(&ccm->ahb_reset0_cfg, priv->ahb_gate_mask);
+       setbits_le32(&priv->ccm->ahb_reset0_cfg,
+                    priv->ahb_gate_mask | extra_ahb_gate_mask);
 #endif
 
-       sunxi_usb_phy_init(priv->phy_index);
-       sunxi_usb_phy_power_on(priv->phy_index);
-
-       hcor = (struct ehci_hcor *)((uint32_t)hccr +
+       hcor = (struct ehci_hcor *)((uintptr_t)hccr +
                                    HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
 
        return ehci_register(dev, hccr, hcor, NULL, 0, plat->init_type);
@@ -58,20 +93,25 @@ static int ehci_usb_probe(struct udevice *dev)
 
 static int ehci_usb_remove(struct udevice *dev)
 {
-       struct sunxi_ccm_reg *ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
        struct ehci_sunxi_priv *priv = dev_get_priv(dev);
        int ret;
 
+       if (generic_phy_valid(&priv->phy)) {
+               ret = generic_phy_exit(&priv->phy);
+               if (ret) {
+                       pr_err("failed to exit %s USB PHY\n", dev->name);
+                       return ret;
+               }
+       }
+
        ret = ehci_deregister(dev);
        if (ret)
                return ret;
 
-       sunxi_usb_phy_exit(priv->phy_index);
-
 #ifdef CONFIG_SUNXI_GEN_SUN6I
-       clrbits_le32(&ccm->ahb_reset0_cfg, priv->ahb_gate_mask);
+       clrbits_le32(&priv->ccm->ahb_reset0_cfg, priv->ahb_gate_mask);
 #endif
-       clrbits_le32(&ccm->ahb_gate0, priv->ahb_gate_mask);
+       clrbits_le32(&priv->ccm->ahb_gate0, priv->ahb_gate_mask);
 
        return 0;
 }
@@ -82,8 +122,10 @@ static const struct udevice_id ehci_usb_ids[] = {
        { .compatible = "allwinner,sun6i-a31-ehci", },
        { .compatible = "allwinner,sun7i-a20-ehci", },
        { .compatible = "allwinner,sun8i-a23-ehci", },
+       { .compatible = "allwinner,sun8i-a83t-ehci", },
        { .compatible = "allwinner,sun8i-h3-ehci",  },
        { .compatible = "allwinner,sun9i-a80-ehci", },
+       { .compatible = "allwinner,sun50i-a64-ehci", },
        { }
 };