phy: phy-twl4030-usb: Disable PHY for suspend

Since commit 88d26136a256 ("PM: Prevent runtime suspend during system
resume"), PM runtime will not let devices idle during system suspend.

This is because of the pm_runtime_get_noresume() call done in
device_prepare() that is not released until at device_complete() after
resume.

We must now disable the USB PHY in suspend if no USB cable is connected.

Cc: Andreas Kemnade <andreas@kemnade.info>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/r/20210727104512.52968-1-tony@atomide.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/ti/phy-twl4030-usb.c b/drivers/phy/ti/phy-twl4030-usb.c
index 5771e2486a3bd4e094d6c13081fcc626ec54619e..ac71017a0bc116ac1b204b902a4f7adbfb0068f3 100644 (file)
--- a/drivers/phy/ti/phy-twl4030-usb.c
+++ b/drivers/phy/ti/phy-twl4030-usb.c
@@ -162,6 +162,8 @@ struct twl4030_usb {
        atomic_t                connected;
        bool                    vbus_supplied;
        bool                    musb_mailbox_pending;
+       unsigned long           runtime_suspended:1;
+       unsigned long           needs_resume:1;
 
        struct delayed_work     id_workaround_work;
 };
@@ -384,6 +386,9 @@ static void __twl4030_phy_power(struct twl4030_usb *twl, int on)
        WARN_ON(twl4030_usb_write_verify(twl, PHY_PWR_CTRL, pwr) < 0);
 }
 
+static int twl4030_usb_runtime_suspend(struct device *dev);
+static int twl4030_usb_runtime_resume(struct device *dev);
+
 static int __maybe_unused twl4030_usb_suspend(struct device *dev)
 {
        struct twl4030_usb *twl = dev_get_drvdata(dev);
@@ -395,6 +400,10 @@ static int __maybe_unused twl4030_usb_suspend(struct device *dev)
         */
        dev_dbg(twl->dev, "%s\n", __func__);
        disable_irq(twl->irq);
+       if (!twl->runtime_suspended && !atomic_read(&twl->connected)) {
+               twl4030_usb_runtime_suspend(dev);
+               twl->needs_resume = 1;
+       }
 
        return 0;
 }
@@ -405,9 +414,13 @@ static int __maybe_unused twl4030_usb_resume(struct device *dev)
 
        dev_dbg(twl->dev, "%s\n", __func__);
        enable_irq(twl->irq);
+       if (twl->needs_resume)
+               twl4030_usb_runtime_resume(dev);
        /* check whether cable status changed */
        twl4030_usb_irq(0, twl);
 
+       twl->runtime_suspended = 0;
+
        return 0;
 }
 
@@ -422,6 +435,8 @@ static int __maybe_unused twl4030_usb_runtime_suspend(struct device *dev)
        regulator_disable(twl->usb1v8);
        regulator_disable(twl->usb3v1);
 
+       twl->runtime_suspended = 1;
+
        return 0;
 }