From patchwork Tue Jan 15 06:19:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chao Xie X-Patchwork-Id: 1975121 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 1220EDF23A for ; Tue, 15 Jan 2013 06:31:23 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TuzzQ-0006Cr-NO; Tue, 15 Jan 2013 06:27:18 +0000 Received: from na3sys009aog125.obsmtp.com ([74.125.149.153]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Tuzsm-0001xQ-VO for linux-arm-kernel@lists.infradead.org; Tue, 15 Jan 2013 06:20:29 +0000 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob125.postini.com ([74.125.148.12]) with SMTP ID DSNKUPT1I77l/t8iRjMYYqAZWrk8aB4Yvbpo@postini.com; Mon, 14 Jan 2013 22:20:24 PST Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 14 Jan 2013 22:19:43 -0800 Received: from localhost (unknown [10.38.36.239]) by maili.marvell.com (Postfix) with ESMTP id 2B9504E510; Mon, 14 Jan 2013 22:19:43 -0800 (PST) From: Chao Xie To: linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, haojian.zhuang@gmail.com, stern@rowland.harvard.edu, balbi@ti.com, gregkh@linuxfoundation.org, xiechao.mail@gmail.com Subject: [V3 PATCH 18/25] usb: gadget: mv_udc: add extern chip support Date: Tue, 15 Jan 2013 01:19:11 -0500 Message-Id: <1358230758-10176-19-git-send-email-chao.xie@marvell.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1358230758-10176-1-git-send-email-chao.xie@marvell.com> References: <1358230758-10176-1-git-send-email-chao.xie@marvell.com> X-OriginalArrivalTime: 15 Jan 2013 06:19:43.0442 (UTC) FILETIME=[4EF1DB20:01CDF2E8] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130115_012025_395066_75EF83C4 X-CRM114-Status: GOOD ( 17.16 ) X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.153 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Chao Xie 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 Because arch-mmp will make use of irq domain for irq allocation, the irqs allocated for PMIC is dynamical. The vbus/idpin irqs from PMIC can not be passed by platform data. Using the extern chip APIs provides by PHY driver can solve this problem. Marvell usb PHY driver provides a middle layer. The PMIC usb drivers will help to register the callbacks in the marvell usb PHY driver. udc/otg/ehci driver will call the callbacks. Then we do not need pass the information in platform data. It will remove another block in the way of enabling device tree for usb. 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 76fcfc7..4b50334 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 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 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 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 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 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.