From e111203de4ff2e5b910a02a32c680c216158afc6 Mon Sep 17 00:00:00 2001
From: ian <ian@FreeBSD.org>
Date: Sat, 17 May 2014 20:22:22 +0000
Subject: MFC 264054, 264056

  Switch imx6 to using the mpcore per-cpu event timers, but continue to use
  the GPT timer, which is fixed-frequency, as a timecounter.

  Change NO_EVENTTIMERS from an arm-specific to an MI option, so that it can
  be used in MI code.
---
 sys/boot/fdt/dts/arm/imx6.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'sys/boot')

diff --git a/sys/boot/fdt/dts/arm/imx6.dtsi b/sys/boot/fdt/dts/arm/imx6.dtsi
index 35e8784..d89a1a5 100644
--- a/sys/boot/fdt/dts/arm/imx6.dtsi
+++ b/sys/boot/fdt/dts/arm/imx6.dtsi
@@ -71,6 +71,14 @@
 			       0x00a00100 0x00000100>;
 		};
 
+		mp_tmr0@00a00200 {
+			compatible = "arm,mpcore-timers";
+			reg = <0x00a00200 0x100
+			       0x00a00600 0x100>;
+			interrupts = <27 29>;
+			interrupt-parent = <&gic>;
+		};
+
 		l2-cache@00a02000 {
 			compatible = "arm,pl310-cache", "arm,pl310";
 			reg = <0xa02000 0x1000>;
-- 
cgit v1.1