msm: mpm_ctr: Update correct name usage and frequency property
MPM counter is a generic name, use the specific counter name
and update the property list by adding support for
frequency property. Also update 8974 device tree files to
reflect the above.
Change-Id: Ibd5c3913bd3d9819552e05b8300f7efb8491f7f1
Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
Signed-off-by: Joel King <joelking@codeaurora.org>
diff --git a/Documentation/devicetree/bindings/arm/msm/mpm_counter.txt b/Documentation/devicetree/bindings/arm/msm/mpm_counter.txt
index e62b9ec..9ac1cbd 100644
--- a/Documentation/devicetree/bindings/arm/msm/mpm_counter.txt
+++ b/Documentation/devicetree/bindings/arm/msm/mpm_counter.txt
@@ -1,4 +1,4 @@
-* MSM Timetick counter (mpm-v2)
+* MSM MPM sleep counter (mpm-v2)
The MPM provides a timetick that starts when the device is powered up and
is not reset by any of the boot loaders or the HLOS. The MPM timetick counter
@@ -6,12 +6,14 @@
The required nodes for the MPM timetick counter driver are:
-- compatible: "qcom,mpm-counter"
+- compatible: "qcom,mpm2-sleep-counter"
- reg: Specifies the physical address of the timetick count register.
+- clock-frequency: the physical counter frequency.
Example:
- qcom,mpm-counter@fc4a3000 {
- compatible = "qcom,mpm-counter";
+ qcom,mpm2-sleep-counter@fc4a3000 {
+ compatible = "qcom,mpm2-sleep-counter";
reg = <0xfc4a3000 0x1000>;
+ clock-frequency = <32768>;
};
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index ab6b7c8..d4fe4d5 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -78,9 +78,10 @@
clock-frequency = <19200000>;
};
- qcom,mpm-counter@fc4a3000 {
- compatible = "qcom,mpm-counter";
+ qcom,mpm2-sleep-counter@fc4a3000 {
+ compatible = "qcom,mpm2-sleep-counter";
reg = <0xfc4a3000 0x1000>;
+ clock-frequency = <32768>;
};
msm_vidc: qcom,vidc@fdc00000 {
diff --git a/arch/arm/mach-msm/msm_mpmctr.c b/arch/arm/mach-msm/msm_mpmctr.c
index 4ab82ab..cc0c1c3 100644
--- a/arch/arm/mach-msm/msm_mpmctr.c
+++ b/arch/arm/mach-msm/msm_mpmctr.c
@@ -54,7 +54,7 @@
}
static struct of_device_id msm_mpmctr_of_match[] = {
- {.compatible = "qcom,mpm-counter"},
+ {.compatible = "qcom,mpm2-sleep-counter"},
{}
};