misc. OMAP PM updates for v3.1

Tony,

Please pull the following misc. OMAP PM updates targetted for v3.1.

This branch is based on your 'fixes' branch due to some dependencies.

Kevin

The following changes since commit b8ce9fb8e18af7466e0b915bb5979322cdace322:

Merge branch 'fixes-v3.0-rc3' into devel-fixes (2011-06-14 05:53:42 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.1/pm-misc

Kevin Hilman (4):
OMAP3: PM debug: remove sleep_while_idle feature
OMAP2: PM debug: remove register dumping
OMAP3: PM debug: remove register dumping
OMAP2: PM debug: move wakeup timer into clockevent code

Nishanth Menon (4):
OMAP3+: SR: make notify independent of class OMAP3+: SR: disable interrupt by default OMAP3+: SR: enable/disable SR only on need OMAP3+: SR: fix cosmetic indentation

Sanjeev Premi (1):
OMAP2+: PM: fix section mismatch in pm_dbg_init()

 arch/arm/mach-omap2/pm-debug.c            |  364 +----------------------------
 arch/arm/mach-omap2/pm.h                  |    9 -
 arch/arm/mach-omap2/pm24xx.c              |    6 +-
 arch/arm/mach-omap2/pm34xx.c              |    6 -
 arch/arm/mach-omap2/smartreflex.c         |   38 ++--
 arch/arm/mach-omap2/timer-gp.c            |   33 +++-
 arch/arm/plat-omap/include/plat/dmtimer.h |    1 -
 7 files changed, 53 insertions(+), 404 deletions(-)

This won't work with the devel-timer branch. I think we should just drop it for now based on what I mentioned in the other thread.

Regards,

Tony

OK, dropped the timer patch. Updated pull request below.

Thanks,

Kevin

The following changes since commit b8ce9fb8e18af7466e0b915bb5979322cdace322:

Merge branch 'fixes-v3.0-rc3' into devel-fixes (2011-06-14 05:53:42 -0700)

are available in the git repository at:

ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.1/pm-misc

Kevin Hilman (3):
OMAP3: PM debug: remove sleep_while_idle feature
OMAP2: PM debug: remove register dumping
OMAP3: PM debug: remove register dumping

Nishanth Menon (4):
OMAP3+: SR: make notify independent of class OMAP3+: SR: disable interrupt by default OMAP3+: SR: enable/disable SR only on need OMAP3+: SR: fix cosmetic indentation

Sanjeev Premi (1):
OMAP2+: PM: fix section mismatch in pm_dbg_init()

 arch/arm/mach-omap2/pm-debug.c    |  345 +------------------------------------
 arch/arm/mach-omap2/pm.h          |    6 -
 arch/arm/mach-omap2/pm24xx.c      |    6 +-
 arch/arm/mach-omap2/pm34xx.c      |    2 -
 arch/arm/mach-omap2/smartreflex.c |   38 ++--
 5 files changed, 23 insertions(+), 374 deletions(-)

Hmm, so it's not just the wakeup timer that conflicts between devel-timer and my pm-misc branch.

My branch also removes a bunch of other stuff from pm-debug.c and pm.h so it has overlapping changes with your devel-timer branch.

The conflicts are easy enough to resolve since both branches are just removing code.

Is your devel-timer branch stable now? Should I rebase my branch on top of devel-timer? or can you just handle the conflicts?

Kevin

OK thanks for checking.

Just pushed what hopefully is the last version. But since there may still be some comments, it's probably best that I resolve the conflicts when merging.

Tony

Pulled now into devel-cleanup and pushed out. Also merged in devel-timer branch into devel-cleanup.

Tony