Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1283844
| From | Jisheng Zhang <jszhang@marvell.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd |
| Date | 2015-12-04 15:20 +0100 |
| Message-ID | <qBZnl-3Km-13@gated-at.bofh.it> (permalink) |
| References | <qBZnk-3Km-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 <jszhang@marvell.com>
---
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);
--
2.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 0/7] usb: xhci-plat: support generic PHY and vbus regulator Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 6/7] usb: xhci: plat: add generic PHY support Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 6/7] usb: xhci: plat: add generic PHY support Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
Re: [PATCH 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 4/7] usb: xhci: plat: sort the headers in alphabetic order Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 4/7] usb: xhci: plat: sort the headers in alphabetic order Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
[PATCH 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 3/7] usb: xhci: plat: Fix suspend/resume when the optional usb_phy exists Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
Re: [PATCH 0/7] usb: xhci-plat: support generic PHY and vbus regulator Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
[PATCH 7/7] usb: xhci: plat: add vbus regulator control Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 7/7] usb: xhci: plat: add vbus regulator control Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:30 +0100
[PATCH 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
Re: [PATCH 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Jisheng Zhang <jszhang@marvell.com> - 2015-12-04 15:20 +0100
csiph-web