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

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: (36 commits)
  ARM: dts: am43xx: Add scale data fw to wkup_m3 node
  ARM: dts: am33xx: Add scale data fw to wkup_m3 node
  ARM: OMAP2: pm33xx: Provide i2c voltage scaling data to wkup_m3
  remoteproc: wkup_m3_rproc: Add device to rproc_ready callback
  remoteproc: wkup_m3_rproc: Introduce wkup_m3_copy_aux_data
  ARM: AM43xx: PM: disable DCOLDO DPLL PER force active to allow suspend
  ARM: AM43XX: PM: change RTC_SCRATCH1 register handling for rtc-only mode
  ARM: OMAP2+: opp33xx: Change OPP50 initialization
  ARM: OMAP2: sleep43xx: Set MPU Clockdomain to HW_AUTO after suspend
  rtc: OMAP: Add external 32k clock feature
  ARM: dts" AM437x: Correct and reorder the rtc compatibility strings
  ARM: AM33XX/AM43XX: re-order suspend-params
  ARM: AM43XX: Add RTC-only suspend
  remoteproc: wkup_m3: Add rtc_only support
  ARM: dts: AM437X: Enable RTC
  ARM: OMAP2: Add functions to save and restore clock/dpll context en-masse.
  ARM: dts: am437x-gp-evm: force enable dcdc3 regulator during suspend
  regulator: tps65218: Enable suspend configuration
  regulator: of: add support for enabling regulator during suspend
  regulator: tps65217: Enable suspend configuration
  ...

Conflicts:
	arch/arm/boot/dts/am437x-sk-evm.dts
	arch/arm/boot/dts/am43x-epos-evm.dts

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

3 files changed, 16 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/arm/omap/amx3xx-pm.txt b/Documentation/devicetree/bindings/arm/omap/amx3xx-pm.txt
index b1d06232e3e..5062f6c7223 100644
--- a/Documentation/devicetree/bindings/arm/omap/amx3xx-pm.txt
+++ b/Documentation/devicetree/bindings/arm/omap/amx3xx-pm.txt
@@ -80,3 +80,13 @@ wkup_m3: wkup_m3@44d00000 {
 	...
 	ti,set-io-isolation;
 };
+
+Support for I2C PMIC Voltage Scaling
+==================================
+It is possible to pass the name of a binary file to laod to the CM3 firmware
+in order to provide I2C sequences for the CM3 to send out to the PMIC during
+low power mode entry.
+
+Optional Properties:
+-scale-data-fw:	Name of the firmware binary in /lib/firmware to copy to m3
+		aux data.
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt
index e2c7f1e7251..091b966e6d0 100644
--- a/Documentation/devicetree/bindings/regulator/regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/regulator.txt
@@ -14,6 +14,7 @@ Optional properties:
 - regulator-ramp-delay: ramp delay for regulator(in uV/uS)
   For hardwares which support disabling ramp rate, it should be explicitly
   intialised to zero (regulator-ramp-delay = <0>) for disabling ramp delay.
+- regulator-suspend-enable: regulator shall be enabled during suspend
 - regulator-enable-ramp-delay: The time taken, in microseconds, for the supply
   rail to reach the target voltage, plus/minus whatever tolerance the board
   design requires. This property describes the total system ramp time
diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt
index 5a0f02d34d9..d1af7874327 100644
--- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt
+++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt
@@ -10,6 +10,10 @@ Required properties:
 - interrupts: rtc timer, alarm interrupts in order
 - interrupt-parent: phandle for the interrupt controller
 
+Optional properties:
+- ti,system-power-controller: Telling whether or not rtc is controlling
+  the system power.
+
 Example:
 
 rtc@1c23000 {
@@ -18,4 +22,5 @@ rtc@1c23000 {
 	interrupts = <19
 		      19>;
 	interrupt-parent = <&intc>;
+	ti,system-power-controller;
 };