From patchwork Mon Dec 7 12:49:19 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jisheng Zhang X-Patchwork-Id: 7783581 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 679B1BEEE1 for ; Mon, 7 Dec 2015 12:56:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9031620380 for ; Mon, 7 Dec 2015 12:56:09 +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 43A9220462 for ; Mon, 7 Dec 2015 12:56:08 +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 1a5vJ4-0003C2-D4; Mon, 07 Dec 2015 12:54:18 +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 1a5vIP-0002tU-Ho for linux-arm-kernel@lists.infradead.org; Mon, 07 Dec 2015 12:53:38 +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 tB7CnTqM021293; Mon, 7 Dec 2015 04:53:14 -0800 Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 1yn9b2g691-1 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 07 Dec 2015 04:53:14 -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:12 -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:12 -0800 Received: from xhacker.marvell.com (unknown [10.37.135.134]) by maili.marvell.com (Postfix) with ESMTP id D942B3F7041; Mon, 7 Dec 2015 04:53:11 -0800 (PST) From: Jisheng Zhang To: , Subject: [PATCH v2 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Date: Mon, 7 Dec 2015 20:49:19 +0800 Message-ID: <1449492564-4803-3-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_045337_764599_8DF828FE X-CRM114-Status: GOOD ( 12.43 ) 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 Commit 7b8ef22ea547 ("usb: xhci: plat: Add USB phy support") adds the usb_phy for usb3, but it attached the usb_phy to incorrect hcd. The xhci->shared_hcd is the hcd for usb3, this patch fixes this issue by attach the usb_phy to the xhci->shared_hcd. Signed-off-by: Jisheng Zhang --- drivers/usb/host/xhci-plat.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index b566304..a8c465a 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -82,6 +82,7 @@ static int xhci_plat_probe(struct platform_device *pdev) struct resource *res; struct usb_hcd *hcd; struct clk *clk; + struct usb_phy *usb_phy; int ret; int irq; @@ -162,17 +163,18 @@ 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->usb_phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); - if (IS_ERR(hcd->usb_phy)) { - ret = PTR_ERR(hcd->usb_phy); + 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; - hcd->usb_phy = NULL; + usb_phy = NULL; } else { - ret = usb_phy_init(hcd->usb_phy); + ret = usb_phy_init(usb_phy); if (ret) goto put_usb3_hcd; } + xhci->shared_hcd->usb_phy = usb_phy; ret = usb_add_hcd(hcd, irq, IRQF_SHARED); if (ret) @@ -189,7 +191,7 @@ dealloc_usb2_hcd: usb_remove_hcd(hcd); disable_usb_phy: - usb_phy_shutdown(hcd->usb_phy); + usb_phy_shutdown(usb_phy); put_usb3_hcd: usb_put_hcd(xhci->shared_hcd); @@ -211,7 +213,7 @@ static int xhci_plat_remove(struct platform_device *dev) struct clk *clk = xhci->clk; usb_remove_hcd(xhci->shared_hcd); - usb_phy_shutdown(hcd->usb_phy); + usb_phy_shutdown(xhci->shared_hcd->usb_phy); usb_remove_hcd(hcd); usb_put_hcd(xhci->shared_hcd);