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

login
register
mail settings
Submitter Tony Lindgren
Date Aug. 23, 2013, 5:46 a.m.
Message ID <20130823054609.GW7656@atomide.com>
Download mbox
Permalink /patch/269298/
State New
Headers show

Pull-request

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

Comments

Tony Lindgren - Aug. 23, 2013, 5:46 a.m.
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(-)
Olof Johansson - Aug. 28, 2013, 6:26 p.m.
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
Olof Johansson - Aug. 28, 2013, 6:50 p.m.
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
Olof Johansson - Aug. 30, 2013, 2:11 a.m.
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