From: kettenis <kettenis@openbsd.org>
Date: Tue, 4 Jan 2022 20:55:48 +0000 (+0000)
Subject: Future-proof by adding some proposed compatible strings to match on.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=bcf979e46d79788d298ea4210c7b6d6508b5c147;p=openbsd

Future-proof by adding some proposed compatible strings to match on.
---

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