| Message ID | 1363794300-31526-2-git-send-email-rogerq@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: > Add clk_rate parameter to platform data. If supplied, the > NOP phy driver will program the clock to that rate during probe. > > Also add 2 flags, needs_vcc and needs_reset. > If the flag is set and the regulator couldn't be found > then the driver will bail out with -EPROBE_DEFER. > > Signed-off-by: Roger Quadros <rogerq@ti.com> > Acked-by: Felipe Balbi <balbi@ti.com> Hi Tony, maybe you might prefer to merge commit 1f0972f from my next branch which is exactly this patch. Basically, if you: $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next $ git merge 1f0972f you get $SUBJECT and can apply the others without fear of conflicts later. cheers
* Felipe Balbi <balbi@ti.com> [130320 09:00]: > On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: > > Add clk_rate parameter to platform data. If supplied, the > > NOP phy driver will program the clock to that rate during probe. > > > > Also add 2 flags, needs_vcc and needs_reset. > > If the flag is set and the regulator couldn't be found > > then the driver will bail out with -EPROBE_DEFER. > > > > Signed-off-by: Roger Quadros <rogerq@ti.com> > > Acked-by: Felipe Balbi <balbi@ti.com> > > Hi Tony, > > maybe you might prefer to merge commit 1f0972f from my next branch which > is exactly this patch. Basically, if you: > > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next > $ git merge 1f0972f > > you get $SUBJECT and can apply the others without fear of conflicts > later. OK thanks will use commit 1f0972f, so let's consider that commit immutable. Regards, Tony
On Wed, Mar 20, 2013 at 09:13:24AM -0700, Tony Lindgren wrote: > * Felipe Balbi <balbi@ti.com> [130320 09:00]: > > On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: > > > Add clk_rate parameter to platform data. If supplied, the > > > NOP phy driver will program the clock to that rate during probe. > > > > > > Also add 2 flags, needs_vcc and needs_reset. > > > If the flag is set and the regulator couldn't be found > > > then the driver will bail out with -EPROBE_DEFER. > > > > > > Signed-off-by: Roger Quadros <rogerq@ti.com> > > > Acked-by: Felipe Balbi <balbi@ti.com> > > > > Hi Tony, > > > > maybe you might prefer to merge commit 1f0972f from my next branch which > > is exactly this patch. Basically, if you: > > > > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next > > $ git merge 1f0972f > > > > you get $SUBJECT and can apply the others without fear of conflicts > > later. > > OK thanks will use commit 1f0972f, so let's consider that commit immutable. yeah, once it hits my 'next' branch, I don't rebase anymore. cheers ps: that's valid for 'next' and 'fixes'
* Felipe Balbi <balbi@ti.com> [130320 09:24]: > On Wed, Mar 20, 2013 at 09:13:24AM -0700, Tony Lindgren wrote: > > * Felipe Balbi <balbi@ti.com> [130320 09:00]: > > > On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: > > > > Add clk_rate parameter to platform data. If supplied, the > > > > NOP phy driver will program the clock to that rate during probe. > > > > > > > > Also add 2 flags, needs_vcc and needs_reset. > > > > If the flag is set and the regulator couldn't be found > > > > then the driver will bail out with -EPROBE_DEFER. > > > > > > > > Signed-off-by: Roger Quadros <rogerq@ti.com> > > > > Acked-by: Felipe Balbi <balbi@ti.com> > > > > > > Hi Tony, > > > > > > maybe you might prefer to merge commit 1f0972f from my next branch which > > > is exactly this patch. Basically, if you: > > > > > > $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next > > > $ git merge 1f0972f > > > > > > you get $SUBJECT and can apply the others without fear of conflicts > > > later. > > > > OK thanks will use commit 1f0972f, so let's consider that commit immutable. > > yeah, once it hits my 'next' branch, I don't rebase anymore. I've applied the board related patchs into omap-for-v3.10/usb that's based on commit 1f0972f. Regards, Tony
On 04/02/2013 08:21 PM, Tony Lindgren wrote: > * Felipe Balbi <balbi@ti.com> [130320 09:24]: >> On Wed, Mar 20, 2013 at 09:13:24AM -0700, Tony Lindgren wrote: >>> * Felipe Balbi <balbi@ti.com> [130320 09:00]: >>>> On Wed, Mar 20, 2013 at 05:44:40PM +0200, Roger Quadros wrote: >>>>> Add clk_rate parameter to platform data. If supplied, the >>>>> NOP phy driver will program the clock to that rate during probe. >>>>> >>>>> Also add 2 flags, needs_vcc and needs_reset. >>>>> If the flag is set and the regulator couldn't be found >>>>> then the driver will bail out with -EPROBE_DEFER. >>>>> >>>>> Signed-off-by: Roger Quadros <rogerq@ti.com> >>>>> Acked-by: Felipe Balbi <balbi@ti.com> >>>> >>>> Hi Tony, >>>> >>>> maybe you might prefer to merge commit 1f0972f from my next branch which >>>> is exactly this patch. Basically, if you: >>>> >>>> $ git fetch git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git next >>>> $ git merge 1f0972f >>>> >>>> you get $SUBJECT and can apply the others without fear of conflicts >>>> later. >>> >>> OK thanks will use commit 1f0972f, so let's consider that commit immutable. >> >> yeah, once it hits my 'next' branch, I don't rebase anymore. > > I've applied the board related patchs into omap-for-v3.10/usb that's based > on commit 1f0972f. Thanks Tony. cheers, -roger
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/nop-usb-xceiv.h index 28884c7..148d351 100644 --- a/include/linux/usb/nop-usb-xceiv.h +++ b/include/linux/usb/nop-usb-xceiv.h @@ -5,6 +5,11 @@ struct nop_usb_xceiv_platform_data { enum usb_phy_type type; + unsigned long clk_rate; + + /* if set fails with -EPROBE_DEFER if can't get regulator */ + unsigned int needs_vcc:1; + unsigned int needs_reset:1; }; #if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))