From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752375AbcDZNDh (ORCPT ); Tue, 26 Apr 2016 09:03:37 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:22286 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752423AbcDZNB7 (ORCPT ); Tue, 26 Apr 2016 09:01:59 -0400 From: Jisheng Zhang To: , CC: , , , , Jisheng Zhang Subject: [RESEND PATCH v2 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Date: Tue, 26 Apr 2016 20:57:35 +0800 Message-ID: <1461675460-2295-3-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461675460-2295-1-git-send-email-jszhang@marvell.com> References: <1461675460-2295-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-04-26_07:,, signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound 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-1603290000 definitions=main-1604260210 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 8cb46cb..9ff89e9 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -144,6 +144,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; @@ -231,17 +232,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) @@ -258,7 +260,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); @@ -280,7 +282,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); -- 2.8.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: jszhang@marvell.com (Jisheng Zhang) Date: Tue, 26 Apr 2016 20:57:35 +0800 Subject: [RESEND PATCH v2 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd In-Reply-To: <1461675460-2295-1-git-send-email-jszhang@marvell.com> References: <1461675460-2295-1-git-send-email-jszhang@marvell.com> Message-ID: <1461675460-2295-3-git-send-email-jszhang@marvell.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 8cb46cb..9ff89e9 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c @@ -144,6 +144,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; @@ -231,17 +232,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) @@ -258,7 +260,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); @@ -280,7 +282,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); -- 2.8.1