diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2022-01-04 20:55:49 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2022-01-04 20:55:49 +0000 |
| commit | ac50c513f9a343677d0a99abcee4f23c64677149 (patch) | |
| tree | fe5d17f5f5f4b5d84edb9de530ecae57f76ac5f4 /sys/arch | |
| parent | b959995f22ee927d8893439f5fff6711b8f5725e (diff) | |
Future-proof by adding some proposed compatible strings to match on.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/arm64/dev/aplmbox.c | 5 | ||||
| -rw-r--r-- | sys/arch/arm64/dev/aplns.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/arm64/dev/aplmbox.c b/sys/arch/arm64/dev/aplmbox.c index 38f12628c13..090e6a07acb 100644 --- a/sys/arch/arm64/dev/aplmbox.c +++ b/sys/arch/arm64/dev/aplmbox.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aplmbox.c,v 1.1 2021/12/18 13:33:52 kettenis Exp $ */ +/* $OpenBSD: aplmbox.c,v 1.2 2022/01/04 20:55:48 kettenis Exp $ */ /* * Copyright (c) 2021 Mark Kettenis <kettenis@openbsd.org> * @@ -80,7 +80,8 @@ aplmbox_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - return OF_is_compatible(faa->fa_node, "apple,asc-mailbox"); + return (OF_is_compatible(faa->fa_node, "apple,asc-mailbox") || + OF_is_compatible(faa->fa_node, "apple,asc-mailbox-v4")); } void diff --git a/sys/arch/arm64/dev/aplns.c b/sys/arch/arm64/dev/aplns.c index 846df28ab2e..6ce6dd50045 100644 --- a/sys/arch/arm64/dev/aplns.c +++ b/sys/arch/arm64/dev/aplns.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aplns.c,v 1.7 2021/12/19 23:47:24 kettenis Exp $ */ +/* $OpenBSD: aplns.c,v 1.8 2022/01/04 20:55:48 kettenis Exp $ */ /* * Copyright (c) 2014, 2021 David Gwynne <dlg@openbsd.org> * @@ -163,7 +163,8 @@ nvme_ans_match(struct device *parent, void *match, void *aux) { struct fdt_attach_args *faa = aux; - return (OF_is_compatible(faa->fa_node, "apple,nvme-m1")); + return (OF_is_compatible(faa->fa_node, "apple,nvme-m1") || + OF_is_compatible(faa->fa_node, "apple,nvme-ans2")); } void |