On Mon, Feb 11, 2013 at 11:57:33AM +0200, Felipe Balbi wrote: > From: Vikas Sajjan <vikas.sajjan@xxxxxxxxxx> > > Adds power management support to xHCI platform driver. > > This patch facilitates the transition of xHCI host controller > between S0 and S3/S4 power states, during suspend/resume cycles. > > Signed-off-by: Abhilash Kesavan <a.kesavan@xxxxxxxxxxx> > Signed-off-by: Vikas C Sajjan <vikas.sajjan@xxxxxxxxxx> > CC: Doug Anderson <dianders@xxxxxxxxxxxx> > Signed-off-by: Felipe Balbi <balbi@xxxxxx> > --- > > Hi Sarah, > > can you carry this patch for v3.10 merge window ? I have > refreshed it against v3.8-rc7 and dropped the check > for HC_STATE_SUSPENDED which we have moved to xhci_suspend() > itself. Sure, I can carry the revised patch for 3.10. I assume Greg isn't accepting new patches for 3.9 at this point? Sarah Sharp > drivers/usb/host/xhci-plat.c | 23 +++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index df90fe5..45913d1 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -185,11 +185,34 @@ static int xhci_plat_remove(struct platform_device *dev) > return 0; > } > > +#ifdef CONFIG_PM_SLEEP > +static int xhci_plat_suspend(struct device *dev) > +{ > + struct usb_hcd *hcd = dev_get_drvdata(dev); > + struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + > + return xhci_suspend(xhci); > +} > + > +static int xhci_plat_resume(struct device *dev) > +{ > + struct usb_hcd *hcd = dev_get_drvdata(dev); > + struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + > + return xhci_resume(xhci, 0); > +} > +#endif /* CONFIG_PM_SLEEP */ > + > +static const struct dev_pm_ops xhci_plat_pm_ops = { > + SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume) > +}; > + > static struct platform_driver usb_xhci_driver = { > .probe = xhci_plat_probe, > .remove = xhci_plat_remove, > .driver = { > .name = "xhci-hcd", > + .pm = &xhci_plat_pm_ops, > }, > }; > MODULE_ALIAS("platform:xhci-hcd"); > -- > 1.8.1.rc1.5.g7e0651a > -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html