From: patrick <patrick@openbsd.org>
Date: Sun, 28 Feb 2021 21:41:07 +0000 (+0000)
Subject: Enable acpiiort(4), add smmu(4) but keep disabled.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dfa91243857eac374a99d3b04fec802912da0a61;p=openbsd

Enable acpiiort(4), add smmu(4) but keep disabled.

ok kettenis@
---

diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC
index 9e3b89e2ea1..ec02f9290dc 100644
--- a/sys/arch/arm64/conf/GENERIC
+++ b/sys/arch/arm64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.191 2021/02/27 16:19:14 kettenis Exp $
+# $OpenBSD: GENERIC,v 1.192 2021/02/28 21:41:07 patrick Exp $
 #
 # GENERIC machine description file
 #
@@ -42,6 +42,8 @@ acpibtn*	at acpi?
 acpiec*		at acpi?
 acpige*		at acpi?
 acpimcfg*	at acpi?
+acpiiort*	at acpi?
+#smmu*		at acpiiort?
 acpipci*	at acpi?
 pci*		at acpipci?
 acpipwrres*	at acpi?
@@ -81,6 +83,7 @@ pci*		at pciecam?
 sdhc*		at fdt?
 sdmmc*		at sdhc?
 bwfm*		at sdmmc?	# Broadcom FullMAC
+#smmu*		at fdt?
 xhci*		at fdt?
 ccp*		at fdt?		# AMD Cryptographic Co-processor
 ipmi*		at fdt?
diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK
index 5ee714072b8..dc582aa563b 100644
--- a/sys/arch/arm64/conf/RAMDISK
+++ b/sys/arch/arm64/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.144 2021/02/27 16:31:33 kettenis Exp $
+# $OpenBSD: RAMDISK,v 1.145 2021/02/28 21:41:07 patrick Exp $
 #
 # GENERIC machine description file
 #
@@ -51,6 +51,8 @@ efi0		at mainbus?
 acpi0		at mainbus?
 acpiec*		at acpi?
 acpimcfg*	at acpi?
+acpiiort*	at acpi?
+#smmu*		at acpiiort?
 acpipci*	at acpi?
 pci*		at acpipci?
 ahci*		at acpi?
@@ -84,6 +86,7 @@ pci*		at pciecam?
 sdhc*		at fdt?
 sdmmc*		at sdhc?
 bwfm*		at sdmmc?	# Broadcom FullMAC
+#smmu*		at fdt?
 xhci*		at fdt?
 ccp*		at fdt?		# AMD Cryptographic Co-processor