aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2015-04-30 07:57:18 -0700
committerKevin Hilman <khilman@linaro.org>2015-04-30 07:57:18 -0700
commit05f74e8baccb60882ace4d0165887368e8143f3f (patch)
treea98e112984164491192f273508e5b0d6e02bcd6d /arch
parent41e72f5c4726e19a5958d9ffdbc0af7b3f79d091 (diff)
parent5e87fbde59e896a85bfdfd3970b407961b48d9d1 (diff)
downloadlinux-linaro-stable-05f74e8baccb60882ace4d0165887368e8143f3f.tar.gz
Merge branch 'v3.10/topic/mm-timer' into linux-linaro-lsk-v3.10lsk-v3.10-15.04
* v3.10/topic/mm-timer: ARM: exynos: dts: Update 5250 arch timer node with clock frequency
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/exynos5250.dtsi5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index cdbdc4dfef22..19b910989189 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -89,6 +89,11 @@
<1 14 0xf08>,
<1 11 0xf08>,
<1 10 0xf08>;
+ /* Unfortunately we need this since some versions of U-Boot
+ * on Exynos don't set the CNTFRQ register, so we need the
+ * value from DT.
+ */
+ clock-frequency = <24000000>;
};
combiner:interrupt-controller@10440000 {