Patchwork [GIT,PULL] ARM part of USB patches

login
register
mail settings
Submitter Kishon Vijay Abraham I
Date Feb. 5, 2013, 3:24 p.m.
Message ID <51112418.5020000@ti.com>
Download mbox
Permalink /patch/218274/
State New
Headers show

Pull-request

git://gitorious.org/linux-usb/linux-usb.git arm-usb-dt

Comments

Kishon Vijay Abraham I - Feb. 5, 2013, 3:24 p.m.
Hi Tony,

As discussed, I'm sending a pull request for the arch/arm part of my USB 
patches. These patches are necessary to get MUSB functional in both dt 
and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch 
series *depends* on some of the patches which are merged in usb-next.

Thanks
Kishon

The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:

   Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)

are available in the git repository at:

   git://gitorious.org/linux-usb/linux-usb.git arm-usb-dt

for you to fetch changes up to 09084a48903c6056e20e27ae5054902958a10275:

   ARM: dts: omap5: add dwc3 core dt data (2013-02-05 20:11:46 +0530)

----------------------------------------------------------------
Kishon Vijay Abraham I (12):
       ARM: OMAP4: remove control module address space from PHY and OTG
       ARM: OMAP: devices: create device for usb part of control module
       ARM: OMAP2: MUSB: Specify omap4 has mailbox
       ARM: dts: omap: Add omap control usb data
       ARM: dts: omap: Add omap-usb2 dt data
       ARM: dts: omap: Add usb_otg and glue data
       ARM: OMAP: USB: Add phy binding information
       ARM: dts: omap5: Add omap control usb data
       ARM: dts: omap5: Add ocp2scp data
       ARM: dts: omap5: Add omap-usb3 and omap-usb2 dt data
       ARM: dts: omap5: add dwc3 omap dt data
       ARM: dts: omap5: add dwc3 core dt data

  Documentation/devicetree/bindings/usb/omap-usb.txt |    1 +
  arch/arm/boot/dts/omap3-beagle-xm.dts              |    6 ++++++
  arch/arm/boot/dts/omap3-evm.dts                    |    6 ++++++
  arch/arm/boot/dts/omap3-overo.dtsi                 |    6 ++++++
  arch/arm/boot/dts/omap3.dtsi                       |   12 ++++++++++++
  arch/arm/boot/dts/omap4-panda.dts                  |    6 ++++++
  arch/arm/boot/dts/omap4-sdp.dts                    |    6 ++++++
  arch/arm/boot/dts/omap4.dtsi                       |   26 
++++++++++++++++++++++++++
  arch/arm/boot/dts/omap5.dtsi                       |   48 
++++++++++++++++++++++++++++++++++++++++++++++++
  arch/arm/boot/dts/twl4030.dtsi                     |    2 +-
  arch/arm/mach-omap2/board-2430sdp.c                |    2 ++
  arch/arm/mach-omap2/board-3430sdp.c                |    2 ++
  arch/arm/mach-omap2/board-4430sdp.c                |    2 ++
  arch/arm/mach-omap2/board-cm-t35.c                 |    2 ++
  arch/arm/mach-omap2/board-devkit8000.c             |    2 ++
  arch/arm/mach-omap2/board-igep0020.c               |    2 ++
  arch/arm/mach-omap2/board-ldp.c                    |    2 ++
  arch/arm/mach-omap2/board-omap3beagle.c            |    2 ++
  arch/arm/mach-omap2/board-omap3evm.c               |    2 ++
  arch/arm/mach-omap2/board-omap3logic.c             |    2 ++
  arch/arm/mach-omap2/board-omap3pandora.c           |    2 ++
  arch/arm/mach-omap2/board-omap3stalker.c           |    2 ++
  arch/arm/mach-omap2/board-omap3touchbook.c         |    2 ++
  arch/arm/mach-omap2/board-omap4panda.c             |    2 ++
  arch/arm/mach-omap2/board-overo.c                  |    2 ++
  arch/arm/mach-omap2/board-rm680.c                  |    2 ++
  arch/arm/mach-omap2/board-zoom-peripherals.c       |    2 ++
  arch/arm/mach-omap2/devices.c                      |   45 
+++++++++++++++++++++++++++++++++++++++++++++
  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   13 -------------
  arch/arm/mach-omap2/usb-musb.c                     |    3 +++
  include/linux/usb/musb.h                           |    2 ++
  31 files changed, 202 insertions(+), 14 deletions(-)
Kishon Vijay Abraham I - Feb. 5, 2013, 3:26 p.m.
Hi Tony, Greg,

On Tuesday 05 February 2013 08:54 PM, kishon wrote:
> Hi Tony,
>
> As discussed, I'm sending a pull request for the arch/arm part of my USB
> patches. These patches are necessary to get MUSB functional in both dt
> and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch
> series *depends* on some of the patches which are merged in usb-next.

This patch series should go in only after USB. Or else it will break 
compilation.

Thanks
Kishon

>
> Thanks
> Kishon
>
> The following changes since commit
> 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
>
>    Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
>
> are available in the git repository at:
>
>    git://gitorious.org/linux-usb/linux-usb.git arm-usb-dt
>
> for you to fetch changes up to 09084a48903c6056e20e27ae5054902958a10275:
>
>    ARM: dts: omap5: add dwc3 core dt data (2013-02-05 20:11:46 +0530)
>
> ----------------------------------------------------------------
> Kishon Vijay Abraham I (12):
>        ARM: OMAP4: remove control module address space from PHY and OTG
>        ARM: OMAP: devices: create device for usb part of control module
>        ARM: OMAP2: MUSB: Specify omap4 has mailbox
>        ARM: dts: omap: Add omap control usb data
>        ARM: dts: omap: Add omap-usb2 dt data
>        ARM: dts: omap: Add usb_otg and glue data
>        ARM: OMAP: USB: Add phy binding information
>        ARM: dts: omap5: Add omap control usb data
>        ARM: dts: omap5: Add ocp2scp data
>        ARM: dts: omap5: Add omap-usb3 and omap-usb2 dt data
>        ARM: dts: omap5: add dwc3 omap dt data
>        ARM: dts: omap5: add dwc3 core dt data
>
>   Documentation/devicetree/bindings/usb/omap-usb.txt |    1 +
>   arch/arm/boot/dts/omap3-beagle-xm.dts              |    6 ++++++
>   arch/arm/boot/dts/omap3-evm.dts                    |    6 ++++++
>   arch/arm/boot/dts/omap3-overo.dtsi                 |    6 ++++++
>   arch/arm/boot/dts/omap3.dtsi                       |   12 ++++++++++++
>   arch/arm/boot/dts/omap4-panda.dts                  |    6 ++++++
>   arch/arm/boot/dts/omap4-sdp.dts                    |    6 ++++++
>   arch/arm/boot/dts/omap4.dtsi                       |   26
> ++++++++++++++++++++++++++
>   arch/arm/boot/dts/omap5.dtsi                       |   48
> ++++++++++++++++++++++++++++++++++++++++++++++++
>   arch/arm/boot/dts/twl4030.dtsi                     |    2 +-
>   arch/arm/mach-omap2/board-2430sdp.c                |    2 ++
>   arch/arm/mach-omap2/board-3430sdp.c                |    2 ++
>   arch/arm/mach-omap2/board-4430sdp.c                |    2 ++
>   arch/arm/mach-omap2/board-cm-t35.c                 |    2 ++
>   arch/arm/mach-omap2/board-devkit8000.c             |    2 ++
>   arch/arm/mach-omap2/board-igep0020.c               |    2 ++
>   arch/arm/mach-omap2/board-ldp.c                    |    2 ++
>   arch/arm/mach-omap2/board-omap3beagle.c            |    2 ++
>   arch/arm/mach-omap2/board-omap3evm.c               |    2 ++
>   arch/arm/mach-omap2/board-omap3logic.c             |    2 ++
>   arch/arm/mach-omap2/board-omap3pandora.c           |    2 ++
>   arch/arm/mach-omap2/board-omap3stalker.c           |    2 ++
>   arch/arm/mach-omap2/board-omap3touchbook.c         |    2 ++
>   arch/arm/mach-omap2/board-omap4panda.c             |    2 ++
>   arch/arm/mach-omap2/board-overo.c                  |    2 ++
>   arch/arm/mach-omap2/board-rm680.c                  |    2 ++
>   arch/arm/mach-omap2/board-zoom-peripherals.c       |    2 ++
>   arch/arm/mach-omap2/devices.c                      |   45
> +++++++++++++++++++++++++++++++++++++++++++++
>   arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   13 -------------
>   arch/arm/mach-omap2/usb-musb.c                     |    3 +++
>   include/linux/usb/musb.h                           |    2 ++
>   31 files changed, 202 insertions(+), 14 deletions(-)
Greg KH - Feb. 5, 2013, 5:27 p.m.
On Tue, Feb 05, 2013 at 08:56:13PM +0530, kishon wrote:
> Hi Tony, Greg,
> 
> On Tuesday 05 February 2013 08:54 PM, kishon wrote:
> >Hi Tony,
> >
> >As discussed, I'm sending a pull request for the arch/arm part of my USB
> >patches. These patches are necessary to get MUSB functional in both dt
> >and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch
> >series *depends* on some of the patches which are merged in usb-next.
> 
> This patch series should go in only after USB. Or else it will break
> compilation.

Then it probably should go through the USB tree, right?  We don't want
to break bisectability.

thanks,

greg k-h
Tony Lindgren - Feb. 5, 2013, 6:19 p.m.
* gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> [130205 09:28]:
> On Tue, Feb 05, 2013 at 08:56:13PM +0530, kishon wrote:
> > Hi Tony, Greg,
> > 
> > On Tuesday 05 February 2013 08:54 PM, kishon wrote:
> > >Hi Tony,
> > >
> > >As discussed, I'm sending a pull request for the arch/arm part of my USB
> > >patches. These patches are necessary to get MUSB functional in both dt
> > >and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch
> > >series *depends* on some of the patches which are merged in usb-next.
> > 
> > This patch series should go in only after USB. Or else it will break
> > compilation.
> 
> Then it probably should go through the USB tree, right?  We don't want
> to break bisectability.

Looks like this branch needs to be based on at least 01658f0f (usb: phy:
add a new driver for usb part of control module) to compile. Probably
needs other USB patches too to make sense.

This branch has a high likelihood of conflicting with .dts files, so
Kishon, I suggest you do two branches:

1. A branch for Greg based on top of the USB changes

   This branch should contain:

   ARM: OMAP4: remove control module address space from PHY and OTG
   ARM: OMAP: devices: create device for usb part of control module
   ARM: OMAP2: MUSB: Specify omap4 has mailbox
   ARM: OMAP: USB: Add phy binding information

   Naturally please make sure they compile and boot on their own.
   Looks like this will only cause few trivial include merge conflicts
   with what I have queued up.

   You can add my Acked-by: Tony Lindgren <tony@atomide.com> for those.

2. A branch for Benoit based on v3.8-rc6

   That branch should contain all the .dts changes as those will
   most likely cause nasty merge conflicts otherwise with what
   Benoit has queued up.

Regards,

Tony
Greg KH - Feb. 5, 2013, 6:37 p.m.
On Tue, Feb 05, 2013 at 10:19:47AM -0800, Tony Lindgren wrote:
> * gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> [130205 09:28]:
> > On Tue, Feb 05, 2013 at 08:56:13PM +0530, kishon wrote:
> > > Hi Tony, Greg,
> > > 
> > > On Tuesday 05 February 2013 08:54 PM, kishon wrote:
> > > >Hi Tony,
> > > >
> > > >As discussed, I'm sending a pull request for the arch/arm part of my USB
> > > >patches. These patches are necessary to get MUSB functional in both dt
> > > >and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch
> > > >series *depends* on some of the patches which are merged in usb-next.
> > > 
> > > This patch series should go in only after USB. Or else it will break
> > > compilation.
> > 
> > Then it probably should go through the USB tree, right?  We don't want
> > to break bisectability.
> 
> Looks like this branch needs to be based on at least 01658f0f (usb: phy:
> add a new driver for usb part of control module) to compile. Probably
> needs other USB patches too to make sense.
> 
> This branch has a high likelihood of conflicting with .dts files, so
> Kishon, I suggest you do two branches:
> 
> 1. A branch for Greg based on top of the USB changes
> 
>    This branch should contain:
> 
>    ARM: OMAP4: remove control module address space from PHY and OTG
>    ARM: OMAP: devices: create device for usb part of control module
>    ARM: OMAP2: MUSB: Specify omap4 has mailbox
>    ARM: OMAP: USB: Add phy binding information
> 
>    Naturally please make sure they compile and boot on their own.
>    Looks like this will only cause few trivial include merge conflicts
>    with what I have queued up.
> 
>    You can add my Acked-by: Tony Lindgren <tony@atomide.com> for those.

If that happens, please send me patches in email, I don't take git
pull requests, especially for something as small as 4 patches.

thanks,

greg k-h
hvaibhav@ti.com - Feb. 6, 2013, 5:16 a.m.
On Tue, Feb 05, 2013 at 23:49:47, Tony Lindgren wrote:
> * gregkh@linuxfoundation.org <gregkh@linuxfoundation.org> [130205 09:28]:
> > On Tue, Feb 05, 2013 at 08:56:13PM +0530, kishon wrote:
> > > Hi Tony, Greg,
> > > 
> > > On Tuesday 05 February 2013 08:54 PM, kishon wrote:
> > > >Hi Tony,
> > > >
> > > >As discussed, I'm sending a pull request for the arch/arm part of my USB
> > > >patches. These patches are necessary to get MUSB functional in both dt
> > > >and non-dt boot. Also added dt data for dwc3 present in OMAP. This patch
> > > >series *depends* on some of the patches which are merged in usb-next.
> > > 
> > > This patch series should go in only after USB. Or else it will break
> > > compilation.
> > 
> > Then it probably should go through the USB tree, right?  We don't want
> > to break bisectability.
> 
> Looks like this branch needs to be based on at least 01658f0f (usb: phy:
> add a new driver for usb part of control module) to compile. Probably
> needs other USB patches too to make sense.
> 
> This branch has a high likelihood of conflicting with .dts files, so
> Kishon, I suggest you do two branches:
> 
> 1. A branch for Greg based on top of the USB changes
> 
>    This branch should contain:
> 
>    ARM: OMAP4: remove control module address space from PHY and OTG
>    ARM: OMAP: devices: create device for usb part of control module
>    ARM: OMAP2: MUSB: Specify omap4 has mailbox
>    ARM: OMAP: USB: Add phy binding information
> 
>    Naturally please make sure they compile and boot on their own.
>    Looks like this will only cause few trivial include merge conflicts
>    with what I have queued up.
> 
>    You can add my Acked-by: Tony Lindgren <tony@atomide.com> for those.
> 
> 2. A branch for Benoit based on v3.8-rc6
> 
>    That branch should contain all the .dts changes as those will
>    most likely cause nasty merge conflicts otherwise with what
>    Benoit has queued up.
> 

Tony/Benoit,

There are few AM33xx DTS patches pending from long time, how do you want to 
take it forward? You want me to put it into one branch and share? OR just 
provide the list of all patches to you?

Thanks,
Vaibhav
> Regards,
> 
> Tony
> _______________________________________________
> devicetree-discuss mailing list
> devicetree-discuss@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/devicetree-discuss
>