Skip to contentSkip to conversation

omap board updates for v3.1 merge window

GIT PULL New Tony Lindgren 3 participants 8 messages Jul 7, 2011 – Jul 8, 2011

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP2+ support
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

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(-)
#1 lore raw
Quoted 6 lines · 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.

Quoted 6 lines

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

#2 lore raw

PATCH 1/1 ARM: omap2: cm-t3730: convert boot_params to atag_offset

Signed-off-by Igor Grinberg <[email protected]>

---
Hi Arnd,
This one should apply cleanly on top of Nicolas' series and does the missing change for cm-t3730.
If it somehow helps/saves you an effort, here it is.

 arch/arm/mach-omap2/board-cm-t35.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/board-cm-t35.c +1 -1
index fcd4032..e7d48e8 100644
@@ -679,7 +679,7 @@ MACHINE_START(CM_T35, "Compulab CM-T35")
 MACHINE_END
 
 MACHINE_START(CM_T3730, "Compulab CM-T3730")
-	.boot_params    = 0x80000100,
+	.atag_offset	= 0x100,
 	.reserve        = omap_reserve,
 	.map_io         = omap3_map_io,
 	.init_early     = cm_t35_init_early,
Signature · 1 line
1.7.3.4
author maintainer
#3 lore raw
In reply to Arnd Bergmann
Quoted 5 lines · Arnd Bergmann
Quoted 4 lines · 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

Quoted 7 lines
Quoted 2 lines

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

#4 lore raw
Quoted 10 lines · On Friday 08 July 2011 10:30:42 Tony Lindgren wrote:
Quoted 8 lines · Arnd Bergmann
Quoted 6 lines · 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.

Quoted 8 lines
Quoted 4 lines

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.

Quoted 6 lines

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

author maintainer
#5 lore raw
Quoted 16 lines · Arnd Bergmann
Quoted 15 lines · On Friday 08 July 2011 10:30:42 Tony Lindgren wrote:
Quoted 12 lines · Arnd Bergmann
Quoted 6 lines · 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.

Quoted 6 lines
Quoted 3 lines

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?

Quoted 11 lines
Quoted 6 lines

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

Quoted 9 lines

* 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

#6 lore raw
Quoted 10 lines · Tony Lindgren
Quoted 4 lines · Arnd Bergmann

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

author maintainer
#7 lore raw
Quoted 12 lines · Arnd Bergmann
Quoted 10 lines · Tony Lindgren
Quoted 4 lines · Arnd Bergmann

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?

Quoted 6 lines

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