]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
phy: usb: USB driver is crashing during S3 resume on 7216
authorAl Cooper <alcooperx@gmail.com>
Fri, 3 Jan 2020 18:18:10 +0000 (13:18 -0500)
committerKishon Vijay Abraham I <kishon@ti.com>
Wed, 8 Jan 2020 07:28:06 +0000 (12:58 +0530)
This is a result of the USB 2.0 clocks not being disabled/enabled
during suspend/resume on XHCI only systems.

Signed-off-by: Al Cooper <alcooperx@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
drivers/phy/broadcom/phy-brcm-usb.c

index cc5763ace3adc73ff123558d5603f8d4738cfb7e..1ab44f54244b319a2df31a2a0496012bd4b68dba 100644 (file)
@@ -543,7 +543,7 @@ static int brcm_usb_phy_suspend(struct device *dev)
                brcm_usb_wake_enable(&priv->ini, true);
                if (priv->phys[BRCM_USB_PHY_3_0].inited)
                        clk_disable_unprepare(priv->usb_30_clk);
-               if (priv->phys[BRCM_USB_PHY_2_0].inited)
+               if (priv->phys[BRCM_USB_PHY_2_0].inited || !priv->has_eohci)
                        clk_disable_unprepare(priv->usb_20_clk);
                if (priv->wake_irq >= 0)
                        enable_irq_wake(priv->wake_irq);