diff options
author | Mark Brown <broonie@kernel.org> | 2014-12-12 18:19:53 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-12 18:19:53 +0000 |
commit | c7da7ad00ab7ff435d83fe5c85cdb90851e94928 (patch) | |
tree | a0fa0090bc87b8118434f12b12bd8b1d0f728e3f /drivers/usb/host | |
parent | 7d750bffa1f89886df536641880b8fa0cd15c981 (diff) | |
parent | 1aa8c51d1c90b00e42ee053120a4c05227b4af24 (diff) |
Merge remote-tracking branch 'lsk/v3.14/topic/dwc3' into linux-linaro-lsk-v3.14
Conflicts:
drivers/usb/dwc3/core.c
drivers/usb/dwc3/gadget.c
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/xhci-plat.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 1d5ba3c299cc..d6f70a223a43 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -11,11 +11,12 @@ * version 2 as published by the Free Software Foundation. */ -#include <linux/platform_device.h> +#include <linux/dma-mapping.h> #include <linux/module.h> -#include <linux/slab.h> #include <linux/of.h> -#include <linux/dma-mapping.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/usb/xhci_pdriver.h> #include "xhci.h" @@ -87,6 +88,8 @@ static const struct hc_driver xhci_plat_xhci_driver = { static int xhci_plat_probe(struct platform_device *pdev) { + struct device_node *node = pdev->dev.of_node; + struct usb_xhci_pdata *pdata = dev_get_platdata(&pdev->dev); const struct hc_driver *driver; struct xhci_hcd *xhci; struct resource *res; @@ -152,6 +155,9 @@ static int xhci_plat_probe(struct platform_device *pdev) goto dealloc_usb2_hcd; } + if ((node && of_property_read_bool(node, "usb3-lpm-capable")) || + (pdata && pdata->usb3_lpm_capable)) + xhci->quirks |= XHCI_LPM_SUPPORT; /* * Set the xHCI pointer before xhci_plat_setup() (aka hcd_driver.reset) * is called by usb_add_hcd(). |