[GIT PULL] USB patches

[GIT PULL] USB patches

[Felipe Balbi]

Hi Tony,

Here's a pull request for the changes we need to get into the upcoming
merge window. These have been tested overnight on pandaboard.

I also checked that it merges cleanly with your omap-for-linus branch.

The following changes since commit 85e2efbb1db9a18d218006706d6e4fbeb0216213:

  Linux 2.6.38-rc5 (2011-02-15 19:23:45 -0800)

are available in the git repository at:
  git://gitorious.org/usb/usb.git for-tony

Anand Gadiyar (2):
      arm: omap4: usb: explicitly configure MUSB pads
      arm: omap4: 4430sdp: drop ehci support

Hema HK (5):
      usb: musb: AM35x: moving internal phy functions out of usb_musb.c file
      OMAP2430: hwmod data: Add USBOTG
      OMAP3xxx: hwmod data: Add USBOTG
      AM35xx: hwmod data: Add USBOTG
      OMAP2+: musb: hwmod adaptation for musb registration

 arch/arm/mach-omap2/Makefile               |    3 +-
 arch/arm/mach-omap2/board-4430sdp.c        |   19 ---
 arch/arm/mach-omap2/board-am3517evm.c      |    4 +
 arch/arm/mach-omap2/omap_hwmod_2430_data.c |   98 +++++++++++++
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |  166 +++++++++++++++++++++
 arch/arm/mach-omap2/omap_phy_internal.c    |   93 ++++++++++++
 arch/arm/mach-omap2/usb-musb.c             |  219 +++++++++++-----------------
 arch/arm/plat-omap/include/plat/usb.h      |    4 +
 8 files changed, 450 insertions(+), 156 deletions(-)

-- 
balbi

Re: [GIT PULL] USB patches

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [110217 23:33]:
> Hi Tony,
> 
> Here's a pull request for the changes we need to get into the upcoming
> merge window. These have been tested overnight on pandaboard.
> 
> I also checked that it merges cleanly with your omap-for-linus branch.

Thanks pulled. Looks like there were few merge confclicts with
the omap2/3 hwmod data, but got those sorted out.

Regards,

Tony

Re: [GIT PULL] USB patches

[Felipe Balbi]

On Tue, 2011-02-22 at 11:01 -0800, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [110217 23:33]:
> > Hi Tony,
> > 
> > Here's a pull request for the changes we need to get into the upcoming
> > merge window. These have been tested overnight on pandaboard.
> > 
> > I also checked that it merges cleanly with your omap-for-linus branch.
> 
> Thanks pulled. Looks like there were few merge confclicts with
> the omap2/3 hwmod data, but got those sorted out.

conflict resolution was huge but at a first glance it looks ok.

Tomorrow I'll check if there aren't any conflicts between your for-next
and Greg's usb-next branch.

-- 
balbi

[GIT PULL] USB Patches

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

Hi Tony,

These are all supposed to go into -rc cycle but I guess we're already
too late for that (?). If so, let me know and I can add Cc:
stable@kernel.org to all of those patches so they go to stable releases
too.

The following changes since commit 693d92a1bbc9e42681c42ed190bd42b636ca876f:

  Linux 2.6.39-rc7 (2011-05-09 19:33:54 -0700)

are available in the git repository at:
  master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-tony

Felipe Balbi (1):
      usb: musb: am35x: fix compile error when building am35x

Hema HK (3):
      usb: musb: OMAP4430: Power down the PHY during board init
      usb: otg: OMAP4430: Fixing the omap4430_phy_init function
      usb: otg: OMAP4430: Powerdown the internal PHY when USB is disabled

 arch/arm/mach-omap2/board-am3517evm.c   |    2 +-
 arch/arm/mach-omap2/omap_phy_internal.c |    9 ++++++---
 arch/arm/mach-omap2/usb-musb.c          |   10 +++++-----
 arch/arm/plat-omap/include/plat/usb.h   |    2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [GIT PULL] USB Patches

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 659 bytes --]

Hi,

On Wed, May 18, 2011 at 01:44:09PM +0300, Felipe Balbi wrote:
> These are all supposed to go into -rc cycle but I guess we're already
> too late for that (?). If so, let me know and I can add Cc:
> stable@kernel.org to all of those patches so they go to stable releases
> too.
> 
> The following changes since commit 693d92a1bbc9e42681c42ed190bd42b636ca876f:
> 
>   Linux 2.6.39-rc7 (2011-05-09 19:33:54 -0700)
> 
> are available in the git repository at:
>   master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-tony

a gentle ping... Any updates here ? :-)

I'll make sure to send them to stable once you pull.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]

Re: [GIT PULL] USB Patches

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [110523 09:08]:
> Hi,
> 
> On Wed, May 18, 2011 at 01:44:09PM +0300, Felipe Balbi wrote:
> > These are all supposed to go into -rc cycle but I guess we're already
> > too late for that (?). If so, let me know and I can add Cc:
> > stable@kernel.org to all of those patches so they go to stable releases
> > too.
> > 
> > The following changes since commit 693d92a1bbc9e42681c42ed190bd42b636ca876f:
> > 
> >   Linux 2.6.39-rc7 (2011-05-09 19:33:54 -0700)
> > 
> > are available in the git repository at:
> >   master.kernel.org:/pub/scm/linux/kernel/git/balbi/usb.git for-tony
> 
> a gentle ping... Any updates here ? :-)
> 
> I'll make sure to send them to stable once you pull.

OK pulled into for-next now.

Tony