diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-08-04 15:44:18 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-08-04 15:44:18 +0000 |
commit | fb07ec4d4a9df4f440f145563a859510f077f7fe (patch) | |
tree | 14b35b19519e5b879ae44ede0ee8e9b9d5f9cb35 | |
parent | fdb828f265ab637de52d53e8325ca0c616498158 (diff) |
Add support for X-Gene/eMAG variant.
-rw-r--r-- | sys/arch/arm64/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/dev/acpi/dwiic_acpi.c | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index 15e3468d6db..89557e2120d 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.106 2019/08/04 09:27:09 kettenis Exp $ +# $OpenBSD: GENERIC,v 1.107 2019/08/04 15:44:17 kettenis Exp $ # # GENERIC machine description file # @@ -48,6 +48,8 @@ pci* at acpipci? ahci* at acpi? ccp* at acpi? # AMD Cryptographic Co-processor com* at acpi? +dwiic* at acpi? +iic* at dwiic? pluart* at acpi? xhci* at acpi? simplebus* at fdt? diff --git a/sys/dev/acpi/dwiic_acpi.c b/sys/dev/acpi/dwiic_acpi.c index 4baf7072aee..9ba51c73309 100644 --- a/sys/dev/acpi/dwiic_acpi.c +++ b/sys/dev/acpi/dwiic_acpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dwiic_acpi.c,v 1.11 2019/07/31 16:07:21 jcs Exp $ */ +/* $OpenBSD: dwiic_acpi.c,v 1.12 2019/08/04 15:44:17 kettenis Exp $ */ /* * Synopsys DesignWare I2C controller * @@ -66,6 +66,7 @@ struct cfattach dwiic_acpi_ca = { }; const char *dwiic_hids[] = { + "APMC0D0F", "INT33C2", "INT33C3", "INT3432", |