From a4bef1b5f866481e414771bbc70d40953c00d1e5 Mon Sep 17 00:00:00 2001 From: kettenis Date: Tue, 17 May 2022 10:09:40 +0000 Subject: [PATCH] Use a higher match priority such that mvclock(4) wins from syscon(4). ok patrick@, dtucker@ --- sys/dev/fdt/mvclock.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/fdt/mvclock.c b/sys/dev/fdt/mvclock.c index a043df4413e..fb1e062b289 100644 --- a/sys/dev/fdt/mvclock.c +++ b/sys/dev/fdt/mvclock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mvclock.c,v 1.11 2022/04/03 20:23:14 patrick Exp $ */ +/* $OpenBSD: mvclock.c,v 1.12 2022/05/17 10:09:40 kettenis Exp $ */ /* * Copyright (c) 2018 Mark Kettenis * @@ -72,13 +72,16 @@ mvclock_match(struct device *parent, void *match, void *aux) struct fdt_attach_args *faa = aux; int node = faa->fa_node; - return (OF_is_compatible(node, "marvell,ap806-clock") || + if (OF_is_compatible(node, "marvell,ap806-clock") || OF_is_compatible(node, "marvell,ap807-clock") || OF_is_compatible(node, "marvell,cp110-clock") || OF_is_compatible(node, "marvell,armada-3700-periph-clock-nb") || OF_is_compatible(node, "marvell,armada-3700-periph-clock-sb") || OF_is_compatible(node, "marvell,armada-3700-tbg-clock") || - OF_is_compatible(node, "marvell,armada-3700-xtal-clock")); + OF_is_compatible(node, "marvell,armada-3700-xtal-clock")) + return 10; /* Must beat syscon(4). */ + + return 0; } void -- 2.20.1