| Message ID | 1363794300-31526-1-git-send-email-rogerq@ti.com |
|---|---|
| State | New |
| 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
Hi Roger, On 03/20/2013 04:44 PM, Roger Quadros wrote: > Hi Tony, > > These patches provide the SoC side code required to support > the changes in the OMAP USB Host drivers done in [1], [2] & [3]. > > Device tree support is added for Beagleboard only. I've removed > Panda device tree support till we have resolved the AUXCLK issue. > > NOTE: The first patch needs to be shared between the > OMAP tree and Felipe's USB tree. > > v4: > - Some more cleanup to usbhs_init_phys(). Moved repeated code into > another helper function usbhs_add_regulator(). > - Removed patch for Panda device tree support for USB host since > it is non functional. > > v3: > - Moved more functionality into usbhs_init_phys(). > > v2: > - Added helper function usbhs_init_phys() that can be used by board files > to simplify adding of PHY regulators for USB host ports. > > [1] MFD side changes to omap-usb-host and omap-usb-tll > https://lkml.org/lkml/2013/3/12/179 > [2] USB EHCI side changes to ehci-omap > http://www.mail-archive.com/linux-omap@vger.kernel.org/msg86265.html > [3] USB PHY driver changes > http://www.mail-archive.com/linux-omap@vger.kernel.org/msg86293.html > > The following changes since commit f6161aa153581da4a3867a2d1a7caf4be19b6ec9: > > Linux 3.9-rc2 (2013-03-10 16:54:19 -0700) > > are available in the git repository at: > git://github.com/rogerq/linux.git usbhost-arm-next > > Roger Quadros (21): > usb: phy: nop: Add some parameters to platform data > ARM: OMAP2+: omap-usb-host: Add usbhs_init_phys() > ARM: OMAP2+: omap4panda: Adapt to ehci-omap changes > ARM: OMAP3: Beagle: Adapt to ehci-omap changes > ARM: OMAP3: 3430SDP: Adapt to ehci-omap changes > ARM: OMAP3: 3630SDP: Adapt to ehci-omap changes > ARM: OMAP: AM3517crane: Adapt to ehci-omap changes > ARM: OMAP: AM3517evm: Adapt to ehci-omap changes > ARM: OMAP3: cm-t35: Adapt to ehci-omap changes > ARM: OMAP3: cm-t3517: Adapt to ehci-omap changes > ARM: OMAP: devkit8000: Adapt to ehci-omap changes > ARM: OMAP3: igep0020: Adapt to ehci-omap changes > ARM: OMAP3: omap3evm: Adapt to ehci-omap changes > ARM: OMAP3: omap3pandora: Adapt to ehci-omap changes > ARM: OMAP3: omap3stalker: Adapt to ehci-omap changes > ARM: OMAP3: omap3touchbook: Adapt to ehci-omap changes > ARM: OMAP3: overo: Adapt to ehci-omap changes > ARM: OMAP: zoom: Adapt to ehci-omap changes > ARM: dts: OMAP4: Add HS USB Host IP nodes > ARM: dts: OMAP3: Add HS USB Host IP nodes > ARM: dts: omap3-beagle: Add USB Host support These 3 DTS patches are good to me, but I cannot applied them on top of the already existing patches I queued for 3.10. git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.10/dts Could you rebase these 3 ones only, and I will applied them. Thanks, Benoit
Hi Roger, On 04/05/2013 10:30 AM, Benoit Cousson wrote: ... >> ARM: dts: OMAP4: Add HS USB Host IP nodes >> ARM: dts: OMAP3: Add HS USB Host IP nodes >> ARM: dts: omap3-beagle: Add USB Host support > > These 3 DTS patches are good to me, but I cannot applied them on top of > the already existing patches I queued for 3.10. > > git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git > for_3.10/dts > > Could you rebase these 3 ones only, and I will applied them. Mmm, in fact, I've just seen the pull request from Tony :-( Tony, Don't you want to remove these DTS patches from the pull-request? Otherwise, I will have to rebase the whole DTS series on top of yours. That being said, if the branch is not supposed to be rebased, it is doable. Thanks, Benoit
* Benoit Cousson <b-cousson@ti.com> [130405 03:00]: > On 04/05/2013 10:30 AM, Benoit Cousson wrote: > > ... > > >> ARM: dts: OMAP4: Add HS USB Host IP nodes > >> ARM: dts: OMAP3: Add HS USB Host IP nodes > >> ARM: dts: omap3-beagle: Add USB Host support > > > > These 3 DTS patches are good to me, but I cannot applied them on top of > > the already existing patches I queued for 3.10. > > > > git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git > > for_3.10/dts > > > > Could you rebase these 3 ones only, and I will applied them. > > Mmm, in fact, I've just seen the pull request from Tony :-( > > > Tony, > > Don't you want to remove these DTS patches from the pull-request? Oops sorry :( Looks like I applied them mistakenly as I saved all the patches into a mbox, then applied it. Anyways, too late to start messing with it now. > Otherwise, I will have to rebase the whole DTS series on top of yours. > That being said, if the branch is not supposed to be rebased, it is doable. I pulled in your for_3.10/dts for testing, and to me it looks like it's just overlapping additions. So that should be OK to resolve while pulling it in. It seems there's no need to add omap-for-v3.10/usb as a dependency for your for_3.10/dts unless the conflict gets non-trivial with some additional patches. Regards, Tony
Hi Tony, On 04/05/2013 05:43 PM, Tony Lindgren wrote: > * Benoit Cousson <b-cousson@ti.com> [130405 03:00]: >> On 04/05/2013 10:30 AM, Benoit Cousson wrote: >> >> ... >> >>>> ARM: dts: OMAP4: Add HS USB Host IP nodes >>>> ARM: dts: OMAP3: Add HS USB Host IP nodes >>>> ARM: dts: omap3-beagle: Add USB Host support >>> >>> These 3 DTS patches are good to me, but I cannot applied them on top of >>> the already existing patches I queued for 3.10. >>> >>> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git >>> for_3.10/dts >>> >>> Could you rebase these 3 ones only, and I will applied them. >> >> Mmm, in fact, I've just seen the pull request from Tony :-( >> >> >> Tony, >> >> Don't you want to remove these DTS patches from the pull-request? > > Oops sorry :( Looks like I applied them mistakenly as I saved all > the patches into a mbox, then applied it. Anyways, too late to start > messing with it now. > >> Otherwise, I will have to rebase the whole DTS series on top of yours. >> That being said, if the branch is not supposed to be rebased, it is doable. > > I pulled in your for_3.10/dts for testing, and to me it looks like > it's just overlapping additions. So that should be OK to resolve while > pulling it in. > > It seems there's no need to add omap-for-v3.10/usb as a dependency for > your for_3.10/dts unless the conflict gets non-trivial with some > additional patches. The branch was not complete, with the latest additions, we do have conflict due to the addition of several new nodes at the same place. The resolution is not that hard since it is addition of node only, but the rebase on to of omap-for-v3.10/usb will avoid the issue. I have a new pre-merged branch available. for_3.10/dts_merged is based on omap-for-v3.10/usb and Paul's omap-devel-b-for-3.10 branch to get the AM33xx hwmod. Paul's branch is just needed to avoid AM33xx regression introduced by Santosh hwmod changes present in my branch. Just let me know which one you will prefer to pull. Regards, Benoit
* Benoit Cousson <b-cousson@ti.com> [130408 05:11]: > Hi Tony, > > On 04/05/2013 05:43 PM, Tony Lindgren wrote: > > * Benoit Cousson <b-cousson@ti.com> [130405 03:00]: > >> On 04/05/2013 10:30 AM, Benoit Cousson wrote: > >> > >> ... > >> > >>>> ARM: dts: OMAP4: Add HS USB Host IP nodes > >>>> ARM: dts: OMAP3: Add HS USB Host IP nodes > >>>> ARM: dts: omap3-beagle: Add USB Host support > >>> > >>> These 3 DTS patches are good to me, but I cannot applied them on top of > >>> the already existing patches I queued for 3.10. > >>> > >>> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git > >>> for_3.10/dts > >>> > >>> Could you rebase these 3 ones only, and I will applied them. > >> > >> Mmm, in fact, I've just seen the pull request from Tony :-( > >> > >> > >> Tony, > >> > >> Don't you want to remove these DTS patches from the pull-request? > > > > Oops sorry :( Looks like I applied them mistakenly as I saved all > > the patches into a mbox, then applied it. Anyways, too late to start > > messing with it now. > > > >> Otherwise, I will have to rebase the whole DTS series on top of yours. > >> That being said, if the branch is not supposed to be rebased, it is doable. > > > > I pulled in your for_3.10/dts for testing, and to me it looks like > > it's just overlapping additions. So that should be OK to resolve while > > pulling it in. > > > > It seems there's no need to add omap-for-v3.10/usb as a dependency for > > your for_3.10/dts unless the conflict gets non-trivial with some > > additional patches. > > The branch was not complete, with the latest additions, we do have > conflict due to the addition of several new nodes at the same place. OK > The resolution is not that hard since it is addition of node only, but > the rebase on to of omap-for-v3.10/usb will avoid the issue. > > I have a new pre-merged branch available. for_3.10/dts_merged is based > on omap-for-v3.10/usb and Paul's omap-devel-b-for-3.10 branch to get the > AM33xx hwmod. > Paul's branch is just needed to avoid AM33xx regression introduced by > Santosh hwmod changes present in my branch. > > Just let me know which one you will prefer to pull. If the merge conflicts are non-trivial, then let's do the pre-merged branch. That will be easier to test also in this case for am33xx. Regards, Tony