commit 50627bd901da99f1213eec2c7c33820835b278fc
author Linux Build Service Account <lnxbuild@localhost> Fri Nov 09 15:56:19 2012 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Nov 09 15:56:18 2012 -0800
tree 27bf4a167115786c96f6fa6303b097c58bf2f05b
parent c718e486b09ad908214feda0b0b52be84d1536ec
parent 832a10f3e57d312614092ce4ddaac259a98919ee

Merge "arm/dt: msm9625: Add RPM stats device"

Documentation/devicetree/bindings/arm/msm/rpm-stats.txt

diff --git a/Documentation/devicetree/bindings/arm/msm/rpm-stats.txt b/Documentation/devicetree/bindings/arm/msm/rpm-stats.txt
index 1b21007..3137e91 100644
--- a/Documentation/devicetree/bindings/arm/msm/rpm-stats.txt
+++ b/Documentation/devicetree/bindings/arm/msm/rpm-stats.txt
@@ -14,7 +14,7 @@
 
 Example:
 
-qcom,rpm-stats@0xfc19dbd0{
+qcom,rpm-stats@fc19dbd0 {
 		compatible = "qcom,rpm-stats";
 		reg = <0xfc19dbd0 0x1000>;
 		reg-names = "phys_addr_base";

arch/arm/boot/dts/msm9625-pm.dtsi

diff --git a/arch/arm/boot/dts/msm9625-pm.dtsi b/arch/arm/boot/dts/msm9625-pm.dtsi
index 86e0cf7..d62f7e7 100644
--- a/arch/arm/boot/dts/msm9625-pm.dtsi
+++ b/arch/arm/boot/dts/msm9625-pm.dtsi
@@ -204,4 +204,11 @@
 		qcom,pc-mode = <2>; /*MSM_PC_TZ_L2_EXT */
 		qcom,use-sync-timer;
 	};
+
+	qcom,rpm-stats@fc19dbd0 {
+		compatible = "qcom,rpm-stats";
+		reg = <0xfc19dbd0 0x1000>;
+		reg-names = "phys_addr_base";
+		qcom,sleep-stats-version = <2>;
+	};
 };