Merge branch 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm...

TI-Feature: power_management_base
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-ti-linux-3.14.y

* 'pm-ti-linux-3.14.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  ARM: AM43xx: PM: save and restore some misc PRM registers during rtc-only
  HACK: ARM: DRA7: PM: Disable CPUIDLE
  ARM: OMAP2: pm33xx: Bump firmware version requirement to 0x189
  ARM: OMAP2: pm33xx: Fix race condition between cpuidle and suspend
  cpufreq: cpufreq-cpu0: Use cpufreq_generic_suspend()
  remoteproc: wkup_m3_rproc: Move aux_data region
  ARM: OMAP2: sleep43xx: Use correct address for MPU Clockdomain
  ARM: AM43XX: PRM: Add IO Wake up support
  ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register
  ARM: OMAP4: PRM: Add nr_irqs check to extend support to single core SOCs.
  ARM: OMAP4+: PRM: fix omap4 version of prm_save_and_clear_irqen
  ARM: OMAP2+: AM43XX: Add PRCM int16 as the wake up source

Conflicts:
	arch/arm/boot/dts/dra72x.dtsi
	arch/arm/boot/dts/dra74x.dtsi
	arch/arm/mach-omap2/prcm43xx.h

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

diff --cc arch/arm/mach-omap2/prcm43xx.h
index dbbb827,eb37a03..8a599e0
--- 1/arch/arm/mach-omap2/prcm43xx.h
--- 2/arch/arm/mach-omap2/prcm43xx.h
+++ b/arch/arm/mach-omap2/prcm43xx.h
@@@ -144,10 -148,7 +148,11 @@@
  #define AM43XX_CM_PER_USBPHYOCP2SCP0_CLKCTRL_OFFSET   0x05B8
  #define AM43XX_CM_PER_USB_OTG_SS1_CLKCTRL_OFFSET        0x0268
  #define AM43XX_CM_PER_USBPHYOCP2SCP1_CLKCTRL_OFFSET   0x05C0
 +#define AM43XX_CM_PER_HDQ1W_CLKCTRL_OFFSET            0x04a0
 +#define AM43XX_CM_PER_DSS_CLKCTRL_OFFSET              0x0a20
  #define AM43XX_CM_PER_EMIF_CLKCTRL_OFFSET             0x0720
 +#define AM43XX_CM_PER_VPFE0_CLKCTRL_OFFSET            0x0068
 +#define AM43XX_CM_PER_VPFE1_CLKCTRL_OFFSET            0x0070
+ #define AM43XX_PRM_IO_PMCTRL_OFFSET                   0x0024
  
  #endif

diff --cc drivers/remoteproc/wkup_m3_rproc.c
Simple merge