From patchwork Mon Nov 26 09:11:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Chen X-Patchwork-Id: 1801121 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id B7E113FC23 for ; Mon, 26 Nov 2012 09:16:53 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TculH-000700-PY; Mon, 26 Nov 2012 09:13:56 +0000 Received: from co9ehsobe004.messaging.microsoft.com ([207.46.163.27] helo=co9outboundpool.messaging.microsoft.com) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TcujJ-00065f-TL for linux-arm-kernel@lists.infradead.org; Mon, 26 Nov 2012 09:11:55 +0000 Received: from mail101-co9-R.bigfish.com (10.236.132.248) by CO9EHSOBE035.bigfish.com (10.236.130.98) with Microsoft SMTP Server id 14.1.225.23; Mon, 26 Nov 2012 09:11:52 +0000 Received: from mail101-co9 (localhost [127.0.0.1]) by mail101-co9-R.bigfish.com (Postfix) with ESMTP id D2871220121; Mon, 26 Nov 2012 09:11:51 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1de0h1202h1d1ah1d2ahzz8275bhz2dh2a8h668h839hd24he5bhf0ah1288h12a5h12a9h12bdh12e5h1354h137ah139eh13b6h1441h1504h1537h162dh1631h1155h) Received: from mail101-co9 (localhost.localdomain [127.0.0.1]) by mail101-co9 (MessageSwitch) id 1353921109814577_23178; Mon, 26 Nov 2012 09:11:49 +0000 (UTC) Received: from CO9EHSMHS009.bigfish.com (unknown [10.236.132.227]) by mail101-co9.bigfish.com (Postfix) with ESMTP id B915E4E005C; Mon, 26 Nov 2012 09:11:49 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO9EHSMHS009.bigfish.com (10.236.130.19) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 26 Nov 2012 09:11:44 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.318.3; Mon, 26 Nov 2012 09:11:44 +0000 Received: from localhost.localdomain (nchen-desktop.ap.freescale.net [10.192.242.40]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id qAQ9B9mS026936; Mon, 26 Nov 2012 02:11:40 -0700 From: Peter Chen To: , Subject: [PATCH v3 7/7] usb: chipidea: imx: add internal vbus regulator control Date: Mon, 26 Nov 2012 17:11:08 +0800 Message-ID: <1353921068-15673-8-git-send-email-peter.chen@freescale.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1353921068-15673-1-git-send-email-peter.chen@freescale.com> References: <1353921068-15673-1-git-send-email-peter.chen@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121126_041154_184640_AAF72575 X-CRM114-Status: GOOD ( 19.28 ) X-Spam-Score: -1.2 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.46.163.27 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: marex@denx.de, m.grzeschik@pengutronix.de, gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, balbi@ti.com, mkl@pengutronix.de, kernel@pengutronix.de, shawn.guo@linaro.org, festevam@gmail.com, linux-arm-kernel@lists.infradead.org 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: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org - For host, the vbus should always be on. - For otg, the vbus is off defaultly, the vbus needs to be turned on/off when usb role switches. Signed-off-by: Peter Chen --- Changes for v3: - Add return value check for regulator_enable/regulator_disable - typo error drivers/usb/chipidea/ci.h | 6 ++- drivers/usb/chipidea/ci13xxx_imx.c | 80 ++++++++++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 20 deletions(-) diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h index bc9e4e1..9528f6a 100644 --- a/drivers/usb/chipidea/ci.h +++ b/drivers/usb/chipidea/ci.h @@ -135,6 +135,7 @@ struct hw_bank { * @hcd: pointer to usb_hcd for ehci host driver * @otg: for otg support * @events: events for otg, and handled at ci_role_work + * @reg_vbus: used to control internal vbus regulator */ struct ci13xxx { struct device *dev; @@ -171,10 +172,11 @@ struct ci13xxx { bool global_phy; struct usb_phy *transceiver; struct usb_hcd *hcd; - struct usb_otg otg; + struct usb_otg otg; #define CI_ID 0 #define CI_B_SESS_VALID 1 - unsigned long events; + unsigned long events; + struct regulator *reg_vbus; }; static inline struct ci_role_driver *ci_role(struct ci13xxx *ci) diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c index 86671a3..b50cfd7 100644 --- a/drivers/usb/chipidea/ci13xxx_imx.c +++ b/drivers/usb/chipidea/ci13xxx_imx.c @@ -88,14 +88,47 @@ EXPORT_SYMBOL_GPL(usbmisc_get_init_data); static struct ci13xxx_platform_data ci13xxx_imx_platdata __devinitdata = { .name = "ci13xxx_imx", .flags = CI13XXX_REQUIRE_TRANSCEIVER | - CI13XXX_DISABLE_STREAMING, + CI13XXX_DISABLE_STREAMING | + CI13XXX_REGS_SHARED, .capoffset = DEF_CAPOFFSET, }; +static int ci13xxx_otg_set_vbus(struct usb_otg *otg, bool enabled) +{ + struct ci13xxx *ci = container_of(otg, struct ci13xxx, otg); + struct regulator *reg_vbus = ci->reg_vbus; + int ret; + + WARN_ON(!reg_vbus); + + if (reg_vbus) { + if (enabled) { + ret = regulator_enable(reg_vbus); + if (ret) { + dev_err(ci->dev, + "Failed to enable vbus regulator, ret=%d\n", + ret); + return ret; + } + } else { + ret = regulator_disable(reg_vbus); + if (ret) { + dev_err(ci->dev, + "Failed to disable vbus regulator, ret=%d\n", + ret); + return ret; + } + } + } + + return 0; +} + static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) { struct ci13xxx_imx_data *data; struct platform_device *plat_ci, *phy_pdev; + struct ci13xxx *ci; struct device_node *phy_np; struct resource *res; struct regulator *reg_vbus; @@ -152,20 +185,11 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) } } - /* we only support host now, so enable vbus here */ reg_vbus = devm_regulator_get(&pdev->dev, "vbus"); - if (!IS_ERR(reg_vbus)) { - ret = regulator_enable(reg_vbus); - if (ret) { - dev_err(&pdev->dev, - "Failed to enable vbus regulator, err=%d\n", - ret); - goto put_np; - } + if (!IS_ERR(reg_vbus)) data->reg_vbus = reg_vbus; - } else { + else reg_vbus = NULL; - } ci13xxx_imx_platdata.phy = data->phy; @@ -175,7 +199,7 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) if (!pdev->dev.dma_mask) { ret = -ENOMEM; dev_err(&pdev->dev, "Failed to alloc dma_mask!\n"); - goto err; + goto put_np; } *pdev->dev.dma_mask = DMA_BIT_MASK(32); dma_set_coherent_mask(&pdev->dev, *pdev->dev.dma_mask); @@ -186,7 +210,7 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", ret); - goto err; + goto put_np; } } @@ -198,24 +222,44 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Can't register ci_hdrc platform device, err=%d\n", ret); - goto err; + goto put_np; } data->ci_pdev = plat_ci; platform_set_drvdata(pdev, data); + ci = platform_get_drvdata(plat_ci); + /* + * Internal vbus on/off policy + * - Always on for host only function + * - Always off for gadget only function + * - call otg.set_vbus to control on/off according usb role + */ + + if (ci->roles[CI_ROLE_HOST] && !ci->roles[CI_ROLE_GADGET] + && reg_vbus) { + ret = regulator_enable(reg_vbus); + if (ret) { + dev_err(&pdev->dev, + "Failed to enable vbus regulator, ret=%d\n", + ret); + goto put_np; + } + } else if (ci->is_otg) { + ci->otg.set_vbus = ci13xxx_otg_set_vbus; + ci->reg_vbus = data->reg_vbus; + } + pm_runtime_no_callbacks(&pdev->dev); pm_runtime_enable(&pdev->dev); return 0; -err: - if (reg_vbus) - regulator_disable(reg_vbus); put_np: if (phy_np) of_node_put(phy_np); clk_disable_unprepare(data->clk); + return ret; }