Patchwork [GIT,PULL] omap board updates for v3.1 merge window

login
register
mail settings
Submitter Tony Lindgren
Date July 7, 2011, 4:29 p.m.
Message ID <20110707162911.GL5783@atomide.com>
Download mbox
Permalink /patch/103693/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board

Comments

Tony Lindgren - July 7, 2011, 4:29 p.m.
Hi Arnd,

Please pull omap board updates from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board

These are currently on top of the fixes you pulled earlier but
could be also rebased on the earlier cleanup if you prefer that.

Please note that the board-cm-t35.c change will need a minor fix
when merging with the atag_offset patch series. In MACHINE_START
the .boot_params needs to be replaced with .atag_offset = 0x100.

Also note that this series is missing the Nook Color board
support as that one is waiting on the machine_id patch.

Regards,

Tony


The following changes since commit fdcc205fb9ba006bcd37f72e1b1b904704257351:
  Tony Lindgren (1):
        Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board

Ameya Palande (1):
      omap: rx51: Platform support for lp5523 led chip

Igor Grinberg (1):
      arm: omap3: cm-t35: add support for cm-t3730

Joel A Fernandes (1):
      OMAP3: beagle: add support for beagleboard xM revision C

Kalle Jokiniemi (1):
      OMAP3: rx-51: Add full regulator definitions

Shubhrajyoti Datta (1):
      OMAP4: Keyboard: Mux changes in the board file

Silesh C V (1):
      omap: 4430SDP: Register the card detect GPIO properly

Vishal Mahaveer (1):
      omap: blaze: add mmc5/wl1283 device support

 arch/arm/mach-omap2/Kconfig                    |    6 +-
 arch/arm/mach-omap2/board-4430sdp.c            |  149 +++++++++++++++++++++++-
 arch/arm/mach-omap2/board-cm-t35.c             |   77 ++++++++++---
 arch/arm/mach-omap2/board-omap3beagle.c        |   78 ++++++++-----
 arch/arm/mach-omap2/board-rx51-peripherals.c   |  135 +++++++++++++++++++++
 arch/arm/mach-omap2/devices.c                  |    3 +-
 arch/arm/plat-omap/include/plat/omap4-keypad.h |    3 +-
 arch/arm/plat-omap/include/plat/uncompress.h   |    1 +
 8 files changed, 405 insertions(+), 47 deletions(-)
Arnd Bergmann - July 7, 2011, 8:40 p.m.
On Thursday 07 July 2011 18:29:11 Tony Lindgren wrote:
> Please pull omap board updates from:
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board
> 
> These are currently on top of the fixes you pulled earlier but
> could be also rebased on the earlier cleanup if you prefer that.

I would generally prefer them to be independent, even if that causes
minor conflicts. If some branches are built on top of others, that
mainly means I have to remember the order in which to send them
upstream, and my memory for these things is limited.
 
> Please note that the board-cm-t35.c change will need a minor fix
> when merging with the atag_offset patch series. In MACHINE_START
> the .boot_params needs to be replaced with .atag_offset = 0x100.
>
> Also note that this series is missing the Nook Color board
> support as that one is waiting on the machine_id patch.

Ok

Thanks,

	Arnd
Tony Lindgren - July 8, 2011, 8:30 a.m.
* Arnd Bergmann <arnd@arndb.de> [110707 13:36]:
> On Thursday 07 July 2011 18:29:11 Tony Lindgren wrote:
> > Please pull omap board updates from:
> > 
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board
> > 
> > These are currently on top of the fixes you pulled earlier but
> > could be also rebased on the earlier cleanup if you prefer that.
> 
> I would generally prefer them to be independent, even if that causes
> minor conflicts. If some branches are built on top of others, that
> mainly means I have to remember the order in which to send them
> upstream, and my memory for these things is limited.

Sure. So let's wait on this one a bit. I'll send you some more cleanup
first as I just noticed that the TWL cleanup series will conflict with
these patches.

I need to base these board files on all the cleanup though, otherwise
things will get messy with merge and build conflicts.

Unfortunately there will be dependencies between branches until we
have the driver probe and bus (hwmod) code initializing things
using device tree data..

Regards,

Tony
Arnd Bergmann - July 8, 2011, 8:54 a.m.
On Friday 08 July 2011 10:30:42 Tony Lindgren wrote:
> 
> * Arnd Bergmann <arnd@arndb.de> [110707 13:36]:
> > On Thursday 07 July 2011 18:29:11 Tony Lindgren wrote:
> > > Please pull omap board updates from:
> > > 
> > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board
> > > 
> > > These are currently on top of the fixes you pulled earlier but
> > > could be also rebased on the earlier cleanup if you prefer that.
> > 
> > I would generally prefer them to be independent, even if that causes
> > minor conflicts. If some branches are built on top of others, that
> > mainly means I have to remember the order in which to send them
> > upstream, and my memory for these things is limited.
> 
> Sure. So let's wait on this one a bit. I'll send you some more cleanup
> first as I just noticed that the TWL cleanup series will conflict with
> these patches.

Sorry for being unclear, I forgot to say that I did in fact pull your tree
already.

> I need to base these board files on all the cleanup though, otherwise
> things will get messy with merge and build conflicts.
> 
> Unfortunately there will be dependencies between branches until we
> have the driver probe and bus (hwmod) code initializing things
> using device tree data..

I already need to stage things out a bit, because the omap fixes
depend on the omap cleanups, while the imx cleanups depend on the
pxa fixes. So it's likely going to be something like

* fixes
* cleanup
* more fixes
* more cleanup
* new subarchitectures
* new boards
* wait for devicetree to get pulled in
* more cleanups based on device tree
* other new features

	Arnd
Tony Lindgren - July 8, 2011, 10:25 a.m.
* Arnd Bergmann <arnd@arndb.de> [110708 01:49]:
> On Friday 08 July 2011 10:30:42 Tony Lindgren wrote:
> > 
> > * Arnd Bergmann <arnd@arndb.de> [110707 13:36]:
> > > On Thursday 07 July 2011 18:29:11 Tony Lindgren wrote:
> > > > Please pull omap board updates from:
> > > > 
> > > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git devel-board
> > > > 
> > > > These are currently on top of the fixes you pulled earlier but
> > > > could be also rebased on the earlier cleanup if you prefer that.
> > > 
> > > I would generally prefer them to be independent, even if that causes
> > > minor conflicts. If some branches are built on top of others, that
> > > mainly means I have to remember the order in which to send them
> > > upstream, and my memory for these things is limited.
> > 
> > Sure. So let's wait on this one a bit. I'll send you some more cleanup
> > first as I just noticed that the TWL cleanup series will conflict with
> > these patches.
> 
> Sorry for being unclear, I forgot to say that I did in fact pull your tree
> already.

OK no problem that's fine with me.

BTW, looks like your tree is no longer showing up on kernel.org?
 
> > I need to base these board files on all the cleanup though, otherwise
> > things will get messy with merge and build conflicts.
> > 
> > Unfortunately there will be dependencies between branches until we
> > have the driver probe and bus (hwmod) code initializing things
> > using device tree data..
> 
> I already need to stage things out a bit, because the omap fixes
> depend on the omap cleanups, while the imx cleanups depend on the
> pxa fixes. So it's likely going to be something like
> 
> * fixes
> * cleanup
> * more fixes
> * more cleanup
> * new subarchitectures
> * new boards
> * wait for devicetree to get pulled in
> * more cleanups based on device tree
> * other new features

It's getting messy :)

Tony
Arnd Bergmann - July 8, 2011, 11:11 a.m.
On Friday 08 July 2011, Tony Lindgren wrote:
> * Arnd Bergmann <arnd@arndb.de> [110708 01:49]:
> > On Friday 08 July 2011 10:30:42 Tony Lindgren wrote:
> > 
> > Sorry for being unclear, I forgot to say that I did in fact pull your tree
> > already.
> 
> OK no problem that's fine with me.
> 
> BTW, looks like your tree is no longer showing up on kernel.org?
>  

The URL has changed (from linux-2.6-arm-soc.git), it's now
git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git

We figured that there would never be a 2.6 release in there, so the
original name was a bit silly. It won't change again, and if you
just change the URL in your remotes list, it should still fast-forward.

	Arnd
Tony Lindgren - July 8, 2011, 11:33 a.m.
* Arnd Bergmann <arnd@arndb.de> [110708 04:06]:
> On Friday 08 July 2011, Tony Lindgren wrote:
> > * Arnd Bergmann <arnd@arndb.de> [110708 01:49]:
> > > On Friday 08 July 2011 10:30:42 Tony Lindgren wrote:
> > > 
> > > Sorry for being unclear, I forgot to say that I did in fact pull your tree
> > > already.
> > 
> > OK no problem that's fine with me.
> > 
> > BTW, looks like your tree is no longer showing up on kernel.org?
> >  
> 
> The URL has changed (from linux-2.6-arm-soc.git), it's now
> git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc.git
> 
> We figured that there would never be a 2.6 release in there, so the
> original name was a bit silly. It won't change again, and if you
> just change the URL in your remotes list, it should still fast-forward.

OK thanks seems to work now.

Tony