ARM: OMAP: Merge PM code from N800 tree
authorKai Svahn <kai.svahn@nokia.com>
Fri, 26 Jan 2007 21:05:41 +0000 (13:05 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 16 Apr 2007 18:41:49 +0000 (18:41 +0000)
This patch merges omap2 PM code from N800 tree.

Patch adds support for sleep while idle for omap2
and handy serial console debbugging code. It also
moves code from pm-domain.c to pm.c.

This code can be used as a base for developing
power management for all omap24xx boards.

Signed-off-by: Kai Svahn <kai.svahn@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/pm-domain.c [deleted file]
arch/arm/mach-omap2/pm.c
arch/arm/mach-omap2/sleep.S
include/asm-arm/arch-omap/gpio.h
include/asm-arm/arch-omap/pm.h

Simple merge
diff --cc arch/arm/mach-omap2/pm-domain.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge