summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2017-01-23 10:15:53 +0000
committerkettenis <kettenis@openbsd.org>2017-01-23 10:15:53 +0000
commit777fb14f988c0a88a4786c9ff984b431bea64d09 (patch)
tree7e63c1ec6e6df8e7776dfd049939fdba4f6bbf4a
parentOpen /dev/ptm before pledge() and save it to be used for PTMGET later (diff)
downloadwireguard-openbsd-777fb14f988c0a88a4786c9ff984b431bea64d09.tar.xz
wireguard-openbsd-777fb14f988c0a88a4786c9ff984b431bea64d09.zip
Also attach to "arm,armv7-timer".
ok patrick@
-rw-r--r--sys/arch/arm64/dev/agtimer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/arm64/dev/agtimer.c b/sys/arch/arm64/dev/agtimer.c
index fb2730ecc56..451f439715f 100644
--- a/sys/arch/arm64/dev/agtimer.c
+++ b/sys/arch/arm64/dev/agtimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: agtimer.c,v 1.2 2017/01/05 21:25:52 patrick Exp $ */
+/* $OpenBSD: agtimer.c,v 1.3 2017/01/23 10:15:53 kettenis Exp $ */
/*
* Copyright (c) 2011 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2013 Patrick Wildt <patrick@blueri.se>
@@ -137,7 +137,8 @@ agtimer_match(struct device *parent, void *cfdata, void *aux)
{
struct fdt_attach_args *faa = (struct fdt_attach_args *)aux;
- return OF_is_compatible(faa->fa_node, "arm,armv8-timer");
+ return (OF_is_compatible(faa->fa_node, "arm,armv7-timer") ||
+ OF_is_compatible(faa->fa_node, "arm,armv8-timer"));
}
void