commit 75a7bbc8fab3a680cd9d2d9134f61ee917bc1809
author Linux Build Service Account <lnxbuild@localhost> Wed May 15 02:06:25 2019 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed May 15 02:06:25 2019 -0700
tree 299bf553816eda9b265054a436da57a3c6366ab6
parent dc46d0fd8bb59b83f3ead3f46936311bee53c21f
parent b9b32798e74505c8d0e473005819088e3d54af40

Merge "ipq6018: fixing timer frequency"

arch/arm/dts/ipq6018-emulation.dts

diff --git a/arch/arm/dts/ipq6018-emulation.dts b/arch/arm/dts/ipq6018-emulation.dts
index b1fb19a..be7d1b9 100644
--- a/arch/arm/dts/ipq6018-emulation.dts
+++ b/arch/arm/dts/ipq6018-emulation.dts
@@ -150,4 +150,8 @@
 		qcom,emulation = <1>;
 	};
 
+	timer {
+		gpt_freq_hz = <240000>;
+	};
+
 };

arch/arm/dts/ipq6018-soc.dtsi

diff --git a/arch/arm/dts/ipq6018-soc.dtsi b/arch/arm/dts/ipq6018-soc.dtsi
index 8edde41..f10b3ba 100644
--- a/arch/arm/dts/ipq6018-soc.dtsi
+++ b/arch/arm/dts/ipq6018-soc.dtsi
@@ -48,7 +48,7 @@
 	timer {
 		gcnt_cntcv_lo = <0x4a2000>;
 		gcnt_cntcv_hi = <0x4a2004>;
-		gpt_freq_hz = <240000>;
+		gpt_freq_hz = <24000000>;
 		timer_load_val = <0x00FFFFFF 0xFFFFFFFF>;
 	};