usb: ehci: add rockchip relinquishing port quirk support

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / ehci-platform.c

diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c
index 77bca46edb86acf3aea6205724da1e19f6d13b9e..7866008c4350e4d9808753ca132ac329034df59f 100644 (file)
--- a/drivers/usb/host/ehci-platform.c
+++ b/drivers/usb/host/ehci-platform.c
@@ -51,6 +51,18 @@ struct ehci_platform_priv {
 
 static const char hcd_name[] = "ehci-platform";
 
+static void ehci_rockchip_relinquish_port(struct usb_hcd *hcd, int portnum)
+{
+       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+       u32 __iomem *status_reg = &ehci->regs->port_status[--portnum];
+       u32 portsc;
+
+       portsc = ehci_readl(ehci, status_reg);
+       portsc &= ~(PORT_OWNER | PORT_RWC_BITS);
+
+       ehci_writel(ehci, portsc, status_reg);
+}
+
 static int ehci_platform_reset(struct usb_hcd *hcd)
 {
        struct platform_device *pdev = to_platform_device(hcd->self.controller);
@@ -203,8 +215,9 @@ static int ehci_platform_probe(struct platform_device *dev)
                        hcd->has_tt = 1;
 
                if (of_property_read_bool(dev->dev.of_node,
-                                         "no-relinquish-port"))
-                       ehci_platform_hc_driver.relinquish_port = NULL;
+                                         "rockchip-relinquish-port"))
+                       ehci_platform_hc_driver.relinquish_port =
+                                         ehci_rockchip_relinquish_port;
 
                priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,
                                "phys", "#phy-cells");