From: Felipe Balbi <felipe.balbi@linux.intel.com> To: Jisheng Zhang <jszhang@marvell.com>, mathias.nyman@linux.intel.com, gregkh@linuxfoundation.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, yendapally.reddy@broadcom.com, Jisheng Zhang <jszhang@marvell.com>, Mark Brown <broonie@kernel.org> Subject: Re: [RESEND PATCH v2 7/7] usb: xhci: plat: add vbus regulator control Date: Wed, 27 Apr 2016 08:37:20 +0300 [thread overview] Message-ID: <87bn4vpq7j.fsf@intel.com> (raw) In-Reply-To: <1461675460-2295-8-git-send-email-jszhang@marvell.com> [-- Attachment #1: Type: text/plain, Size: 4559 bytes --] Hi, Jisheng Zhang <jszhang@marvell.com> writes: > The Marvell BG4CT STB board has board level vbus control through gpio. > This patch adds the vbus regulator control to support this board. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > --- > drivers/usb/host/xhci-plat.c | 40 +++++++++++++++++++++++++++++++++++++++- > drivers/usb/host/xhci.h | 2 ++ > 2 files changed, 41 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index d7f4f3c..0310c13 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -18,6 +18,7 @@ > #include <linux/of.h> > #include <linux/phy/phy.h> > #include <linux/platform_device.h> > +#include <linux/regulator/consumer.h> > #include <linux/slab.h> > #include <linux/usb/phy.h> > #include <linux/usb/xhci_pdriver.h> > @@ -178,6 +179,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > struct clk *clk; > struct usb_phy *usb_phy; > struct phy *phy; > + struct regulator *vbus; > int ret; > int irq; > > @@ -249,13 +251,30 @@ static int xhci_plat_probe(struct platform_device *pdev) > > device_wakeup_enable(hcd->self.controller); > > + vbus = devm_regulator_get(&pdev->dev, "vbus"); devm_regulator_get_optional() ?? > + if (PTR_ERR(vbus) == -ENODEV) { > + vbus = NULL; > + } else if (IS_ERR(vbus)) { > + ret = PTR_ERR(vbus); > + goto disable_clk; > + } else if (vbus) { > + ret = regulator_enable(vbus); > + if (ret) { > + dev_err(&pdev->dev, > + "failed to enable usb vbus regulator: %d\n", > + ret); > + goto disable_clk; > + } > + } > + > xhci->clk = clk; > + xhci->vbus = vbus; > xhci->main_hcd = hcd; > xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, > dev_name(&pdev->dev), hcd); > if (!xhci->shared_hcd) { > ret = -ENOMEM; > - goto disable_clk; > + goto disable_vbus; > } > > if ((node && of_property_read_bool(node, "usb3-lpm-capable")) || > @@ -323,6 +342,10 @@ disable_usb2_phy: > put_usb3_hcd: > usb_put_hcd(xhci->shared_hcd); > > +disable_vbus: > + if (vbus) > + regulator_disable(vbus); > + > disable_clk: > clk_disable_unprepare(clk); > > @@ -337,6 +360,7 @@ static int xhci_plat_remove(struct platform_device *dev) > struct usb_hcd *hcd = platform_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > struct clk *clk = xhci->clk; > + struct regulator *vbus = xhci->vbus; > > usb_remove_hcd(xhci->shared_hcd); > xhci_plat_phy_exit(xhci->shared_hcd); > @@ -347,6 +371,9 @@ static int xhci_plat_remove(struct platform_device *dev) > clk_disable_unprepare(clk); > usb_put_hcd(hcd); > > + if (vbus) > + regulator_disable(vbus); > + > return 0; > } > > @@ -356,6 +383,7 @@ static int xhci_plat_suspend(struct device *dev) > int ret; > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + struct regulator *vbus = xhci->vbus; > > /* > * xhci_suspend() needs `do_wakeup` to know whether host is allowed > @@ -373,6 +401,9 @@ static int xhci_plat_suspend(struct device *dev) > xhci_plat_phy_exit(hcd); > clk_disable_unprepare(xhci->clk); > > + if (vbus) > + ret = regulator_disable(vbus); > + > return ret; > } > > @@ -381,11 +412,18 @@ static int xhci_plat_resume(struct device *dev) > int ret; > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + struct regulator *vbus = xhci->vbus; > > ret = clk_prepare_enable(xhci->clk); > if (ret) > return ret; > > + if (vbus) { > + ret = regulator_enable(vbus); > + if (ret) > + return ret; > + } > + > ret = xhci_plat_phy_init(hcd); > if (ret) > return ret; > diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h > index 6c629c9..5fa8662 100644 > --- a/drivers/usb/host/xhci.h > +++ b/drivers/usb/host/xhci.h > @@ -1550,6 +1550,8 @@ struct xhci_hcd { > struct msix_entry *msix_entries; > /* optional clock */ > struct clk *clk; > + /* optional regulator */ > + struct regulator *vbus; > /* data structures */ > struct xhci_device_context_array *dcbaa; > struct xhci_ring *cmd_ring; > -- > 2.8.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- balbi [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 818 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: felipe.balbi@linux.intel.com (Felipe Balbi) To: linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH v2 7/7] usb: xhci: plat: add vbus regulator control Date: Wed, 27 Apr 2016 08:37:20 +0300 [thread overview] Message-ID: <87bn4vpq7j.fsf@intel.com> (raw) In-Reply-To: <1461675460-2295-8-git-send-email-jszhang@marvell.com> Hi, Jisheng Zhang <jszhang@marvell.com> writes: > The Marvell BG4CT STB board has board level vbus control through gpio. > This patch adds the vbus regulator control to support this board. > > Signed-off-by: Jisheng Zhang <jszhang@marvell.com> > --- > drivers/usb/host/xhci-plat.c | 40 +++++++++++++++++++++++++++++++++++++++- > drivers/usb/host/xhci.h | 2 ++ > 2 files changed, 41 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c > index d7f4f3c..0310c13 100644 > --- a/drivers/usb/host/xhci-plat.c > +++ b/drivers/usb/host/xhci-plat.c > @@ -18,6 +18,7 @@ > #include <linux/of.h> > #include <linux/phy/phy.h> > #include <linux/platform_device.h> > +#include <linux/regulator/consumer.h> > #include <linux/slab.h> > #include <linux/usb/phy.h> > #include <linux/usb/xhci_pdriver.h> > @@ -178,6 +179,7 @@ static int xhci_plat_probe(struct platform_device *pdev) > struct clk *clk; > struct usb_phy *usb_phy; > struct phy *phy; > + struct regulator *vbus; > int ret; > int irq; > > @@ -249,13 +251,30 @@ static int xhci_plat_probe(struct platform_device *pdev) > > device_wakeup_enable(hcd->self.controller); > > + vbus = devm_regulator_get(&pdev->dev, "vbus"); devm_regulator_get_optional() ?? > + if (PTR_ERR(vbus) == -ENODEV) { > + vbus = NULL; > + } else if (IS_ERR(vbus)) { > + ret = PTR_ERR(vbus); > + goto disable_clk; > + } else if (vbus) { > + ret = regulator_enable(vbus); > + if (ret) { > + dev_err(&pdev->dev, > + "failed to enable usb vbus regulator: %d\n", > + ret); > + goto disable_clk; > + } > + } > + > xhci->clk = clk; > + xhci->vbus = vbus; > xhci->main_hcd = hcd; > xhci->shared_hcd = usb_create_shared_hcd(driver, &pdev->dev, > dev_name(&pdev->dev), hcd); > if (!xhci->shared_hcd) { > ret = -ENOMEM; > - goto disable_clk; > + goto disable_vbus; > } > > if ((node && of_property_read_bool(node, "usb3-lpm-capable")) || > @@ -323,6 +342,10 @@ disable_usb2_phy: > put_usb3_hcd: > usb_put_hcd(xhci->shared_hcd); > > +disable_vbus: > + if (vbus) > + regulator_disable(vbus); > + > disable_clk: > clk_disable_unprepare(clk); > > @@ -337,6 +360,7 @@ static int xhci_plat_remove(struct platform_device *dev) > struct usb_hcd *hcd = platform_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > struct clk *clk = xhci->clk; > + struct regulator *vbus = xhci->vbus; > > usb_remove_hcd(xhci->shared_hcd); > xhci_plat_phy_exit(xhci->shared_hcd); > @@ -347,6 +371,9 @@ static int xhci_plat_remove(struct platform_device *dev) > clk_disable_unprepare(clk); > usb_put_hcd(hcd); > > + if (vbus) > + regulator_disable(vbus); > + > return 0; > } > > @@ -356,6 +383,7 @@ static int xhci_plat_suspend(struct device *dev) > int ret; > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + struct regulator *vbus = xhci->vbus; > > /* > * xhci_suspend() needs `do_wakeup` to know whether host is allowed > @@ -373,6 +401,9 @@ static int xhci_plat_suspend(struct device *dev) > xhci_plat_phy_exit(hcd); > clk_disable_unprepare(xhci->clk); > > + if (vbus) > + ret = regulator_disable(vbus); > + > return ret; > } > > @@ -381,11 +412,18 @@ static int xhci_plat_resume(struct device *dev) > int ret; > struct usb_hcd *hcd = dev_get_drvdata(dev); > struct xhci_hcd *xhci = hcd_to_xhci(hcd); > + struct regulator *vbus = xhci->vbus; > > ret = clk_prepare_enable(xhci->clk); > if (ret) > return ret; > > + if (vbus) { > + ret = regulator_enable(vbus); > + if (ret) > + return ret; > + } > + > ret = xhci_plat_phy_init(hcd); > if (ret) > return ret; > diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h > index 6c629c9..5fa8662 100644 > --- a/drivers/usb/host/xhci.h > +++ b/drivers/usb/host/xhci.h > @@ -1550,6 +1550,8 @@ struct xhci_hcd { > struct msix_entry *msix_entries; > /* optional clock */ > struct clk *clk; > + /* optional regulator */ > + struct regulator *vbus; > /* data structures */ > struct xhci_device_context_array *dcbaa; > struct xhci_ring *cmd_ring; > -- > 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/dc562ee1/attachment.sig>
next prev parent reply other threads:[~2016-04-27 5:39 UTC|newest] Thread overview: 58+ 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 ` 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-26 12:57 ` Jisheng Zhang 2016-04-27 5:25 ` Felipe Balbi 2016-04-27 5:25 ` Felipe Balbi 2016-04-27 5:46 ` Jisheng Zhang 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-26 12:57 ` Jisheng Zhang 2016-04-27 5:29 ` Felipe Balbi 2016-04-27 5:29 ` Felipe Balbi 2016-04-27 5:59 ` Jisheng Zhang 2016-04-27 5:59 ` Jisheng Zhang 2016-04-27 6:19 ` Felipe Balbi 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-26 12:57 ` Jisheng Zhang 2016-04-27 5:30 ` Felipe Balbi 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 ` 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-26 12:57 ` Jisheng Zhang 2016-04-27 5:33 ` Felipe Balbi 2016-04-27 5:33 ` Felipe Balbi 2016-04-27 6:33 ` Jisheng Zhang 2016-04-27 6:33 ` Jisheng Zhang 2016-04-27 7:19 ` Felipe Balbi 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-26 12:57 ` Jisheng Zhang 2016-04-27 5:35 ` Felipe Balbi 2016-04-27 5:35 ` Felipe Balbi 2016-04-27 6:46 ` Jisheng Zhang 2016-04-27 6:46 ` Jisheng Zhang 2016-04-27 7:21 ` Felipe Balbi 2016-04-27 7:21 ` Felipe Balbi 2016-04-27 7:57 ` Heikki Krogerus 2016-04-27 7:57 ` Heikki Krogerus 2016-04-27 9:34 ` Felipe Balbi 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-26 12:57 ` Jisheng Zhang 2016-04-27 5:37 ` Felipe Balbi [this message] 2016-04-27 5:37 ` Felipe Balbi 2016-04-27 9:57 ` Mark Brown 2016-04-27 9:57 ` Mark Brown 2016-04-27 10:25 ` Jisheng Zhang 2016-04-27 10:25 ` Jisheng Zhang 2016-04-27 13:24 ` Mark Brown 2016-04-27 13:24 ` Mark Brown 2016-04-27 10:25 ` Felipe Balbi 2016-04-27 10:25 ` Felipe Balbi 2016-04-27 10:35 ` Mark Brown 2016-04-27 10:35 ` Mark Brown 2016-04-27 10:38 ` Felipe Balbi 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=87bn4vpq7j.fsf@intel.com \ --to=felipe.balbi@linux.intel.com \ --cc=broonie@kernel.org \ --cc=gregkh@linuxfoundation.org \ --cc=jszhang@marvell.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=mathias.nyman@linux.intel.com \ --cc=yendapally.reddy@broadcom.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.