linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL 3/5] First set of omap1 related changes
  2012-02-29 20:15 [GIT PULL 1/5] non-critical fixes for v3.4 merge window Tony Lindgren
@ 2012-02-29 20:15 ` Tony Lindgren
  0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2012-02-29 20:15 UTC (permalink / raw)
  To: linux-arm-kernel

These too we considered too late for the last merge window,
there will be another set coming after this.

Regards,

Tony

The following changes since commit dcd6c92267155e70a94b3927bce681ce74b80d1f:
  Linus Torvalds (1):
        Linux 3.3-rc1

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap1

Janusz Krzysztofik (7):
      ARM: OMAP1: ams-delta: register latch dependent devices later
      ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
      ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
      LED: drop leds-ams-delta driver
      MTD: NAND: ams-delta: use GPIO instead of custom I/O
      omapfb: lcd_ams_delta: drive control lines over GPIO
      input: serio: ams-delta: toggle keyboard power over GPIO

Tony Lindgren (1):
      Merge branch 'omap1-part2' into omap1

 arch/arm/mach-omap1/Kconfig                       |    2 +
 arch/arm/mach-omap1/board-ams-delta.c             |  226 +++++++++++++++++----
 arch/arm/plat-omap/include/plat/board-ams-delta.h |   48 ++---
 drivers/input/serio/ams_delta_serio.c             |   54 +++--
 drivers/leds/Kconfig                              |    7 -
 drivers/leds/Makefile                             |    1 -
 drivers/leds/leds-ams-delta.c                     |  126 ------------
 drivers/mtd/nand/ams-delta.c                      |   74 +++++--
 drivers/video/omap/lcd_ams_delta.c                |   27 ++-
 sound/soc/omap/ams-delta.c                        |    2 +-
 10 files changed, 318 insertions(+), 249 deletions(-)
 delete mode 100644 drivers/leds/leds-ams-delta.c

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [GIT PULL 3/5] First set of omap1 related changes
       [not found] <0Mfo5g-1RocQt3wlY-00NttP@mx.kundenserver.de>
@ 2012-02-29 21:06 ` Arnd Bergmann
  2012-02-29 21:13   ` Tony Lindgren
  0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2012-02-29 21:06 UTC (permalink / raw)
  To: linux-arm-kernel

On Wednesday 29 February 2012, Tony Lindgren wrote:
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap1
> 
> Janusz Krzysztofik (7):
>       ARM: OMAP1: ams-delta: register latch dependent devices later
>       ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
>       ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
>       LED: drop leds-ams-delta driver
>       MTD: NAND: ams-delta: use GPIO instead of custom I/O
>       omapfb: lcd_ams_delta: drive control lines over GPIO
>       input: serio: ams-delta: toggle keyboard power over GPIO
> 

Since these are all for ams-delta, I pulled them into next/boards together
with other board specific updates.

Thanks,

	Arnd

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [GIT PULL 3/5] First set of omap1 related changes
  2012-02-29 21:06 ` [GIT PULL 3/5] First set of omap1 related changes Arnd Bergmann
@ 2012-02-29 21:13   ` Tony Lindgren
  2012-03-01 22:26     ` Janusz Krzysztofik
  0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2012-02-29 21:13 UTC (permalink / raw)
  To: linux-arm-kernel

* Arnd Bergmann <arnd@arndb.de> [120229 12:35]:
> On Wednesday 29 February 2012, Tony Lindgren wrote:
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap omap1
> > 
> > Janusz Krzysztofik (7):
> >       ARM: OMAP1: ams-delta: register latch dependent devices later
> >       ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
> >       ARM: OMAP1: ams-delta: supersede custom led device by leds-gpio
> >       LED: drop leds-ams-delta driver
> >       MTD: NAND: ams-delta: use GPIO instead of custom I/O
> >       omapfb: lcd_ams_delta: drive control lines over GPIO
> >       input: serio: ams-delta: toggle keyboard power over GPIO
> > 
> 
> Since these are all for ams-delta, I pulled them into next/boards together
> with other board specific updates.

OK makes sense.

Thanks,

Tony

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [GIT PULL 3/5] First set of omap1 related changes
  2012-02-29 21:13   ` Tony Lindgren
@ 2012-03-01 22:26     ` Janusz Krzysztofik
  2012-03-01 23:31       ` Tony Lindgren
  0 siblings, 1 reply; 6+ messages in thread
From: Janusz Krzysztofik @ 2012-03-01 22:26 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, 29 Feb 2012 13:13:31 Tony Lindgren wrote:
> * Arnd Bergmann <arnd@arndb.de> [120229 12:35]:
> > On Wednesday 29 February 2012, Tony Lindgren wrote:
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap 
omap1
> > > 
> > > Janusz Krzysztofik (7):
> > >       ARM: OMAP1: ams-delta: register latch dependent devices 
later
> > >       ARM: OMAP1: ams-delta: convert latches to basic_mmio_gpio
> > >       ARM: OMAP1: ams-delta: supersede custom led device by leds-
gpio
> > >       LED: drop leds-ams-delta driver
> > >       MTD: NAND: ams-delta: use GPIO instead of custom I/O
> > >       omapfb: lcd_ams_delta: drive control lines over GPIO
> > >       input: serio: ams-delta: toggle keyboard power over GPIO
> > > 
> > 
> > Since these are all for ams-delta, I pulled them into next/boards 
together
> > with other board specific updates.
> 
> OK makes sense.

Any chance for the continuation series [1] as well as two section 
mismatch related fixes [2] [3] getting your attention? NB, that 
continuation series needs another section mismatch fix, which I was 
planing to submit once there was a stable base for it.

Thanks,
Janusz

[1] http://www.spinics.net/lists/linux-omap/msg64146.html
[2] http://www.spinics.net/lists/linux-omap/msg64441.html
[3] http://www.spinics.net/lists/linux-omap/msg64442.html

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [GIT PULL 3/5] First set of omap1 related changes
  2012-03-01 22:26     ` Janusz Krzysztofik
@ 2012-03-01 23:31       ` Tony Lindgren
  2012-03-02 17:20         ` Janusz Krzysztofik
  0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2012-03-01 23:31 UTC (permalink / raw)
  To: linux-arm-kernel

* Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> [120301 13:56]:
> 
> Any chance for the continuation series [1] as well as two section 
> mismatch related fixes [2] [3] getting your attention? NB, that 
> continuation series needs another section mismatch fix, which I was 
> planing to submit once there was a stable base for it.
> 
> [1] http://www.spinics.net/lists/linux-omap/msg64146.html
> [2] http://www.spinics.net/lists/linux-omap/msg64441.html
> [3] http://www.spinics.net/lists/linux-omap/msg64442.html

Hmm sorry I guess I was waiting for the missing section
mismatch patch.

I've pushed ams-delta branch that's based on -rc5 merged
with what Arnd pulled yesterday as -rc1 has i2c-omap.c
a compile bug for omap1. I've applied these two patches
there as the second one depends on what got pulled:

ARM: OMAP1: ams-delta: clean up init data section assignments
ARM: OMAP1: ams-delta: fix incorrect section tags

Looks like your patch "ARM: OMAP1: ams-delta: set up regulator
over modem reset GPIO pin" causes the following error with
CONFIG_DEBUG_SECTION_MISMATCH=y:

arch/arm/mach-omap1/board-ams-delta.c:273:36: error:
modem_nreset_config causes a section type conflict

So care to update and repost that (and possibly the following
two patches) with your missing fixes?

Regards,

Tony

^ permalink raw reply	[flat|nested] 6+ messages in thread
* [GIT PULL 3/5] First set of omap1 related changes
  2012-03-01 23:31       ` Tony Lindgren
@ 2012-03-02 17:20         ` Janusz Krzysztofik
  0 siblings, 0 replies; 6+ messages in thread
From: Janusz Krzysztofik @ 2012-03-02 17:20 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, 1 Mar 2012 15:31:01 Tony Lindgren wrote:
> 
> I've pushed ams-delta branch that's based on -rc5 merged
> with what Arnd pulled yesterday as -rc1 has i2c-omap.c
> a compile bug for omap1. I've applied these two patches
> there as the second one depends on what got pulled:
> 
> ARM: OMAP1: ams-delta: clean up init data section assignments
> ARM: OMAP1: ams-delta: fix incorrect section tags

Thanks!

> Looks like your patch "ARM: OMAP1: ams-delta: set up regulator
> over modem reset GPIO pin" causes the following error with
> CONFIG_DEBUG_SECTION_MISMATCH=y:
> 
> arch/arm/mach-omap1/board-ams-delta.c:273:36: error:
> modem_nreset_config causes a section type conflict
> 
> So care to update and repost that (and possibly the following
> two patches) with your missing fixes?

OK, I will, in a couple of days.

Thanks,
Janusz

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-02 17:20 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <0Mfo5g-1RocQt3wlY-00NttP@mx.kundenserver.de>
2012-02-29 21:06 ` [GIT PULL 3/5] First set of omap1 related changes Arnd Bergmann
2012-02-29 21:13   ` Tony Lindgren
2012-03-01 22:26     ` Janusz Krzysztofik
2012-03-01 23:31       ` Tony Lindgren
2012-03-02 17:20         ` Janusz Krzysztofik
2012-02-29 20:15 [GIT PULL 1/5] non-critical fixes for v3.4 merge window Tony Lindgren
2012-02-29 20:15 ` [GIT PULL 3/5] First set of omap1 related changes Tony Lindgren

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).