[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window

[GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window

[Tony Lindgren]

The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:

  ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v2-for-v3.7

for you to fetch changes up to ead53717d9ab28c942b9adf66f8c02442dbfbc8a:

  arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX (2012-09-24 10:32:39 -0700)

----------------------------------------------------------------
These board and platform related patches have been posted
quite a while ago but have somehow fallen though the cracks
as most of the focus has been making things to work with
device tree. As the first patch depends on sparse IRQ
related removal of irqs.h and related header moves, these
are based on omap-cleanup-local-headers-for-v3.7 tag.

----------------------------------------------------------------
AnilKumar Ch (1):
      ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6

Peter Ujfalusi (1):
      ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus

Yegor Yefremov (1):
      arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX

 arch/arm/Kconfig                              |    5 ++--
 arch/arm/mach-omap2/board-4430sdp.c           |   12 ++++++--
 arch/arm/mach-omap2/board-omap4panda.c        |   12 ++++++--
 arch/arm/mach-omap2/twl-common.c              |   37 ++++++++-----------------
 arch/arm/mach-omap2/twl-common.h              |    3 +-
 arch/arm/plat-omap/include/plat/omap-serial.h |    2 +-
 6 files changed, 37 insertions(+), 34 deletions(-)

[GIT PULL 3/3] omap arch timer late changes for v3.7 merge window

[Tony Lindgren]

The following changes since commit 3fe05bd9980df7207a35b4841a94dc2875e86960:

  Merge tag 'v3.6-rc6' into devel-dt (2012-09-24 11:42:13 -0700)

are available in the git repository at:


  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/devel-dt-arch-timer-for-v3.7

for you to fetch changes up to ef8fe6fee16f178cd80cf11b21565bca95b80182:

  Merge branch 'devel-dt-arch-timer' into devel-dt (2012-09-24 11:42:24 -0700)

----------------------------------------------------------------

Few late patches to enable arch timer for omap5
using device tree.

----------------------------------------------------------------
Santosh Shilimkar (2):
      ARM: OMAP: Add initialisation for the real-time counter.
      ARM: OMAP5: Enable arch timer support

Tony Lindgren (2):
      Merge branch 'for_3.7/omap5_arch_timer' of git://github.com/SantoshShilimkar/linux into devel-dt-arch-timer
      Merge branch 'devel-dt-arch-timer' into devel-dt

 arch/arm/boot/dts/omap5.dtsi |   12 ++++++
 arch/arm/mach-omap2/Kconfig  |    5 +++
 arch/arm/mach-omap2/timer.c  |   97 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 113 insertions(+), 1 deletion(-)

Re: [GIT PULL 1/3] omap clock late patches for v3.7 merge window

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [120924 14:26]:
> 
> These changes take us a step closer to merging the common clock
> framework for omap but unfortunately these patches were not
> ready for merging earlier. See also the notes below on the
> dependencies these patches have, they are based on a merge
> of sereral branches already merged.

I am aware these three pull requests all are very late.
Just let me know if you don't want to take them at this point
and I'll resend updated pull reqs after -rc1 or so.

Regards,

Tony

Re: [GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [120924 14:30]:
> The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
> 
>   ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v2-for-v3.7
> 
> for you to fetch changes up to ead53717d9ab28c942b9adf66f8c02442dbfbc8a:
> 
>   arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX (2012-09-24 10:32:39 -0700)
> 
> ----------------------------------------------------------------
> These board and platform related patches have been posted
> quite a while ago but have somehow fallen though the cracks
> as most of the focus has been making things to work with
> device tree. As the first patch depends on sparse IRQ
> related removal of irqs.h and related header moves, these
> are based on omap-cleanup-local-headers-for-v3.7 tag.

Let's scrap this pull request, Russell noted that Yegor's patch
breaks sa1111.

Regards,

Tony
 
> ----------------------------------------------------------------
> AnilKumar Ch (1):
>       ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
> 
> Peter Ujfalusi (1):
>       ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
> 
> Yegor Yefremov (1):
>       arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX


 
>  arch/arm/Kconfig                              |    5 ++--
>  arch/arm/mach-omap2/board-4430sdp.c           |   12 ++++++--
>  arch/arm/mach-omap2/board-omap4panda.c        |   12 ++++++--
>  arch/arm/mach-omap2/twl-common.c              |   37 ++++++++-----------------
>  arch/arm/mach-omap2/twl-common.h              |    3 +-
>  arch/arm/plat-omap/include/plat/omap-serial.h |    2 +-
>  6 files changed, 37 insertions(+), 34 deletions(-)
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [120924 17:41]:
> * Tony Lindgren <tony@atomide.com> [120924 14:30]:
> > The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
> > 
> >   ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v2-for-v3.7
> > 
> > for you to fetch changes up to ead53717d9ab28c942b9adf66f8c02442dbfbc8a:
> > 
> >   arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX (2012-09-24 10:32:39 -0700)
> > 
> > ----------------------------------------------------------------
> > These board and platform related patches have been posted
> > quite a while ago but have somehow fallen though the cracks
> > as most of the focus has been making things to work with
> > device tree. As the first patch depends on sparse IRQ
> > related removal of irqs.h and related header moves, these
> > are based on omap-cleanup-local-headers-for-v3.7 tag.
> 
> Let's scrap this pull request, Russell noted that Yegor's patch
> breaks sa1111.

Here's the updated pull request with just the top patch dropped.

Tony


The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:

  ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v3-for-v3.7

for you to fetch changes up to cfc55bcc1f78395872d41c50f6a3129c4b42289e:

  ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6 (2012-09-24 10:32:39 -0700)

----------------------------------------------------------------
These board and platform related patches have been posted
quite a while ago but have somehow fallen though the cracks
as most of the focus has been making things to work with
device tree. As the first patch depends on sparse IRQ
related removal of irqs.h and related header moves, these
are based on omap-cleanup-local-headers-for-v3.7 tag.

----------------------------------------------------------------
AnilKumar Ch (1):
      ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6

Peter Ujfalusi (1):
      ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus

 arch/arm/mach-omap2/board-4430sdp.c           |   12 ++++++--
 arch/arm/mach-omap2/board-omap4panda.c        |   12 ++++++--
 arch/arm/mach-omap2/twl-common.c              |   37 ++++++++-----------------
 arch/arm/mach-omap2/twl-common.h              |    3 +-
 arch/arm/plat-omap/include/plat/omap-serial.h |    2 +-
 5 files changed, 34 insertions(+), 32 deletions(-)

Re: [GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window

[Olof Johansson]

On Mon, Sep 24, 2012 at 08:31:36PM -0700, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [120924 17:41]:
> > * Tony Lindgren <tony@atomide.com> [120924 14:30]:
> > > The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
> > > 
> > >   ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v2-for-v3.7
> > > 
> > > for you to fetch changes up to ead53717d9ab28c942b9adf66f8c02442dbfbc8a:
> > > 
> > >   arm: make FORCE_MAX_ZONEORDER configurable for TI AM33XX (2012-09-24 10:32:39 -0700)
> > > 
> > > ----------------------------------------------------------------
> > > These board and platform related patches have been posted
> > > quite a while ago but have somehow fallen though the cracks
> > > as most of the focus has been making things to work with
> > > device tree. As the first patch depends on sparse IRQ
> > > related removal of irqs.h and related header moves, these
> > > are based on omap-cleanup-local-headers-for-v3.7 tag.
> > 
> > Let's scrap this pull request, Russell noted that Yegor's patch
> > breaks sa1111.
> 
> Here's the updated pull request with just the top patch dropped.
> 
> Tony
> 
> 
> The following changes since commit 0e70156de4c8465bfb8cb45cdc1bbc2fa474ce14:
> 
>   ARM: OMAP2+: Make omap4-keypad.h local (2012-09-20 15:04:04 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-board-late-v3-for-v3.7

Thanks, pulled this on top of the previous cleanup-headers.

In the future, feel free to remove the tag that you don't want me to pull from
the repo so I don't accidentally pull it anyway.


-Olof

Re: [GIT PULL 2/3] omap platform and board related late patches for v3.7 merge window

[Tony Lindgren]

* Olof Johansson <olof@lixom.net> [120929 14:04]:
> 
> Thanks, pulled this on top of the previous cleanup-headers.
> 
> In the future, feel free to remove the tag that you don't want me to pull from
> the repo so I don't accidentally pull it anyway.

OK thanks will do.

Tony

Re: [GIT PULL 3/3] omap arch timer late changes for v3.7 merge window

[Olof Johansson]

On Mon, Sep 24, 2012 at 02:25:52PM -0700, Tony Lindgren wrote:
> The following changes since commit 3fe05bd9980df7207a35b4841a94dc2875e86960:
> 
>   Merge tag 'v3.6-rc6' into devel-dt (2012-09-24 11:42:13 -0700)
> 
> are available in the git repository at:
> 
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/devel-dt-arch-timer-for-v3.7
> 
> for you to fetch changes up to ef8fe6fee16f178cd80cf11b21565bca95b80182:
> 
>   Merge branch 'devel-dt-arch-timer' into devel-dt (2012-09-24 11:42:24 -0700)

Merged on top of previous omap/dt (next/dt).


-Olof