diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-07-31 12:47:43 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-07-31 12:47:43 +0000 |
| commit | aa356991fb9fc702fe808ff74b07a2e76b63dbb4 (patch) | |
| tree | 21be310420ce5f2eb4888fcfe3d167d6f09a202e | |
| parent | Ensure DECLINE messages always contain the address from the OFFER. (diff) | |
| download | wireguard-openbsd-aa356991fb9fc702fe808ff74b07a2e76b63dbb4.tar.xz wireguard-openbsd-aa356991fb9fc702fe808ff74b07a2e76b63dbb4.zip | |
Make sure bcmtmon(4) attaches even if it has a "syscon" compatible.
| -rw-r--r-- | sys/arch/arm64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/dev/fdt/bcm2711_tmon.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index 9a6d6a31f14..00ddc2591b0 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.172 2020/06/25 12:44:09 patrick Exp $ +# $OpenBSD: GENERIC,v 1.173 2020/07/31 12:47:43 kettenis Exp $ # # GENERIC machine description file # @@ -163,7 +163,7 @@ bcmrng* at fdt? bcmsdhost* at fdt? sdmmc* at bcmsdhost? bcmtemp* at fdt? -bcmtmon* at fdt? +bcmtmon* at fdt? early 1 bse* at fdt? bse* at acpi? dwctwo* at fdt? diff --git a/sys/dev/fdt/bcm2711_tmon.c b/sys/dev/fdt/bcm2711_tmon.c index 11421583921..fb36740f1cf 100644 --- a/sys/dev/fdt/bcm2711_tmon.c +++ b/sys/dev/fdt/bcm2711_tmon.c @@ -63,10 +63,13 @@ int bcmtmon_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - - return (OF_is_compatible(faa->fa_node, "brcm,bcm2711-avs-monitor") || + + if (OF_is_compatible(faa->fa_node, "brcm,bcm2711-avs-monitor") || OF_is_compatible(faa->fa_node, "brcm,avs-tmon-bcm2711") || - OF_is_compatible(faa->fa_node, "brcm,avs-tmon-bcm2838")); + OF_is_compatible(faa->fa_node, "brcm,avs-tmon-bcm2838")) + return 10; /* Must beat syscon(4). */ + + return 0; } void |