summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Turner <andrew@FreeBSD.org>2014-12-14 15:41:56 +0000
committerAndrew Turner <andrew@FreeBSD.org>2014-12-14 15:41:56 +0000
commit5f6ebb0815a5a11d7d827f8ea4a29bc81ad16f9a (patch)
treef1fda4e4d9cdd245c30fc26ff72df858bb2cb0a6
parent22e5192cbcce04b07843f54ef559511a2a30584d (diff)
Notes
-rw-r--r--sys/arm/arm/generic_timer.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/arm/arm/generic_timer.c b/sys/arm/arm/generic_timer.c
index df7d0cd0b9b77..20affd01799a2 100644
--- a/sys/arm/arm/generic_timer.c
+++ b/sys/arm/arm/generic_timer.c
@@ -86,7 +86,7 @@ static struct resource_spec timer_spec[] = {
{ SYS_RES_IRQ, 0, RF_ACTIVE }, /* Secure */
{ SYS_RES_IRQ, 1, RF_ACTIVE }, /* Non-secure */
{ SYS_RES_IRQ, 2, RF_ACTIVE }, /* Virt */
- { SYS_RES_IRQ, 3, RF_ACTIVE }, /* Hyp */
+ { SYS_RES_IRQ, 3, RF_ACTIVE | RF_OPTIONAL }, /* Hyp */
{ -1, 0 }
};
@@ -345,6 +345,8 @@ static devclass_t arm_tmr_devclass;
EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0,
BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
+EARLY_DRIVER_MODULE(timer, ofwbus, arm_tmr_driver, arm_tmr_devclass, 0, 0,
+ BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE);
void
DELAY(int usec)