| Message ID | 1386953483-21631-6-git-send-email-mporter@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 13, 2013 at 11:51:19AM -0500, Matt Porter wrote: > If a generic phy is present, call phy_init()/phy_exit(). This supports > generic phys that must be soft reset before power on. > > Signed-off-by: Matt Porter <mporter@linaro.org> > Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > --- > drivers/usb/gadget/s3c-hsotg.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c > index 7c5d8bd..e9683c2 100644 > --- a/drivers/usb/gadget/s3c-hsotg.c > +++ b/drivers/usb/gadget/s3c-hsotg.c > @@ -3621,6 +3621,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev) > goto err_supplies; > } > > + if (hsotg->phy) > + phy_init(hsotg->phy); doesn't build. you need to include <linux/phy/phy.h>
On Mon, Dec 16, 2013 at 03:20:01PM -0600, Felipe Balbi wrote: > On Fri, Dec 13, 2013 at 11:51:19AM -0500, Matt Porter wrote: > > If a generic phy is present, call phy_init()/phy_exit(). This supports > > generic phys that must be soft reset before power on. > > > > Signed-off-by: Matt Porter <mporter@linaro.org> > > Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > > --- > > drivers/usb/gadget/s3c-hsotg.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c > > index 7c5d8bd..e9683c2 100644 > > --- a/drivers/usb/gadget/s3c-hsotg.c > > +++ b/drivers/usb/gadget/s3c-hsotg.c > > @@ -3621,6 +3621,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev) > > goto err_supplies; > > } > > > > + if (hsotg->phy) > > + phy_init(hsotg->phy); > > doesn't build. you need to include <linux/phy/phy.h> It depends on https://lkml.org/lkml/2013/12/5/172 which I noted in the cover letter. At this point, I don't know if Kamil's whole series will make it to 3.14 so that patch may have to be taken separately. He has a trivial update to make on the binding example is all for this patch. I was wondering today if we might just want to separate that out now. I originally had a similar patch in my series but his was posted first so I rebased on that. -Matt
On Mon, Dec 16, 2013 at 04:26:44PM -0500, Matt Porter wrote: > On Mon, Dec 16, 2013 at 03:20:01PM -0600, Felipe Balbi wrote: > > On Fri, Dec 13, 2013 at 11:51:19AM -0500, Matt Porter wrote: > > > If a generic phy is present, call phy_init()/phy_exit(). This supports > > > generic phys that must be soft reset before power on. > > > > > > Signed-off-by: Matt Porter <mporter@linaro.org> > > > Acked-by: Kishon Vijay Abraham I <kishon@ti.com> > > > --- > > > drivers/usb/gadget/s3c-hsotg.c | 5 +++++ > > > 1 file changed, 5 insertions(+) > > > > > > diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c > > > index 7c5d8bd..e9683c2 100644 > > > --- a/drivers/usb/gadget/s3c-hsotg.c > > > +++ b/drivers/usb/gadget/s3c-hsotg.c > > > @@ -3621,6 +3621,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev) > > > goto err_supplies; > > > } > > > > > > + if (hsotg->phy) > > > + phy_init(hsotg->phy); > > > > doesn't build. you need to include <linux/phy/phy.h> > > It depends on https://lkml.org/lkml/2013/12/5/172 which I noted in the > cover letter. At this point, I don't know if Kamil's whole series will > make it to 3.14 so that patch may have to be taken separately. He has a > trivial update to make on the binding example is all for this patch. > > I was wondering today if we might just want to separate that out now. I > originally had a similar patch in my series but his was posted first so > I rebased on that. I can wait another week tops. By v3.13-rc5 I'm locking my tree down, and only urgent bugfixes to the next branch will be accepted. cheers
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index 7c5d8bd..e9683c2 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c @@ -3621,6 +3621,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev) goto err_supplies; } + if (hsotg->phy) + phy_init(hsotg->phy); + /* usb phy enable */ s3c_hsotg_phy_enable(hsotg); @@ -3714,6 +3717,8 @@ static int s3c_hsotg_remove(struct platform_device *pdev) } s3c_hsotg_phy_disable(hsotg); + if (hsotg->phy) + phy_exit(hsotg->phy); clk_disable_unprepare(hsotg->clk); return 0;