[GIT PULL] omap fixes for v2.6.38-rc2

[GIT PULL] omap fixes for v2.6.38-rc2

[Tony Lindgren]

Hi Linus,

Please pull some omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

This is mostly to fix few compiler warning that sneaked in during the
merge window. Also included is one trivial omap1 related cleanup patch
to keep the code consistent with omap2+, and one PTR_ERR fix.

Regards,

Tony


The following changes since commit 6fb1b304255efc5c4c93874ac8c066272e257e28:

  Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (2011-01-26 16:31:44 +1000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

Felipe Balbi (1):
      arm: omap2: mux: fix compile warning

Julia Lawall (1):
      arch/arm/mach-omap2/dma.c: Convert IS_ERR result to PTR_ERR

Russell King (1):
      omap2+: Fix unused variable warning for omap_irq_base

Tony Lindgren (1):
      omap1: Simplify use of omap_irq_flags

 arch/arm/mach-omap1/include/mach/entry-macro.S |   13 -------------
 arch/arm/mach-omap1/irq.c                      |    2 +-
 arch/arm/mach-omap2/dma.c                      |    2 +-
 arch/arm/mach-omap2/include/mach/entry-macro.S |   14 --------------
 arch/arm/mach-omap2/io.c                       |    6 ++----
 arch/arm/mach-omap2/mux.c                      |    2 +-
 6 files changed, 5 insertions(+), 34 deletions(-)

[GIT PULL] omap fixes for v2.6.38-rc2

[Tony Lindgren]

Hi Linus,

Please pull omap fixes from:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

This is mostly to fix issues with recent omap1_defconfig and sched_clock
changes.

We need both the MPU timer and the 32KiHz timer usable together for
omap1_defconfig. This is needed as the 32KiHz timer is not available on
omap15xx or 730. Did not notice this earlier with omap1_defconfig as it
does not have CONFIG_PRINTK_TIME set currently..

Regards,

Tony


The following changes since commit 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5:

  Linux 2.6.38-rc2 (2011-01-21 19:01:34 -0800)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap-fixes-for-linus

Adrian Hunter (1):
      omap: DMA: clear interrupt status correctly

Daniel Morsing (1):
      OMAP3: Devkit8000: Fix tps65930 pullup/pulldown configuration

Felipe Balbi (1):
      OMAP: PRCM: remove duplicated headers

Igor Grinberg (2):
      arm: omap3: cm-t3517: rtc fix
      arm: omap3: cm-t3517: minor comment fix

Paul Walmsley (2):
      OMAP: counter_32k: init clocksource as part of machine timer init
      OMAP4: clockdomain: bypass unimplemented wake-up dependency functions on OMAP4

Tony Lindgren (4):
      Merge branch 'fixes_a_2.6.38rc' of git://git.pwsan.com/linux-2.6 into omap-fixes
      omap1: Fix sched_clock for the MPU timer
      omap1: Fix booting for 15xx and 730 with omap1_defconfig
      omap1: Fix sched_clock implementation when both MPU timer and 32K timer are used

 arch/arm/mach-omap1/Kconfig                 |    2 +
 arch/arm/mach-omap1/Makefile                |    3 +-
 arch/arm/mach-omap1/time.c                  |  101 +++++++++++++++++++++++++--
 arch/arm/mach-omap1/timer32k.c              |   13 ++--
 arch/arm/mach-omap2/board-cm-t3517.c        |   29 ++++++--
 arch/arm/mach-omap2/board-devkit8000.c      |    3 +-
 arch/arm/mach-omap2/clock44xx_data.c        |    1 -
 arch/arm/mach-omap2/clockdomain.c           |   30 +++++++-
 arch/arm/mach-omap2/clockdomains44xx_data.c |    2 -
 arch/arm/mach-omap2/powerdomain2xxx_3xxx.c  |    1 -
 arch/arm/mach-omap2/timer-gp.c              |   10 ++-
 arch/arm/plat-omap/Kconfig                  |    8 +--
 arch/arm/plat-omap/counter_32k.c            |   22 ++++--
 arch/arm/plat-omap/dma.c                    |    7 +-
 arch/arm/plat-omap/include/plat/common.h    |    3 +
 15 files changed, 184 insertions(+), 51 deletions(-)