From c8bb4e649ddb6f26b891942dc12de1217cd6015d Mon Sep 17 00:00:00 2001 From: Amit Blay Date: Thu, 24 May 2012 16:59:23 +0300 Subject: [PATCH] usb: gadget: Add RESUME from XO workaround This is a workaround to MDM9x15 HW limitation of failure to wake up from XO shutdown by USB RESUME signal. To overcome this, a board rework is needed, so the CPU can wake up directly from D+ line. A GPIO IRQ is used for that purpose, and the ci13xxx_msm registers for this IRQ. CRs-Fixed: 359272 Change-Id: Ica148bc4c4eea5b0c1feed396afd617fdb19a9dc Signed-off-by: Amit Blay [sboyd: Drop board-file changes] Signed-off-by: Stephen Boyd --- drivers/usb/gadget/ci13xxx_msm.c | 114 ++++++++++++++++++++++++++++++- drivers/usb/gadget/ci13xxx_udc.c | 6 ++ drivers/usb/gadget/ci13xxx_udc.h | 2 + 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/drivers/usb/gadget/ci13xxx_msm.c b/drivers/usb/gadget/ci13xxx_msm.c index 49b5a7eb369..7e3001f3675 100644 --- a/drivers/usb/gadget/ci13xxx_msm.c +++ b/drivers/usb/gadget/ci13xxx_msm.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "ci13xxx_udc.c" @@ -18,6 +19,9 @@ struct ci13xxx_udc_context { int irq; void __iomem *regs; + int wake_gpio; + int wake_irq; + bool wake_irq_state; }; static struct ci13xxx_udc_context _udc_ctxt; @@ -27,23 +31,71 @@ static irqreturn_t msm_udc_irq(int irq, void *data) return udc_irq(); } +static void ci13xxx_msm_suspend(void) +{ + struct device *dev = _udc->gadget.dev.parent; + dev_dbg(dev, "ci13xxx_msm_suspend\n"); + + if (_udc_ctxt.wake_irq && !_udc_ctxt.wake_irq_state) { + enable_irq_wake(_udc_ctxt.wake_irq); + enable_irq(_udc_ctxt.wake_irq); + _udc_ctxt.wake_irq_state = true; + } +} + +static void ci13xxx_msm_resume(void) +{ + struct device *dev = _udc->gadget.dev.parent; + dev_dbg(dev, "ci13xxx_msm_resume\n"); + + if (_udc_ctxt.wake_irq && _udc_ctxt.wake_irq_state) { + disable_irq_wake(_udc_ctxt.wake_irq); + disable_irq(_udc_ctxt.wake_irq); + _udc_ctxt.wake_irq_state = false; + } +} + static void ci13xxx_msm_notify_event(struct ci13xxx *udc, unsigned event) { struct device *dev = udc->gadget.dev.parent; switch (event) { case CI13XXX_CONTROLLER_RESET_EVENT: - dev_dbg(dev, "CI13XXX_CONTROLLER_RESET_EVENT received\n"); + dev_info(dev, "CI13XXX_CONTROLLER_RESET_EVENT received\n"); writel(0, USB_AHBBURST); writel_relaxed(0x08, USB_AHBMODE); break; + case CI13XXX_CONTROLLER_DISCONNECT_EVENT: + dev_info(dev, "CI13XXX_CONTROLLER_DISCONNECT_EVENT received\n"); + ci13xxx_msm_resume(); break; + case CI13XXX_CONTROLLER_SUSPEND_EVENT: + dev_info(dev, "CI13XXX_CONTROLLER_SUSPEND_EVENT received\n"); + ci13xxx_msm_suspend(); + break; + case CI13XXX_CONTROLLER_RESUME_EVENT: + dev_info(dev, "CI13XXX_CONTROLLER_RESUME_EVENT received\n"); + ci13xxx_msm_resume(); + break; + default: dev_dbg(dev, "unknown ci13xxx_udc event\n"); break; } } +static irqreturn_t ci13xxx_msm_resume_irq(int irq, void *data) +{ + struct ci13xxx *udc = _udc; + + if (udc->transceiver && udc->vbus_active && udc->suspended) + usb_phy_set_suspend(udc->transceiver, 0); + else if (!udc->suspended) + ci13xxx_msm_resume(); + + return IRQ_HANDLED; +} + static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .name = "ci13xxx_msm", .flags = CI13XXX_REGS_SHARED | @@ -56,6 +108,52 @@ static struct ci13xxx_udc_driver ci13xxx_msm_udc_driver = { .notify_event = ci13xxx_msm_notify_event, }; +static int ci13xxx_msm_install_wake_gpio(struct platform_device *pdev, + struct resource *res) +{ + int wake_irq; + int ret; + + dev_dbg(&pdev->dev, "ci13xxx_msm_install_wake_gpio\n"); + + _udc_ctxt.wake_gpio = res->start; + gpio_request(_udc_ctxt.wake_gpio, "USB_RESUME"); + gpio_direction_input(_udc_ctxt.wake_gpio); + wake_irq = gpio_to_irq(_udc_ctxt.wake_gpio); + if (wake_irq < 0) { + dev_err(&pdev->dev, "could not register USB_RESUME GPIO.\n"); + return -ENXIO; + } + + dev_dbg(&pdev->dev, "_udc_ctxt.gpio_irq = %d and irq = %d\n", + _udc_ctxt.wake_gpio, wake_irq); + ret = request_irq(wake_irq, ci13xxx_msm_resume_irq, + IRQF_TRIGGER_HIGH | IRQF_ONESHOT, "usb resume", NULL); + if (ret < 0) { + dev_err(&pdev->dev, "could not register USB_RESUME IRQ.\n"); + goto gpio_free; + } + disable_irq(wake_irq); + _udc_ctxt.wake_irq = wake_irq; + + return 0; + +gpio_free: + gpio_free(_udc_ctxt.wake_gpio); + _udc_ctxt.wake_gpio = 0; + return ret; +} + +static void ci13xxx_msm_uninstall_wake_gpio(struct platform_device *pdev) +{ + dev_dbg(&pdev->dev, "ci13xxx_msm_uninstall_wake_gpio\n"); + + if (_udc_ctxt.wake_gpio) { + gpio_free(_udc_ctxt.wake_gpio); + _udc_ctxt.wake_gpio = 0; + } +} + static int ci13xxx_msm_probe(struct platform_device *pdev) { struct resource *res; @@ -88,11 +186,20 @@ static int ci13xxx_msm_probe(struct platform_device *pdev) goto udc_remove; } + res = platform_get_resource_byname(pdev, IORESOURCE_IO, "USB_RESUME"); + if (res) { + ret = ci13xxx_msm_install_wake_gpio(pdev, res); + if (ret < 0) { + dev_err(&pdev->dev, "gpio irq install failed\n"); + goto udc_remove; + } + } + ret = request_irq(_udc_ctxt.irq, msm_udc_irq, IRQF_SHARED, pdev->name, pdev); if (ret < 0) { dev_err(&pdev->dev, "request_irq failed\n"); - goto udc_remove; + goto gpio_uninstall; } pm_runtime_no_callbacks(&pdev->dev); @@ -100,6 +207,8 @@ static int ci13xxx_msm_probe(struct platform_device *pdev) return 0; +gpio_uninstall: + ci13xxx_msm_uninstall_wake_gpio(pdev); udc_remove: udc_remove(); iounmap: @@ -112,6 +221,7 @@ int ci13xxx_msm_remove(struct platform_device *pdev) { pm_runtime_disable(&pdev->dev); free_irq(_udc_ctxt.irq, pdev); + ci13xxx_msm_uninstall_wake_gpio(pdev); udc_remove(); iounmap(_udc_ctxt.regs); return 0; diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index a6f280285a3..4043ea2dc95 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c @@ -2037,6 +2037,9 @@ static void isr_resume_handler(struct ci13xxx *udc) USB_SPEED_HIGH : USB_SPEED_FULL; if (udc->suspended) { spin_unlock(udc->lock); + if (udc->udc_driver->notify_event) + udc->udc_driver->notify_event(udc, + CI13XXX_CONTROLLER_RESUME_EVENT); if (udc->transceiver) usb_phy_set_suspend(udc->transceiver, 0); udc->driver->resume(&udc->gadget); @@ -2930,6 +2933,9 @@ static int ci13xxx_vbus_session(struct usb_gadget *_gadget, int is_active) } else { hw_device_state(0); _gadget_stop_activity(&udc->gadget); + if (udc->udc_driver->notify_event) + udc->udc_driver->notify_event(udc, + CI13XXX_CONTROLLER_DISCONNECT_EVENT); pm_runtime_put_sync(&_gadget->dev); } } diff --git a/drivers/usb/gadget/ci13xxx_udc.h b/drivers/usb/gadget/ci13xxx_udc.h index f435fbae170..6b454fb9db4 100644 --- a/drivers/usb/gadget/ci13xxx_udc.h +++ b/drivers/usb/gadget/ci13xxx_udc.h @@ -124,6 +124,8 @@ struct ci13xxx_udc_driver { #define CI13XXX_CONTROLLER_CONNECT_EVENT 1 #define CI13XXX_CONTROLLER_SUSPEND_EVENT 2 #define CI13XXX_CONTROLLER_REMOTE_WAKEUP_EVENT 3 +#define CI13XXX_CONTROLLER_RESUME_EVENT 4 +#define CI13XXX_CONTROLLER_DISCONNECT_EVENT 5 void (*notify_event) (struct ci13xxx *udc, unsigned event); };