summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2014-05-17 20:22:22 +0000
committerian <ian@FreeBSD.org>2014-05-17 20:22:22 +0000
commite111203de4ff2e5b910a02a32c680c216158afc6 (patch)
tree9e41be4459b39a47e9fd7b02a28cce35b7b0faaf /sys/boot
parent9f4d42e0d5ac9fd53ce7499b7ba78d5c2f392dcf (diff)
downloadFreeBSD-src-e111203de4ff2e5b910a02a32c680c216158afc6.zip
FreeBSD-src-e111203de4ff2e5b910a02a32c680c216158afc6.tar.gz
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.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/fdt/dts/arm/imx6.dtsi8
1 files changed, 8 insertions, 0 deletions
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>;
OpenPOWER on IntegriCloud