Based on work by: Mahesh Sivasubramanian [off-list ref],
Ai Li [off-list ref], Praveen Chidambaram [off-list ref]
Original tree available at -
git://codeaurora.org/quic/la/kernel/msm-3.10.git

Cc: Stephen Boyd <redacted>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Kevin Hilman <redacted>
Cc: Daniel Lezcano <redacted>
Signed-off-by: Lina Iyer <redacted>
---
.../devicetree/bindings/arm/msm/qcom,saw2.txt      |  29 +-
drivers/soc/qcom/Kconfig                           |   7 +
drivers/soc/qcom/Makefile                          |   1 +
drivers/soc/qcom/spm.c                             | 405 +++++++++++++++++++++
4 files changed, 436 insertions(+), 6 deletions(-)
create mode 100644 drivers/soc/qcom/spm.c

diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt b/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt
index 1505fb8..664aa91 100644
--- a/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt
+++ b/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt

@@ -2,11 +2,20 @@ SPM AVS Wrapper 2 (SAW2)

The SAW2 is a wrapper around the Subsystem Power Manager (SPM) and the
Adaptive Voltage Scaling (AVS) hardware. The SPM is a programmable
-micro-controller that transitions a piece of hardware (like a processor or
+power-controller that transitions a piece of hardware (like a processor or
subsystem) into and out of low power modes via a direct connection to
the PMIC. It can also be wired up to interact with other processors in the
system, notifying them when a low power state is entered or exited.

+Multiple revisions of the SAW hardware are supported using these Device Nodes.
+SAW2 revisions differ in the register offset and configuration data. Also, the
+same revision of the SAW in different SoCs may have different configuration
+data due the the differences in hardware capabilities. Hence the SoC name, the
+version of the SAW hardware in that SoC and the distinction between cpu (big
+or Little) or cache, may be needed to uniquely identify the SAW register
+configuration and initialization data. The compatible string is used to
+indicate this parameter.
+
PROPERTIES

- compatible:

@@ -14,10 +23,11 @@ PROPERTIES

	Value type: <string>
	Definition: shall contain "qcom,saw2". A more specific value should be
		    one of:

-			 "qcom,saw2-v1"
-			 "qcom,saw2-v1.1"
-			 "qcom,saw2-v2"
-			 "qcom,saw2-v2.1"
+			"qcom,saw2-v2"
+			"qcom,saw2-v2.1"
+			"qcom,apq8064-saw2-v1.1-cpu"
+			"qcom,msm8974-saw2-v2.1-cpu"
+			"qcom,apq8084-saw2-v2.1-cpu"

- reg:
	Usage: required

@@ -26,10 +36,17 @@ PROPERTIES

		    the register region. An optional second element specifies
		    the base address and size of the alias register region.

+- regulator:
+	Usage: optional
+	Value type: boolean
+	Definition: Indicates that this SPM device acts as a regulator device
+			device for the core (CPU or Cache) the SPM is attached
+			to.

Example:

-	regulator at 2099000 {
+	power-controller at 2099000 {
		compatible = "qcom,saw2";
		reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
+		regulator;
	};