From cfe6f1dd57e0385ba95fd9061c88c7297a7da023 Mon Sep 17 00:00:00 2001 From: Frank Wang Date: Wed, 29 Mar 2017 18:26:34 +0800 Subject: [PATCH 1/1] usb: ehci: add rockchip relinquishing port quirk support Add a quirk to support rockchip relinquishing port from abnormal ohci to ehci when FS/LS devices plug in. To support this function, the rockchip-relinquish-port property must be specified in ehci node of dt. Change-Id: I91b58905132282ef2a836d54a1c7ace1e334d119 Signed-off-by: Frank Wang --- drivers/usb/host/ehci-platform.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/usb/host/ehci-platform.c b/drivers/usb/host/ehci-platform.c index 6f69798e3452..7866008c4350 100644 --- 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); @@ -202,6 +214,11 @@ static int ehci_platform_probe(struct platform_device *dev) "has-transaction-translator")) hcd->has_tt = 1; + if (of_property_read_bool(dev->dev.of_node, + "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"); -- 2.34.1