From patchwork Thu Nov 22 02:05:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Xie X-Patchwork-Id: 1782771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id E3E40DFF71 for ; Thu, 22 Nov 2012 02:39:00 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbMdm-0000Pg-II; Thu, 22 Nov 2012 02:35:46 +0000 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbMdW-0000Mi-9b for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2012 02:35:31 +0000 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob127.postini.com ([74.125.148.12]) with SMTP ID DSNKUK2Pbk6S3S9CkBuJG+573wwG/78s0aGW@postini.com; Wed, 21 Nov 2012 18:35:30 PST Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Wed, 21 Nov 2012 18:05:26 -0800 Received: from localhost (unknown [10.38.36.205]) by maili.marvell.com (Postfix) with ESMTP id 6E3394E510; Wed, 21 Nov 2012 18:05:26 -0800 (PST) From: Chao Xie To: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, haojian.zhuang@gmail.com Subject: [PATCH 20/29] usb: gadget: mv_udc: add extern chip support Date: Wed, 21 Nov 2012 21:05:01 -0500 Message-Id: <1353549910-988-20-git-send-email-xiechao.mail@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1353549910-988-1-git-send-email-xiechao.mail@gmail.com> References: <1353549910-988-1-git-send-email-xiechao.mail@gmail.com> X-OriginalArrivalTime: 22 Nov 2012 02:05:26.0660 (UTC) FILETIME=[D6E32C40:01CDC855] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121121_213530_534009_A7172313 X-CRM114-Status: GOOD ( 15.50 ) X-Spam-Score: -3.3 (---) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-3.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (xiechao.mail[at]gmail.com) -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.107 listed in list.dnswl.org] 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.9 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Chao Xie Signed-off-by: Chao Xie --- drivers/usb/gadget/mv_udc.h | 3 ++ drivers/usb/gadget/mv_udc_core.c | 45 ++++++++++++++++++++++--------------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/drivers/usb/gadget/mv_udc.h b/drivers/usb/gadget/mv_udc.h index 4851b2b..50ae7c7 100644 --- a/drivers/usb/gadget/mv_udc.h +++ b/drivers/usb/gadget/mv_udc.h @@ -178,6 +178,9 @@ struct mv_udc { struct platform_device *dev; int irq; + unsigned int extern_attr; + struct notifier_block notifier; + struct mv_cap_regs __iomem *cap_regs; struct mv_op_regs __iomem *op_regs; unsigned int max_eps; diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c index 6f01d5e..5571f42 100644 --- a/drivers/usb/gadget/mv_udc_core.c +++ b/drivers/usb/gadget/mv_udc_core.c @@ -2077,15 +2077,16 @@ static irqreturn_t mv_udc_irq(int irq, void *dev) return IRQ_HANDLED; } -static irqreturn_t mv_udc_vbus_irq(int irq, void *dev) +static int mv_udc_vbus_notifier_call(struct notifier_block *nb, + unsigned long val, void *v) { - struct mv_udc *udc = (struct mv_udc *)dev; + struct mv_udc *udc = container_of(nb, struct mv_udc, notifier); /* polling VBUS and init phy may cause too much time*/ - if (udc->qwork) + if (udc->qwork && val == EVENT_VBUS) queue_work(udc->qwork, &udc->vbus_work); - return IRQ_HANDLED; + return 0; } static void mv_udc_vbus_work(struct work_struct *work) @@ -2094,10 +2095,12 @@ static void mv_udc_vbus_work(struct work_struct *work) unsigned int vbus; udc = container_of(work, struct mv_udc, vbus_work); - if (!udc->pdata->vbus) + if (!(udc->extern_attr & MV_USB_HAS_VBUS_DETECTION)) + return; + + if (mv_usb2_extern_call(udc->phy, vbus, get_vbus, &vbus)) return; - vbus = udc->pdata->vbus->poll(); dev_info(&udc->dev->dev, "vbus is %d\n", vbus); if (vbus == VBUS_HIGH) @@ -2124,6 +2127,9 @@ static int __devexit mv_udc_remove(struct platform_device *pdev) usb_del_gadget_udc(&udc->gadget); + if (udc->extern_attr & MV_USB_HAS_VBUS_DETECTION) + mv_usb2_unregister_notifier(udc->phy, &udc->notifier); + if (udc->qwork) { flush_workqueue(udc->qwork); destroy_workqueue(udc->qwork); @@ -2169,6 +2175,7 @@ static int __devinit mv_udc_probe(struct platform_device *pdev) } udc->done = &release_done; + udc->extern_attr = pdata->extern_attr; udc->pdata = pdev->dev.platform_data; spin_lock_init(&udc->lock); @@ -2319,17 +2326,8 @@ static int __devinit mv_udc_probe(struct platform_device *pdev) /* VBUS detect: we can disable/enable clock on demand.*/ if (udc->transceiver) udc->clock_gating = 1; - else if (pdata->vbus) { + else if (udc->extern_attr & MV_USB_HAS_VBUS_DETECTION) { udc->clock_gating = 1; - retval = devm_request_threaded_irq(&pdev->dev, - pdata->vbus->irq, NULL, - mv_udc_vbus_irq, IRQF_ONESHOT, "vbus", udc); - if (retval) { - dev_info(&pdev->dev, - "Can not request irq for VBUS, " - "disable clock gating\n"); - udc->clock_gating = 0; - } udc->qwork = create_singlethread_workqueue("mv_udc_queue"); if (!udc->qwork) { @@ -2339,6 +2337,8 @@ static int __devinit mv_udc_probe(struct platform_device *pdev) } INIT_WORK(&udc->vbus_work, mv_udc_vbus_work); + udc->notifier.notifier_call = mv_udc_vbus_notifier_call; + mv_usb2_register_notifier(udc->phy, &udc->notifier); } /* @@ -2362,6 +2362,9 @@ static int __devinit mv_udc_probe(struct platform_device *pdev) return 0; err_create_workqueue: + if (!udc->transceiver + && (udc->extern_attr & MV_USB_HAS_VBUS_DETECTION)) + mv_usb2_unregister_notifier(udc->phy, &udc->notifier); destroy_workqueue(udc->qwork); err_unregister: device_unregister(&udc->gadget.dev); @@ -2380,6 +2383,7 @@ err_disable_clock: static int mv_udc_suspend(struct device *dev) { struct mv_udc *udc; + unsigned int vbus; udc = dev_get_drvdata(dev); @@ -2387,11 +2391,16 @@ static int mv_udc_suspend(struct device *dev) if (udc->transceiver) return 0; - if (udc->pdata->vbus && udc->pdata->vbus->poll) - if (udc->pdata->vbus->poll() == VBUS_HIGH) { + if ((udc->extern_attr & MV_USB_HAS_VBUS_DETECTION) && + mv_usb2_has_extern_call(udc->phy, vbus, get_vbus)) { + if (mv_usb2_extern_call(udc->phy, vbus, get_vbus, &vbus)) + return -EAGAIN; + + if (vbus == VBUS_HIGH) { dev_info(&udc->dev->dev, "USB cable is connected!\n"); return -EAGAIN; } + } /* * only cable is unplugged, udc can suspend.