From patchwork Mon Dec 7 12:49:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 7783621 Return-Path: X-Original-To: patchwork-linux-arm@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 9E013BEEE1 for ; Mon, 7 Dec 2015 12:57:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AEDC2203AE for ; Mon, 7 Dec 2015 12:57:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7BDD820380 for ; Mon, 7 Dec 2015 12:57:01 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1a5vJs-0003yT-Lj; Mon, 07 Dec 2015 12:55:08 +0000 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a5vIT-0002u7-E1 for linux-arm-kernel@lists.infradead.org; Mon, 07 Dec 2015 12:53:42 +0000 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id tB7CnTqN021293; Mon, 7 Dec 2015 04:53:21 -0800 Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 1yn9b2g69b-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 07 Dec 2015 04:53:21 -0800 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Mon, 7 Dec 2015 04:53:19 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server id 15.0.1044.25 via Frontend Transport; Mon, 7 Dec 2015 04:53:19 -0800 Received: from xhacker.marvell.com (unknown [10.37.135.134]) by maili.marvell.com (Postfix) with ESMTP id 898C53F703F; Mon, 7 Dec 2015 04:53:18 -0800 (PST) From: Jisheng Zhang To: , Subject: [PATCH v2 7/7] usb: xhci: plat: add vbus regulator control Date: Mon, 7 Dec 2015 20:49:24 +0800 Message-ID: <1449492564-4803-8-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1449492564-4803-1-git-send-email-jszhang@marvell.com> References: <1449492564-4803-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2015-12-07_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=inbound_notspam policy=inbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1507310000 definitions=main-1512070206 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151207_045341_738066_9F8EF2A6 X-CRM114-Status: GOOD ( 14.86 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jisheng Zhang , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 The Marvell BG4CT STB board has board level vbus control through gpio. This patch adds the vbus regulator control to support this board. Signed-off-by: Jisheng Zhang --- drivers/usb/host/xhci-plat.c | 39 ++++++++++++++++++++++++++++++++++++++- drivers/usb/host/xhci.h | 2 ++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index bb972a6..c03e8d5 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -116,6 +117,7 @@ static int xhci_plat_probe(struct platform_device *pdev) struct clk *clk; struct usb_phy *usb_phy; struct phy *phy; + struct regulator *vbus; int ret; int irq; @@ -179,14 +181,31 @@ static int xhci_plat_probe(struct platform_device *pdev) device_wakeup_enable(hcd->self.controller); + vbus = devm_regulator_get(&pdev->dev, "vbus"); + if (PTR_ERR(vbus) == -ENODEV) { + vbus = NULL; + } else if (IS_ERR(vbus)) { + ret = PTR_ERR(vbus); + goto disable_clk; + } else if (vbus) { + ret = regulator_enable(vbus); + if (ret) { + dev_err(&pdev->dev, + "failed to enable usb vbus regulator: %d\n", + ret); + goto disable_clk; + } + } + xhci = hcd_to_xhci(hcd); xhci->clk = clk; + xhci->vbus = vbus; xhci->main_hcd = hcd; xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, dev_name(&pdev->dev), hcd); if (!xhci->shared_hcd) { ret = -ENOMEM; - goto disable_clk; + goto disable_vbus; } if ((node && of_property_read_bool(node, "usb3-lpm-capable")) || @@ -254,6 +273,10 @@ disable_usb2_phy: put_usb3_hcd: usb_put_hcd(xhci->shared_hcd); +disable_vbus: + if (vbus) + regulator_disable(vbus); + disable_clk: clk_disable_unprepare(clk); @@ -268,6 +291,7 @@ static int xhci_plat_remove(struct platform_device *dev) struct usb_hcd *hcd = platform_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct clk *clk = xhci->clk; + struct regulator *vbus = xhci->vbus; usb_remove_hcd(xhci->shared_hcd); xhci_plat_phy_exit(xhci->shared_hcd); @@ -278,6 +302,9 @@ static int xhci_plat_remove(struct platform_device *dev) clk_disable_unprepare(clk); usb_put_hcd(hcd); + if (vbus) + regulator_disable(vbus); + return 0; } @@ -287,6 +314,7 @@ static int xhci_plat_suspend(struct device *dev) int ret; struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); + struct regulator *vbus = xhci->vbus; /* * xhci_suspend() needs `do_wakeup` to know whether host is allowed @@ -303,6 +331,8 @@ static int xhci_plat_suspend(struct device *dev) xhci_plat_phy_exit(xhci->shared_hcd); xhci_plat_phy_exit(hcd); clk_disable_unprepare(xhci->clk); + if (vbus) + ret = regulator_disable(vbus); return ret; } @@ -312,11 +342,18 @@ static int xhci_plat_resume(struct device *dev) int ret; struct usb_hcd *hcd = dev_get_drvdata(dev); struct xhci_hcd *xhci = hcd_to_xhci(hcd); + struct regulator *vbus = xhci->vbus; ret = clk_prepare_enable(xhci->clk); if (ret) return ret; + if (vbus) { + ret = regulator_enable(vbus); + if (ret) + return ret; + } + ret = xhci_plat_phy_init(hcd); if (ret) return ret; diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 0b94512..1355d2a 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h @@ -1541,6 +1541,8 @@ struct xhci_hcd { struct msix_entry *msix_entries; /* optional clock */ struct clk *clk; + /* optional regulator */ + struct regulator *vbus; /* data structures */ struct xhci_device_context_array *dcbaa; struct xhci_ring *cmd_ring;