In order to support wake up from suspend use the pinctrl framework to put the USB host pins in IDLE state during suspend. CC: Samuel Ortiz <sameo@xxxxxxxxxxxxxxx> Signed-off-by: Roger Quadros <rogerq@xxxxxx> --- drivers/mfd/omap-usb-host.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c index fb2b3d8..3734d16 100644 --- a/drivers/mfd/omap-usb-host.c +++ b/drivers/mfd/omap-usb-host.c @@ -31,6 +31,7 @@ #include <linux/of.h> #include <linux/of_platform.h> #include <linux/err.h> +#include <linux/pinctrl/consumer.h> #include "omap-usb.h" @@ -111,6 +112,7 @@ struct usbhs_hcd_omap { struct usbhs_omap_platform_data *pdata; u32 usbhs_rev; + bool no_idle; }; /*-------------------------------------------------------------------------*/ @@ -325,6 +327,7 @@ static int usbhs_runtime_resume(struct device *dev) dev_dbg(dev, "usbhs_runtime_resume\n"); + pinctrl_pm_select_default_state(dev); omap_tll_enable(pdata); if (!IS_ERR(omap->ehci_logic_fck)) @@ -378,6 +381,12 @@ static int usbhs_runtime_suspend(struct device *dev) dev_dbg(dev, "usbhs_runtime_suspend\n"); + if (omap->no_idle) { + dev_dbg(dev, "%s: Not suspending as IDLE pins not available\n", + __func__); + return -EBUSY; + } + for (i = 0; i < omap->nports; i++) { switch (pdata->port_mode[i]) { case OMAP_EHCI_PORT_MODE_HSIC: @@ -401,6 +410,7 @@ static int usbhs_runtime_suspend(struct device *dev) clk_disable(omap->ehci_logic_fck); omap_tll_disable(pdata); + pinctrl_pm_select_idle_state(dev); return 0; } @@ -608,6 +618,14 @@ static int usbhs_omap_probe(struct platform_device *pdev) return -ENOMEM; } + if (!dev->pins || !dev->pins->idle_state) { + /* If IDLE pins are not available, we can't remote wakeup, + * so prevent idling in that case. + */ + omap->no_idle = true; + dev_info(dev, "No IDLE pins so runtime idle disabled\n"); + } + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); omap->uhh_base = devm_ioremap_resource(dev, res); if (IS_ERR(omap->uhh_base)) @@ -796,6 +814,8 @@ static int usbhs_omap_probe(struct platform_device *pdev) } } + pinctrl_pm_select_default_state(dev); + return 0; err_alloc: @@ -872,6 +892,8 @@ static int usbhs_omap_remove(struct platform_device *pdev) /* remove children */ device_for_each_child(&pdev->dev, NULL, usbhs_omap_remove_child); + pinctrl_pm_select_idle_state(&pdev->dev); + return 0; } -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html