 @@ -1,38 +1,38 @@
-# $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
+#
 # This machine description file is used to generate the default NetBSD
 # kernel.  The generic kernel does not include all options, subsystems
 # and device drivers, but should be useful for most applications.
+#
 # The machine description file can be customised for your specific
 # machine to reduce the kernel size and improve its performance.
+#
 # For further information on compiling NetBSD kernels, see the config(8)
 # man page.
+#
 # For further information on hardware support for this architecture, see
 # the intro(4) man page.  For further information about kernel options
 # for this architecture, see the options(4) man page.  For an explanation
 # of each device driver in this file see the section 4 man page for the
 # device.
 include 	"arch/amd64/conf/std.amd64"
 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
 # delay between "rebooting ..." message and hardware reset, in milliseconds
 #options 	CPURESET_DELAY=2000
 # This option allows you to force a serial console at the specified
 # I/O address.   see console(4) for details.
 #options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
 #	you don't want the option below ON iff you are using the
 #	serial console option of the new boot strap code.
 #options 	CONS_OVERRIDE	# Always use above! independent of boot info
 @@ -535,28 +535,29 @@ iic*	at nfsmb?
 # Intel PIIX4 power management controllers
 piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
 iic*	at piixpm?			# SMBus on PIIX4
 # Intel ICH SMBus controller
 ichsmb* at pci? dev ? function ?
 iic*	at ichsmb?
 # Intel S1200,C2000 (non-pch) SMBus controller
 ismt* at pci? dev ? function ?
 iic*	at ismt?
-# I2C controller as found in some Intel PCH devices.
+# DesignWare I2C controller as found in some Intel PCH and AMD FCH devices.
-dwiic*		at pci?			# I2C controller
+dwiic*		at acpi?		# DesignWare I2C controller
 dwiic*		at pci?			# DesignWare I2C controller
 iic*		at dwiic?
 # Thermal monitor and fan controller
 #dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
 #dbcool* at iic? addr 0x2D		# Tyan S2881
 #dbcool* at iic? addr 0x2E		# Tyan S2882-D
 # IBM Thinkpad Active Protection System
 #aps0	at isa? port 0x1600
 # Fintek Super I/O with hardware monitor
 #finsio0 	at isa? port 0x4e

 @@ -1,14 +1,14 @@
-/* $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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jared McNeill <jmcneill@invisible.ca>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_intr.h>
 #include <dev/acpi/acpi_i2c.h>
 #include <dev/ic/dwiic_var.h>
 @@ -50,26 +50,28 @@ struct dwiic_acpi_param {
 	uint32_t ht;
 };
 static int	dwiic_acpi_match(device_t, cfdata_t, void *);
 static void	dwiic_acpi_attach(device_t, device_t, void *);
 static void	dwiic_acpi_parse_param(struct dwiic_softc *, ACPI_HANDLE,
 					  const char *, struct dwiic_acpi_param *);
 static void	dwiic_acpi_configure(struct dwiic_softc *, ACPI_HANDLE);
 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
 };
 static int
 dwiic_acpi_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct acpi_attach_args *aa = aux;
 	if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
 		return 0;