usb: phy: twl4030-usb: Fix lost interrupts after ID pin goes down
Commit249751f223
("usb: phy: twl4030-usb: poll for ID disconnect") added twl4030_id_workaround_work() to deal with lost interrupts after ID pin goes down. Looks like commitf1ddc24c9e
("usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops") changed things around for the generic phy framework, and delayed work no longer got called except initially during boot. The PHY connect and disconnect interrupts for twl4030-usb are not working after disconnecting a USB-A cable from the board, and the deeper idle states for omap are blocked as the USB controller stays busy. The issue can be solved by calling delayed work from twl4030_usb_irq() when ID pin is down and the PHY is not asleep like we already do in twl4030_id_workaround_work(). But as both twl4030_usb_irq() and twl4030_id_workaround_work() already do pretty much the same thing, let's call twl4030_usb_irq() from twl4030_id_workaround_work() instead of adding some more duplicate code. We also must call sysfs_notify() only when we have an interrupt and not from the delayed work as notified by Grazvydas Ignotas <notasas@gmail.com>. Fixes:f1ddc24c9e
("usb: phy: twl4030-usb: remove *set_suspend* and *phy_init* ops") Cc: stable@vger.kernel.org # v3.13+ Acked-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
parent
96be39ab34
commit
85601b8d81
|
@ -589,7 +589,15 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
|
|||
}
|
||||
omap_musb_mailbox(status);
|
||||
}
|
||||
sysfs_notify(&twl->dev->kobj, NULL, "vbus");
|
||||
|
||||
/* don't schedule during sleep - irq works right then */
|
||||
if (status == OMAP_MUSB_ID_GROUND && !twl->asleep) {
|
||||
cancel_delayed_work(&twl->id_workaround_work);
|
||||
schedule_delayed_work(&twl->id_workaround_work, HZ);
|
||||
}
|
||||
|
||||
if (irq)
|
||||
sysfs_notify(&twl->dev->kobj, NULL, "vbus");
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
@ -598,29 +606,8 @@ static void twl4030_id_workaround_work(struct work_struct *work)
|
|||
{
|
||||
struct twl4030_usb *twl = container_of(work, struct twl4030_usb,
|
||||
id_workaround_work.work);
|
||||
enum omap_musb_vbus_id_status status;
|
||||
bool status_changed = false;
|
||||
|
||||
status = twl4030_usb_linkstat(twl);
|
||||
|
||||
spin_lock_irq(&twl->lock);
|
||||
if (status >= 0 && status != twl->linkstat) {
|
||||
twl->linkstat = status;
|
||||
status_changed = true;
|
||||
}
|
||||
spin_unlock_irq(&twl->lock);
|
||||
|
||||
if (status_changed) {
|
||||
dev_dbg(twl->dev, "handle missing status change to %d\n",
|
||||
status);
|
||||
omap_musb_mailbox(status);
|
||||
}
|
||||
|
||||
/* don't schedule during sleep - irq works right then */
|
||||
if (status == OMAP_MUSB_ID_GROUND && !twl->asleep) {
|
||||
cancel_delayed_work(&twl->id_workaround_work);
|
||||
schedule_delayed_work(&twl->id_workaround_work, HZ);
|
||||
}
|
||||
twl4030_usb_irq(0, twl);
|
||||
}
|
||||
|
||||
static int twl4030_phy_init(struct phy *phy)
|
||||
|
|
Loading…
Reference in a new issue