[GIT PULL 1/5] omap non critical fixes for v3.8 merge window

[GIT PULL 1/5] omap non critical fixes for v3.8 merge window

[Tony Lindgren]

The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:

  Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed

for you to fetch changes up to 936407358759adb302df93ab61fa68141897270c:

  ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n (2012-11-14 17:06:20 -0800)

----------------------------------------------------------------
Non critical omap fixes that were not considered urgent
for the -rc cycle.

----------------------------------------------------------------
Colin Cross (1):
      ARM: OMAP4: retrigger localtimers after re-enabling gic

Kevin Hilman (1):
      ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n

Santosh Shilimkar (1):
      ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.

Tero Kristo (1):
      ARM: OMAP4: PM: add errata support

Tony Lindgren (1):
      Merge tag 'for_3.8-fixes-pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/fixes-non-critical-v2

 arch/arm/mach-omap2/common.h              |  4 +++
 arch/arm/mach-omap2/omap-headsmp.S        | 38 ++++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap-mpuss-lowpower.c |  9 ++++++-
 arch/arm/mach-omap2/omap-smp.c            | 41 +++++++++++++++++++++++++++++-
 arch/arm/mach-omap2/omap4-common.c        | 42 ++++++++++++++++++++++++++++++-
 arch/arm/mach-omap2/pm.h                  |  9 +++++++
 6 files changed, 140 insertions(+), 3 deletions(-)

Re: [GIT PULL 1/5] omap non critical fixes for v3.8 merge window

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [121115 08:54]:
> On Thursday 15 November 2012, Tony Lindgren wrote:
> > The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
> > 
> >   Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed
> 
> Pulled all five. Please have a look to make sure everything you need is
> there now and still works.

Thanks! Diffs fine against what I have in omap-for-v3.8/tmp-merge
except for the following bit that breaks compile for omap2plus_defconfig,
maybe apply it directly to one of your branches?

Regards,

Tony


From: Tony Lindgren <tony@atomide.com>
Date: Thu, 15 Nov 2012 09:22:34 -0800
Subject: [PATCH] ARM: OMAP2+: Fix build for board-generic after a merge conflict

Commit 187e3e06 (ARM: OMAP2+: board files: use SoC-specific system
restart functions) changed to use SoC specific restart functions to
simplify the PRCM code. The changes done to board-generic.c in commit
7dd9d502 (ARM: OMAP3: Add generic machine descriptor for boards with
OMAP3 GP devices) need to be updated accordingly.

Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -122,7 +122,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
 	.init_machine	= omap_generic_init,
 	.timer		= &omap3_secure_timer,
 	.dt_compat	= omap3_gp_boards_compat,
-	.restart	= omap_prcm_restart,
+	.restart	= omap3xxx_restart,
 MACHINE_END
 #endif
 

Re: [GIT PULL 1/5] omap non critical fixes for v3.8 merge window

[Arnd Bergmann]

On Thursday 15 November 2012, Tony Lindgren wrote:
> The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:
> 
>   Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed

Pulled all five. Please have a look to make sure everything you need is
there now and still works.

	Arnd

[GIT PULL 1/5] omap non critical fixes for v3.8 merge window

[Tony Lindgren]

The following changes since commit 3d70f8c617a436c7146ecb81df2265b4626dfe89:

  Linux 3.7-rc4 (2012-11-04 11:07:39 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/fixes-non-critical-v4-signed

for you to fetch changes up to 936407358759adb302df93ab61fa68141897270c:

  ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n (2012-11-14 17:06:20 -0800)

----------------------------------------------------------------
Non critical omap fixes that were not considered urgent
for the -rc cycle.

----------------------------------------------------------------
Colin Cross (1):
      ARM: OMAP4: retrigger localtimers after re-enabling gic

Kevin Hilman (1):
      ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n

Santosh Shilimkar (1):
      ARM: OMAP4460: Workaround for ROM bug because of CA9 r2pX GIC control register change.

Tero Kristo (1):
      ARM: OMAP4: PM: add errata support

Tony Lindgren (1):
      Merge tag 'for_3.8-fixes-pm' of git://git.kernel.org/.../khilman/linux-omap-pm into omap-for-v3.8/fixes-non-critical-v2

 arch/arm/mach-omap2/common.h              |  4 +++
 arch/arm/mach-omap2/omap-headsmp.S        | 38 ++++++++++++++++++++++++++++
 arch/arm/mach-omap2/omap-mpuss-lowpower.c |  9 ++++++-
 arch/arm/mach-omap2/omap-smp.c            | 41 +++++++++++++++++++++++++++++-
 arch/arm/mach-omap2/omap4-common.c        | 42 ++++++++++++++++++++++++++++++-
 arch/arm/mach-omap2/pm.h                  |  9 +++++++
 6 files changed, 140 insertions(+), 3 deletions(-)