From patchwork Mon Dec 7 12:49:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 7783611 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 24C739F350 for ; Mon, 7 Dec 2015 12:56:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2A6AC203ED for ; Mon, 7 Dec 2015 12:56:37 +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 314E920380 for ; Mon, 7 Dec 2015 12:56:36 +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 1a5vJb-0003UA-AV; Mon, 07 Dec 2015 12:54:51 +0000 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a5vIS-0002tv-6E for linux-arm-kernel@lists.infradead.org; Mon, 07 Dec 2015 12:53:41 +0000 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.15.0.59/8.15.0.59) with SMTP id tB7CoMVE021756; Mon, 7 Dec 2015 04:53:19 -0800 Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 1ynaf9006g-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 07 Dec 2015 04:53:19 -0800 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1044.25; Mon, 7 Dec 2015 04:53:18 -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:18 -0800 Received: from xhacker.marvell.com (unknown [10.37.135.134]) by maili.marvell.com (Postfix) with ESMTP id 24CAA3F7040; Mon, 7 Dec 2015 04:53:17 -0800 (PST) From: Jisheng Zhang To: , Subject: [PATCH v2 6/7] usb: xhci: plat: add generic PHY support Date: Mon, 7 Dec 2015 20:49:23 +0800 Message-ID: <1449492564-4803-7-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_045340_345628_8421F597 X-CRM114-Status: GOOD ( 14.77 ) 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 Marvell BG4CT SoC needs two phy: one for usb2 and another for usb3. Add the calls to retrieve generic PHY to xhci plat in order to support this. Signed-off-by: Jisheng Zhang --- drivers/usb/host/xhci-plat.c | 87 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 75 insertions(+), 12 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index 62f02e5..bb972a6 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -73,6 +74,37 @@ static int xhci_plat_start(struct usb_hcd *hcd) return xhci_run(hcd); } +static int xhci_plat_phy_init(struct usb_hcd *hcd) +{ + int ret; + + if (hcd->phy) { + ret = phy_init(hcd->phy); + if (ret) + return ret; + + ret = phy_power_on(hcd->phy); + if (ret) { + phy_exit(hcd->phy); + return ret; + } + } else { + ret = usb_phy_init(hcd->usb_phy); + } + + return ret; +} + +static void xhci_plat_phy_exit(struct usb_hcd *hcd) +{ + if (hcd->phy) { + phy_power_off(hcd->phy); + phy_exit(hcd->phy); + } else { + usb_phy_shutdown(hcd->usb_phy); + } +} + static int xhci_plat_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; @@ -83,6 +115,7 @@ static int xhci_plat_probe(struct platform_device *pdev) struct usb_hcd *hcd; struct clk *clk; struct usb_phy *usb_phy; + struct phy *phy; int ret; int irq; @@ -163,22 +196,44 @@ static int xhci_plat_probe(struct platform_device *pdev) if (HCC_MAX_PSA(xhci->hcc_params) >= 4) xhci->shared_hcd->can_do_streams = 1; + hcd->phy = devm_phy_get(&pdev->dev, "usb2-phy"); + if (IS_ERR(hcd->phy)) { + ret = PTR_ERR(hcd->phy); + if (ret == -EPROBE_DEFER) + goto put_usb3_hcd; + hcd->phy = NULL; + } + + phy = devm_phy_get(&pdev->dev, "usb-phy"); + if (IS_ERR(phy)) { + ret = PTR_ERR(phy); + if (ret == -EPROBE_DEFER) + goto put_usb3_hcd; + phy = NULL; + } + usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); if (IS_ERR(usb_phy)) { ret = PTR_ERR(usb_phy); if (ret == -EPROBE_DEFER) goto put_usb3_hcd; usb_phy = NULL; - } else { - ret = usb_phy_init(usb_phy); - if (ret) - goto put_usb3_hcd; } + xhci->shared_hcd->usb_phy = usb_phy; + xhci->shared_hcd->phy = phy; + + ret = xhci_plat_phy_init(hcd); + if (ret) + goto put_usb3_hcd; + + ret = xhci_plat_phy_init(xhci->shared_hcd); + if (ret) + goto disable_usb2_phy; ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) - goto disable_usb_phy; + goto disable_usb3_phy; ret = usb_add_hcd(xhci->shared_hcd, irq, IRQF_SHARED); if (ret) @@ -190,8 +245,11 @@ static int xhci_plat_probe(struct platform_device *pdev) dealloc_usb2_hcd: usb_remove_hcd(hcd); -disable_usb_phy: - usb_phy_shutdown(usb_phy); +disable_usb3_phy: + xhci_plat_phy_exit(xhci->shared_hcd); + +disable_usb2_phy: + xhci_plat_phy_exit(hcd); put_usb3_hcd: usb_put_hcd(xhci->shared_hcd); @@ -212,11 +270,11 @@ static int xhci_plat_remove(struct platform_device *dev) struct clk *clk = xhci->clk; usb_remove_hcd(xhci->shared_hcd); - usb_phy_shutdown(xhci->shared_hcd->usb_phy); - - usb_remove_hcd(hcd); + xhci_plat_phy_exit(xhci->shared_hcd); usb_put_hcd(xhci->shared_hcd); + usb_remove_hcd(hcd); + xhci_plat_phy_exit(hcd); clk_disable_unprepare(clk); usb_put_hcd(hcd); @@ -242,7 +300,8 @@ static int xhci_plat_suspend(struct device *dev) if (ret) return ret; - usb_phy_shutdown(xhci->shared_hcd->usb_phy); + xhci_plat_phy_exit(xhci->shared_hcd); + xhci_plat_phy_exit(hcd); clk_disable_unprepare(xhci->clk); return ret; @@ -258,7 +317,11 @@ static int xhci_plat_resume(struct device *dev) if (ret) return ret; - ret = usb_phy_init(xhci->shared_hcd->usb_phy); + ret = xhci_plat_phy_init(hcd); + if (ret) + return ret; + + ret = xhci_plat_phy_init(xhci->shared_hcd); if (ret) return ret;