From: felipe.balbi@linux•intel.com (Felipe Balbi)
To: linux-arm-kernel@lists•infradead.org
Subject: [RESEND PATCH v2 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd
Date: Wed, 27 Apr 2016 08:29:34 +0300 [thread overview]
Message-ID: <87potbpqkh.fsf@intel.com> (raw)
In-Reply-To: <1461675460-2295-3-git-send-email-jszhang@marvell.com>
Hi,
(Cc authors and maintainer, otherwise you're patch might be forgotten ;-)
Jisheng Zhang <jszhang@marvell•com> writes:
> 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
where did you see that's the USB3 phy ? I can't see it.
> xhci->shared_hcd is the hcd for usb3, this patch fixes this issue
> by attach the usb_phy to the xhci->shared_hcd.
Fixes: 7b8ef22ea547 ("usb: xhci: plat: Add USB phy support")
Cc: <stable@vger•kernel.org # v4.1+
Maxime, any comments ? It _is_ odd that only one PHY got added.
> 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 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
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 818 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20160427/1bb1a626/attachment.sig>
next prev parent reply other threads:[~2016-04-27 5:29 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-26 12:57 [RESEND PATCH v2 0/7] usb: xhci-plat: support generic PHY and vbus regulator Jisheng Zhang
2016-04-26 12:57 ` [RESEND PATCH v2 1/7] usb: xhci: plat: Fix suspend/resume when the optional clk exists Jisheng Zhang
2016-04-27 5:25 ` Felipe Balbi
2016-04-27 5:46 ` Jisheng Zhang
2016-04-26 12:57 ` [RESEND PATCH v2 2/7] usb: xhci: plat: attach the usb_phy to the correct hcd Jisheng Zhang
2016-04-27 5:29 ` Felipe Balbi [this message]
2016-04-27 5:59 ` Jisheng Zhang
2016-04-27 6:19 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 3/7] usb: xhci: plat: Fix suspend/resume when the optional usb_phy exists Jisheng Zhang
2016-04-27 5:30 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 4/7] usb: xhci: plat: sort the headers in alphabetic order Jisheng Zhang
2016-04-26 12:57 ` [RESEND PATCH v2 5/7] usb: xhci: plat: Remove checks for optional clock in error/remove path Jisheng Zhang
2016-04-27 5:33 ` Felipe Balbi
2016-04-27 6:33 ` Jisheng Zhang
2016-04-27 7:19 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 6/7] usb: xhci: plat: add generic PHY support Jisheng Zhang
2016-04-27 5:35 ` Felipe Balbi
2016-04-27 6:46 ` Jisheng Zhang
2016-04-27 7:21 ` Felipe Balbi
2016-04-27 7:57 ` Heikki Krogerus
2016-04-27 9:34 ` Felipe Balbi
2016-04-26 12:57 ` [RESEND PATCH v2 7/7] usb: xhci: plat: add vbus regulator control Jisheng Zhang
2016-04-27 5:37 ` Felipe Balbi
2016-04-27 9:57 ` Mark Brown
2016-04-27 10:25 ` Jisheng Zhang
2016-04-27 13:24 ` Mark Brown
2016-04-27 10:25 ` Felipe Balbi
2016-04-27 10:35 ` Mark Brown
2016-04-27 10:38 ` Felipe Balbi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87potbpqkh.fsf@intel.com \
--to=felipe.balbi@linux$(echo .)intel.com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox