[src/trunk]: src/sys/dev/acpi Attach dwiic(4) to AMD FCH I2C controllers. The...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2c30b740f2f1
branches:  trunk
changeset: 950310:2c30b740f2f1
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jan 24 16:33:48 2021 +0000

description:
Attach dwiic(4) to AMD FCH I2C controllers. These busses are separate
from the SMBus that we attach to piixpm(4) today, and support direct
config via ACPI.

diffstat:

 sys/arch/amd64/conf/GENERIC |  9 +++++----
 sys/dev/acpi/dwiic_acpi.c   |  6 ++++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diffs (57 lines):

diff -r 83d0cd31aa5b -r 2c30b740f2f1 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sun Jan 24 16:23:05 2021 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sun Jan 24 16:33:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.582 2021/01/20 13:22:08 nia Exp $
+# $NetBSD: GENERIC,v 1.583 2021/01/24 16:33:48 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.582 $"
+#ident         "GENERIC-$Revision: 1.583 $"
 
 maxusers       64              # estimated number of users
 
@@ -545,8 +545,9 @@
 ismt* at pci? dev ? function ?
 iic*   at ismt?
 
-# I2C controller as found in some Intel PCH devices.
-dwiic*         at pci?                 # I2C controller
+# DesignWare I2C controller as found in some Intel PCH and AMD FCH devices.
+dwiic*         at acpi?                # DesignWare I2C controller
+dwiic*         at pci?                 # DesignWare I2C controller
 iic*           at dwiic?
 
 # Thermal monitor and fan controller
diff -r 83d0cd31aa5b -r 2c30b740f2f1 sys/dev/acpi/dwiic_acpi.c
--- a/sys/dev/acpi/dwiic_acpi.c Sun Jan 24 16:23:05 2021 +0000
+++ b/sys/dev/acpi/dwiic_acpi.c Sun Jan 24 16:33:48 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
+/* $NetBSD: dwiic_acpi.c,v 1.5 2021/01/24 16:33:48 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.5 2021/01/24 16:33:48 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -60,6 +60,8 @@
 CFATTACH_DECL_NEW(dwiic_acpi, sizeof(struct dwiic_softc), dwiic_acpi_match, dwiic_acpi_attach, NULL, NULL);
 
 static const char * const compatible[] = {
+       "AMD0010",      /* AMD FCH */
+       "AMDI0010",     /* AMD FCH */
        "AMDI0510",     /* AMD Seattle */
        "APMC0D0F",     /* Ampere eMAG */
        NULL