[GIT PULL] non-critical omap fixes for v3.12 merge window

[GIT PULL] non-critical omap fixes for v3.12 merge window

[Tony Lindgren]

The following changes since commit b36f4be3de1b123d8601de062e7dbfc904f305fb:

  Linux 3.11-rc6 (2013-08-18 14:36:53 -0700)

are available in the git repository at:

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

for you to fetch changes up to af0721966195b3966214edd54af0d5f84d65419a:

  ARM: OMAP2: use 'int' instead of 'unsigned' for variable 'gpmc_irq_start' (2013-08-22 00:56:26 -0700)

----------------------------------------------------------------
Omap fixes for the merge window that are not urgent enough
for the -rc series.

----------------------------------------------------------------
Chen Baozi (1):
      ARM: OMAP2+: fix wrong address when loading PRM_FRAC_INCREMENTOR_DENUMERATOR_RELOAD

Chen Gang (2):
      ARM: OMAP2: remove useless variable 'ret'
      ARM: OMAP2: use 'int' instead of 'unsigned' for variable 'gpmc_irq_start'

Ezequiel Garcia (1):
      ARM: OMAP2: Use a consistent AM33XX SoC option description

Matus Ujhelyi (1):
      ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards

Peter Ujfalusi (1):
      ARM: OMAP2+: Remove legacy device creation for McPDM and DMIC

Wei Yongjun (1):
      ARM: OMAP: dma: fix error return code in omap_system_dma_probe()

 arch/arm/mach-omap2/Kconfig             |  2 +-
 arch/arm/mach-omap2/am33xx-restart.c    |  4 ++--
 arch/arm/mach-omap2/board-am3517crane.c |  2 --
 arch/arm/mach-omap2/devices.c           | 40 ---------------------------------
 arch/arm/mach-omap2/gpmc.c              |  2 +-
 arch/arm/mach-omap2/timer.c             |  2 +-
 arch/arm/plat-omap/dma.c                |  1 +
 7 files changed, 6 insertions(+), 47 deletions(-)

[GIT PULL] non-critical omap fixes for v3.12 merge window

[Olof Johansson]

On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:
> The following changes since commit b36f4be3de1b123d8601de062e7dbfc904f305fb:
> 
>   Linux 3.11-rc6 (2013-08-18 14:36:53 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.12/fixes-non-critical-signed

Thanks, pulled.


-Olof

[GIT PULL] non-critical omap fixes for v3.12 merge window

[Olof Johansson]

On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:

> Matus Ujhelyi (1):
>       ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards

Sigh. am33xx has been a bit of a pain this release cycle. Can you please
start double-checking builds when you apply am33xx stuff? :(

This breaks with:

        multi_v7_defconfig:
arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)

        omap2plus_defconfig:
arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)


I've unmerged the branch until that's resolved.

-Olof

[GIT PULL] non-critical omap fixes for v3.12 merge window

[Tony Lindgren]

* Olof Johansson <olof@lixom.net> [130828 11:58]:
> On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:
> 
> > Matus Ujhelyi (1):
> >       ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards
> 
> Sigh. am33xx has been a bit of a pain this release cycle. Can you please
> start double-checking builds when you apply am33xx stuff? :(
> 
> This breaks with:
> 
>         multi_v7_defconfig:
> arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> 
>         omap2plus_defconfig:
> arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)

Oops sorry, I see what's going on. It builds fine against v3.11-rc6, but
has a dependency for v3.12 for the cleanup branch that removed all the
unused defines. 
 
> I've unmerged the branch until that's resolved.

Care to apply the following fix to the cleanup branch?

This way this fixes branch keeps working both against v3.11 and the
patches queued for v3.12.

Regards,

Tony


8< ---------

From: Tony Lindgren <tony@atomide.com>
Date: Wed, 28 Aug 2013 22:24:13 -0700
Subject: [PATCH] ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK

This is needed to prevent a build error with a patch queued for fixes
"ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards".

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

diff --git a/arch/arm/mach-omap2/prm-regbits-33xx.h b/arch/arm/mach-omap2/prm-regbits-33xx.h
index bbffc03..84feece 100644
--- a/arch/arm/mach-omap2/prm-regbits-33xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-33xx.h
@@ -22,6 +22,7 @@
 #define AM33XX_GFX_MEM_RETSTATE_MASK			(1 << 6)
 #define AM33XX_GFX_MEM_STATEST_MASK			(0x3 << 4)
 #define AM33XX_GLOBAL_WARM_SW_RST_MASK			(1 << 1)
+#define AM33XX_RST_GLOBAL_WARM_SW_MASK			(1 << 0)
 #define AM33XX_PRUSS_MEM_ONSTATE_MASK			(0x3 << 5)
 #define AM33XX_PRUSS_MEM_RETSTATE_MASK			(1 << 7)
 #define AM33XX_PRUSS_MEM_STATEST_MASK			(0x3 << 23)

[GIT PULL] non-critical omap fixes for v3.12 merge window

[Olof Johansson]

On Wed, Aug 28, 2013 at 10:37:06PM -0700, Tony Lindgren wrote:
> * Olof Johansson <olof@lixom.net> [130828 11:58]:
> > On Thu, Aug 22, 2013 at 10:46:10PM -0700, Tony Lindgren wrote:
> > 
> > > Matus Ujhelyi (1):
> > >       ARM: OMAP2+: am33xx-restart: trigger warm reset on omap2+ boards
> > 
> > Sigh. am33xx has been a bit of a pain this release cycle. Can you please
> > start double-checking builds when you apply am33xx stuff? :(
> > 
> > This breaks with:
> > 
> >         multi_v7_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> > 
> >         omap2plus_defconfig:
> > arch/arm/mach-omap2/am33xx-restart.c:27:26: error: 'AM33XX_RST_GLOBAL_WARM_SW_MASK' undeclared (first use in this function)
> 
> Oops sorry, I see what's going on. It builds fine against v3.11-rc6, but
> has a dependency for v3.12 for the cleanup branch that removed all the
> unused defines. 
>  
> > I've unmerged the branch until that's resolved.
> 
> Care to apply the following fix to the cleanup branch?
> 
> This way this fixes branch keeps working both against v3.11 and the
> patches queued for v3.12.

Ah, yeah. Applied. And fixes branch pulled, since we'd otherwise just get most
of them during 3.12-rc. :)


-Olof