From patchwork Fri Nov 20 22:37:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bird, Tim" X-Patchwork-Id: 7671761 Return-Path: X-Original-To: patchwork-linux-arm-msm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C5B63BF90C for ; Fri, 20 Nov 2015 22:38:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 056CE204D5 for ; Fri, 20 Nov 2015 22:38:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 008382047D for ; Fri, 20 Nov 2015 22:38:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761081AbbKTWha (ORCPT ); Fri, 20 Nov 2015 17:37:30 -0500 Received: from seldrel01.sonyericsson.com ([37.139.156.2]:8756 "EHLO seldrel01.sonyericsson.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761010AbbKTWh2 (ORCPT ); Fri, 20 Nov 2015 17:37:28 -0500 From: Tim Bird To: , , , CC: , , , , , , , , Subject: [PATCH v2 2/3] usb: phy: msm: fix connect/disconnect bug for dragonboard OTG port Date: Fri, 20 Nov 2015 14:37:17 -0800 Message-ID: <1448059038-6179-2-git-send-email-tim.bird@sonymobile.com> X-Mailer: git-send-email 1.8.2.2 In-Reply-To: <1448059038-6179-1-git-send-email-tim.bird@sonymobile.com> References: <1448059038-6179-1-git-send-email-tim.bird@sonymobile.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for async_irq to wake up driver from low power mode. Without this, the power management code never calls resume. Remove a spurious interrupt enable in the driver resume function. Signed-off-by: Tim Bird --- drivers/usb/phy/phy-msm-usb.c | 17 ++++++++++++++++- include/linux/usb/msm_hsusb.h | 1 + 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index e40a071..db6297c 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c @@ -648,7 +648,6 @@ skip_phy_resume: if (motg->async_int) { motg->async_int = 0; pm_runtime_put(phy->dev); - enable_irq(motg->irq); } dev_info(phy->dev, "USB exited from low power mode\n"); @@ -1732,6 +1731,12 @@ static int msm_otg_probe(struct platform_device *pdev) return motg->irq; } + motg->async_irq = platform_get_irq_byname(pdev, "async_irq"); + if (motg->async_irq < 0) { + dev_err(&pdev->dev, "platform_get_irq for async_irq failed\n"); + motg->async_irq = 0; + } + regs[0].supply = "vddcx"; regs[1].supply = "v3p3"; regs[2].supply = "v1p8"; @@ -1781,6 +1786,16 @@ static int msm_otg_probe(struct platform_device *pdev) goto disable_ldo; } + if (motg->async_irq) { + ret = devm_request_irq(&pdev->dev, motg->async_irq, + msm_otg_irq, IRQF_TRIGGER_RISING, + "msm_otg", motg); + if (ret) { + dev_err(&pdev->dev, "request irq failed (ASYNC INT)\n"); + goto disable_ldo; + } + } + phy->init = msm_phy_init; phy->set_power = msm_otg_set_power; phy->notify_disconnect = msm_phy_notify_disconnect; diff --git a/include/linux/usb/msm_hsusb.h b/include/linux/usb/msm_hsusb.h index 8c8f685..08c67a3 100644 --- a/include/linux/usb/msm_hsusb.h +++ b/include/linux/usb/msm_hsusb.h @@ -164,6 +164,7 @@ struct msm_otg { struct usb_phy phy; struct msm_otg_platform_data *pdata; int irq; + int async_irq; struct clk *clk; struct clk *pclk; struct clk *core_clk;