Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc power management changes from Olof Johansson:
 "Power management changes here are mostly for the omap platform, but
  also include cpuidle changes for ux500 and suspend/resume code for
  mmp."

* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
  ARM: OMAP2+: WDTIMER integration: fix !PM boot crash, disarm timer after hwmod reset
  ARM: OMAP2/3: hwmod data: Add 32k-sync timer data to hwmod database
  ARM: OMAP4: hwmod_data: Name the common irq for McBSP ports
  ARM: OMAP4: hwmod data: I2C: add flag for context restore
  ARM: OMAP3: hwmod_data: Rename the common irq for McBSP ports
  ARM: OMAP2xxx: hwmod data: add HDQ/1-wire hwmod
  ARM: OMAP3: hwmod data: add HDQ/1-wire hwmod
  ARM: OMAP2+: hwmod data: add HDQ/1-wire hwmod shared data
  ARM: OMAP2+: HDQ1W: add custom reset function
  ARM: OMAP2420: hwmod data: Add MMC hwmod data for 2420
  arm: omap3: clockdomain data: Remove superfluous commas from gfx_sgx_3xxx_wkdeps[]
  ARM: OMAP2+: powerdomain: Get rid off duplicate pwrdm_clkdm_state_switch() API
  ARM: OMAP3: clock data: add clockdomain for HDQ functional clock
  ARM: OMAP3+: dpll: Configure autoidle mode only if it's supported
  ARM: OMAP2+: dmtimer: cleanup iclk usage
  ARM: OMAP4+: Add prm and cm base init function.
  ARM: OMAP2/3: Add idle_st bits for ST_32KSYNC timer to prcm-common header
  ARM: OMAP3: Fix CM register bit masks
  ARM: OMAP: clock: convert AM3517/3505 detection/flags to AM35xx
  ARM: OMAP3: clock data: treat all AM35x devices the same
  ...

diff --cc arch/arm/Kconfig
index 58e2f7865f54cf70b04fcce95757f21d93d8d5f1,aaa22f89fd23b8d1edd9d261a43d84ad2ce6f4c0..0a2fc01891a90d5e49fa7a04256b0cbe2e608c98
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -2259,9 -2273,9 +2259,9 @@@ menu "Power management options
  source "kernel/power/Kconfig"
  
  config ARCH_SUSPEND_POSSIBLE
 -      depends on !ARCH_S5PC100
 +      depends on !ARCH_S5PC100 && !ARCH_TEGRA
        depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
-               CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
+               CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK
        def_bool y
  
  config ARM_CPU_SUSPEND

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

diff --cc arch/arm/mach-ux500/Makefile
index 041c35885981f356196811f807ccfa14cba45b2c,93a191afba7ae15f8f82e8eb60249036b12d17b7..026086ff9e6c1e02f83de04c174742ad41b2f374
--- 1/arch/arm/mach-ux500/Makefile
--- 2/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@@ -4,7 -4,9 +4,8 @@@
  
  obj-y                         := clock.o cpu.o devices.o devices-common.o \
                                   id.o usb.o timer.o
+ obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
  obj-$(CONFIG_CACHE_L2X0)      += cache-l2x0.o
 -obj-$(CONFIG_UX500_SOC_DB5500)        += cpu-db5500.o dma-db5500.o
  obj-$(CONFIG_UX500_SOC_DB8500)        += cpu-db8500.o devices-db8500.o
  obj-$(CONFIG_MACH_MOP500)     += board-mop500.o board-mop500-sdi.o \
                                board-mop500-regulators.o \

diff --cc arch/arm/mm/proc-mohawk.S
Simple merge

diff --cc arch/arm/plat-omap/include/plat/dmtimer.h
Simple merge