summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2018-06-07 13:36:28 +0000
committerthorpej <thorpej@NetBSD.org>2018-06-07 13:36:28 +0000
commitef54f58f8a9b8ea444e47352fab138d643c02f22 (patch)
tree4669012d2ac30bd4b4f295de6948001d284a771e /sys
parent548da43bbfc6cf79ed5bfc48c9135438f25ee09a (diff)
Revert changes that pinned-down i2c parent specs. The i2c subsystem
has been enhanced to make this unnecessary.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/acorn32/conf/EB7500ATX8
-rw-r--r--sys/arch/acorn32/conf/GENERIC6
-rw-r--r--sys/arch/acorn32/conf/INSTALL6
-rw-r--r--sys/arch/acorn32/conf/LOWMEM_WSCONS4
-rw-r--r--sys/arch/acorn32/conf/NC4
-rw-r--r--sys/arch/alpha/conf/GENERIC28
-rw-r--r--sys/arch/amd64/conf/ALL56
-rw-r--r--sys/arch/amd64/conf/GENERIC48
-rw-r--r--sys/arch/amd64/conf/XEN3_DOM042
-rw-r--r--sys/arch/evbarm/conf/ARMADAXP4
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO2104
-rw-r--r--sys/arch/evbarm/conf/ARMADILLO96
-rw-r--r--sys/arch/evbarm/conf/CUBOX8
-rw-r--r--sys/arch/evbarm/conf/DNS3238
-rw-r--r--sys/arch/evbarm/conf/GUMSTIX4
-rw-r--r--sys/arch/evbarm/conf/KUROBOX_PRO4
-rw-r--r--sys/arch/evbarm/conf/KURONAS_X44
-rw-r--r--sys/arch/evbarm/conf/MMNET_GENERIC10
-rw-r--r--sys/arch/evbarm/conf/MPCSA_GENERIC10
-rw-r--r--sys/arch/evbarm/conf/MV21204
-rw-r--r--sys/arch/evbarm/conf/TEAMASA_NPWR4
-rw-r--r--sys/arch/evbarm/conf/VTC10014
-rw-r--r--sys/arch/evbmips/conf/GDIUM12
-rw-r--r--sys/arch/evbmips/conf/LOONGSON12
-rw-r--r--sys/arch/hpcarm/conf/NETBOOKPRO10
-rw-r--r--sys/arch/i386/conf/ALL50
-rw-r--r--sys/arch/i386/conf/GENERIC48
-rw-r--r--sys/arch/i386/conf/XEN3_DOM040
-rw-r--r--sys/arch/mmeye/conf/MMEYE_WLF6
-rw-r--r--sys/arch/zaurus/conf/GENERIC6
-rw-r--r--sys/arch/zaurus/conf/INSTALL4
-rw-r--r--sys/arch/zaurus/conf/INSTALL_C7004
32 files changed, 239 insertions, 239 deletions
diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX
index 812f8504065..8a4f64eb053 100644
--- a/sys/arch/acorn32/conf/EB7500ATX
+++ b/sys/arch/acorn32/conf/EB7500ATX
@@ -1,4 +1,4 @@
-# $NetBSD: EB7500ATX,v 1.65 2018/05/14 21:05:17 thorpej Exp $
+# $NetBSD: EB7500ATX,v 1.66 2018/06/07 13:36:28 thorpej Exp $
#
# EB7500ATX --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "EB7500ATX-$Revision: 1.65 $"
+#ident "EB7500ATX-$Revision: 1.66 $"
# estimated number of users
maxusers 32
@@ -159,10 +159,10 @@ clock* at iomd?
# IIC bus device
#iomdiic* at iomd?
-#iic0 at iomdiic?
+#iic* at iomdiic?
# RTC device via IIC bus
-#pcfrtc* at iic0 addr 0x50
+#pcfrtc* at iic? addr 0x50
# VIDC device
vidc0 at mainbus?
diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index 45f9e1124e0..718b2cc22d6 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.125 2018/05/14 21:05:17 thorpej Exp $
+# $NetBSD: GENERIC,v 1.126 2018/06/07 13:36:28 thorpej Exp $
#
# GENERIC --- NetBSD/acorn32 complete configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.125 $"
+#ident "GENERIC-$Revision: 1.126 $"
# estimated number of users
maxusers 32
@@ -166,7 +166,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic0 addr 0x50
+pcfrtc* at iic? addr 0x50
# VIDC device
vidc0 at mainbus?
diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index 66388a91f1d..6fa2da81a3e 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.79 2018/05/14 21:05:17 thorpej Exp $
+# $NetBSD: INSTALL,v 1.80 2018/06/07 13:36:28 thorpej Exp $
#
# INSTALL -- NetBSD/acorn32 install configuration
#
@@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "INSTALL-$Revision: 1.79 $"
+#ident "INSTALL-$Revision: 1.80 $"
# estimated number of users
maxusers 32
@@ -148,7 +148,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic0 addr 0x50
+pcfrtc* at iic? addr 0x50
# VIDC device
vidc0 at mainbus?
diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index 37b150f7fb6..0c7d4e222f7 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-# $NetBSD: LOWMEM_WSCONS,v 1.73 2018/05/14 21:05:17 thorpej Exp $
+# $NetBSD: LOWMEM_WSCONS,v 1.74 2018/06/07 13:36:28 thorpej Exp $
#
# LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
#
@@ -126,7 +126,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic0 addr 0x50
+pcfrtc* at iic? addr 0x50
# VIDC device
vidc0 at mainbus?
diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index 25bee8cd6ee..005274b19f8 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-# $NetBSD: NC,v 1.72 2018/05/14 21:05:17 thorpej Exp $
+# $NetBSD: NC,v 1.73 2018/06/07 13:36:28 thorpej Exp $
#
# NC - with wscons
#
@@ -122,7 +122,7 @@ iomdiic* at iomd?
iic0 at iomdiic?
# RTC device via IIC bus
-pcfrtc* at iic0 addr 0x50
+pcfrtc* at iic? addr 0x50
# VIDC device
vidc0 at mainbus?
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 04da34f6135..37570633524 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.382 2018/05/15 00:42:35 thorpej Exp $
+# $NetBSD: GENERIC,v 1.383 2018/06/07 13:36:28 thorpej Exp $
#
# This machine description file is used to generate the default NetBSD
# kernel.
@@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.382 $"
+ident "GENERIC-$Revision: 1.383 $"
maxusers 32
@@ -539,18 +539,18 @@ alipm* at pci? dev ? function ?
iic* at alipm?
# AlphaServer DS20L i2c devices
-#lmenv* at iic0 addr 0x2c
-#lmenv* at iic0 addr 0x2d
-#lmenv* at iic0 addr 0x2e
-#lmenv* at iic0 addr 0x2f
-#spdmem* at iic0 addr 0x50
-#spdmem* at iic0 addr 0x51
-#spdmem* at iic0 addr 0x52
-#spdmem* at iic0 addr 0x53
-#spdmem* at iic0 addr 0x54
-#spdmem* at iic0 addr 0x55
-#spdmem* at iic0 addr 0x56
-#spdmem* at iic0 addr 0x57
+#lmenv* at iic? addr 0x2c
+#lmenv* at iic? addr 0x2d
+#lmenv* at iic? addr 0x2e
+#lmenv* at iic? addr 0x2f
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
#seeprom* at iic0 addr 0x51 flags 0x2
# PCMCIA USB controllers
diff --git a/sys/arch/amd64/conf/ALL b/sys/arch/amd64/conf/ALL
index 7a5ac90520f..eb1a506acc1 100644
--- a/sys/arch/amd64/conf/ALL
+++ b/sys/arch/amd64/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.88 2018/05/19 09:27:09 jdolecek Exp $
+# $NetBSD: ALL,v 1.89 2018/06/07 13:36:28 thorpej Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.88 $"
+#ident "ALL-$Revision: 1.89 $"
maxusers 64 # estimated number of users
@@ -594,7 +594,7 @@ wbsio* at isa? port 0x2e
wbsio* at isa? port 0x4e
# IBM Hawk Integrated Systems Management Processor
-ibmhawk0 at iic0 addr 0x37
+ibmhawk0 at iic? addr 0x37
# Intel Integrated Memory Controller SMBus (experimental)
imc* at pci? dev ? function ? # Intel Integrated Memory Controller,
@@ -610,8 +610,8 @@ lm* at wbsio?
smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
-smscmon* at iic0 addr 0x2c
-smscmon* at iic0 addr 0x2d # (alternate address)
+smscmon* at iic? addr 0x2c
+smscmon* at iic? addr 0x2d # (alternate address)
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
@@ -639,20 +639,20 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# dbCool Thermal monitor and fan controller
-dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-dbcool* at iic0 addr 0x2D # Tyan S2881
-dbcool* at iic0 addr 0x2E # Tyan S2882-D
+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 Hawk Integrated Systems Management Processor
-ibmhawk0 at iic0 addr 0x37
+ibmhawk0 at iic? addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
-lm0 at iic0 addr 0x2e flags 0x0
+lm0 at iic? addr 0x2e flags 0x0
# SMSC LPC47M192 hardware monitor
-smscmon* at iic0 addr 0x2c
-#smscmon* at iic0 addr 0x2d # (alternate address)
+smscmon* at iic? addr 0x2c
+#smscmon* at iic? addr 0x2d # (alternate address)
# IBM Thinkpad Active Protection System
aps0 at isa? port 0x1600
@@ -685,22 +685,22 @@ ug0 at isa? port 0xe0
viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules and optional temp sensors
-spdmem* at iic0 addr 0x50
-spdmem* at iic0 addr 0x51
-spdmem* at iic0 addr 0x52
-spdmem* at iic0 addr 0x53
-spdmem* at iic0 addr 0x54
-spdmem* at iic0 addr 0x55
-spdmem* at iic0 addr 0x56
-spdmem* at iic0 addr 0x57
-sdtemp* at iic0 addr 0x18
-sdtemp* at iic0 addr 0x19
-sdtemp* at iic0 addr 0x1a
-sdtemp* at iic0 addr 0x1b
-sdtemp* at iic0 addr 0x1c
-sdtemp* at iic0 addr 0x1d
-sdtemp* at iic0 addr 0x1e
-sdtemp* at iic0 addr 0x1f
+spdmem* at iic? addr 0x50
+spdmem* at iic? addr 0x51
+spdmem* at iic? addr 0x52
+spdmem* at iic? addr 0x53
+spdmem* at iic? addr 0x54
+spdmem* at iic? addr 0x55
+spdmem* at iic? addr 0x56
+spdmem* at iic? addr 0x57
+sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
# I2C HID devices
ihidev* at iic?
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index f3fbe7e3340..7b1621e7b28 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.492 2018/05/22 08:15:26 maxv Exp $
+# $NetBSD: GENERIC,v 1.493 2018/06/07 13:36:28 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.492 $"
+#ident "GENERIC-$Revision: 1.493 $"
maxusers 64 # estimated number of users
@@ -486,7 +486,7 @@ amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
#wbsio* at isa? port 0x4e
# IBM Hawk Integrated Systems Management Processor
-#ibmhawk0 at iic0 addr 0x37
+#ibmhawk0 at iic? addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
@@ -497,8 +497,8 @@ amdzentemp* at amdsmnbus? # AMD Ryzen Family 17h CPU temp sensors
#smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
-#smscmon* at iic0 addr 0x2c
-#smscmon* at iic0 addr 0x2d # (alternate address)
+#smscmon* at iic? addr 0x2c
+#smscmon* at iic? addr 0x2d # (alternate address)
# AMD 768 and 8111 power/ACPI controllers
amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface
@@ -526,9 +526,9 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# Thermal monitor and fan controller
-#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-#dbcool* at iic0 addr 0x2D # Tyan S2881
-#dbcool* at iic0 addr 0x2E # Tyan S2882-D
+#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
@@ -543,22 +543,22 @@ iic* at dwiic?
#ug0 at isa? port 0xe0
# Serial Presence Detect capable memory modules
-#spdmem* at iic0 addr 0x50
-#spdmem* at iic0 addr 0x51
-#spdmem* at iic0 addr 0x52
-#spdmem* at iic0 addr 0x53
-#spdmem* at iic0 addr 0x54
-#spdmem* at iic0 addr 0x55
-#spdmem* at iic0 addr 0x56
-#spdmem* at iic0 addr 0x57
-#sdtemp* at iic0 addr 0x18
-#sdtemp* at iic0 addr 0x19
-#sdtemp* at iic0 addr 0x1a
-#sdtemp* at iic0 addr 0x1b
-#sdtemp* at iic0 addr 0x1c
-#sdtemp* at iic0 addr 0x1d
-#sdtemp* at iic0 addr 0x1e
-#sdtemp* at iic0 addr 0x1f
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
# I2C HID devices
ihidev* at iic?
diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0
index 525795daa05..439534cf960 100644
--- a/sys/arch/amd64/conf/XEN3_DOM0
+++ b/sys/arch/amd64/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.150 2018/05/15 01:53:27 thorpej Exp $
+# $NetBSD: XEN3_DOM0,v 1.151 2018/06/07 13:36:28 thorpej Exp $
include "arch/amd64/conf/std.xen"
@@ -10,7 +10,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary
#options UVMHIST_PRINT
#options SYSCALL_DEBUG
-#ident "XEN3_DOM0-$Revision: 1.150 $"
+#ident "XEN3_DOM0-$Revision: 1.151 $"
maxusers 32 # estimated number of users
@@ -314,27 +314,27 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# Thermal monitor and fan controller
-#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-#dbcool* at iic0 addr 0x2D # Tyan S2881
-#dbcool* at iic0 addr 0x2E # Tyan S2882-D
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# Serial Presence Detect capable memory modules
-#spdmem* at iic0 addr 0x50
-#spdmem* at iic0 addr 0x51
-#spdmem* at iic0 addr 0x52
-#spdmem* at iic0 addr 0x53
-#spdmem* at iic0 addr 0x54
-#spdmem* at iic0 addr 0x55
-#spdmem* at iic0 addr 0x56
-#spdmem* at iic0 addr 0x57
-#sdtemp* at iic0 addr 0x18
-#sdtemp* at iic0 addr 0x19
-#sdtemp* at iic0 addr 0x1a
-#sdtemp* at iic0 addr 0x1b
-#sdtemp* at iic0 addr 0x1c
-#sdtemp* at iic0 addr 0x1d
-#sdtemp* at iic0 addr 0x1e
-#sdtemp* at iic0 addr 0x1f
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
diff --git a/sys/arch/evbarm/conf/ARMADAXP b/sys/arch/evbarm/conf/ARMADAXP
index 842872b4456..6bdfed70027 100644
--- a/sys/arch/evbarm/conf/ARMADAXP
+++ b/sys/arch/evbarm/conf/ARMADAXP
@@ -1,5 +1,5 @@
#
-# $NetBSD: ARMADAXP,v 1.22 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: ARMADAXP,v 1.23 2018/06/07 13:36:28 thorpej Exp $
#
# ARMADA XP DEV BOARD
#
@@ -185,7 +185,7 @@ spiflash0 at spiflashbus?
m25p0 at spi? slave 0
# TWSI SDRAM Serial Presence Detect
-spdmem0 at iic0 addr 0x56
+spdmem0 at iic? addr 0x56
# On-chip Cryptographic Engines and Security Accelerator (S/W chaining)
mvcesa* at mvsoc? offset ? irq ?
diff --git a/sys/arch/evbarm/conf/ARMADILLO210 b/sys/arch/evbarm/conf/ARMADILLO210
index 0fa7986d042..cde2ca602bd 100644
--- a/sys/arch/evbarm/conf/ARMADILLO210
+++ b/sys/arch/evbarm/conf/ARMADILLO210
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO210,v 1.39 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: ARMADILLO210,v 1.40 2018/06/07 13:36:28 thorpej Exp $
#
# ARMADILLO210 -- Atmark Techno, Armadillo-210
#
@@ -156,7 +156,7 @@ epled0 at epgpio0 port 4 bit1 1 bit2 0
# I^2C Controller Unit
armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
iic* at armadillo9iic?
-seeprom0 at iic0 addr 0x50 size 128
+seeprom0 at iic? addr 0x50 size 128
# MII/PHY support
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
diff --git a/sys/arch/evbarm/conf/ARMADILLO9 b/sys/arch/evbarm/conf/ARMADILLO9
index 4701af69b28..580624053e9 100644
--- a/sys/arch/evbarm/conf/ARMADILLO9
+++ b/sys/arch/evbarm/conf/ARMADILLO9
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO9,v 1.56 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: ARMADILLO9,v 1.57 2018/06/07 13:36:28 thorpej Exp $
#
# ARMADILLO9 -- Atmark Techno, Armadillo-9
#
@@ -167,8 +167,8 @@ epled0 at epgpio0 port 4 bit1 0 bit2 1
# I^2C Controller Unit
armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
iic* at armadillo9iic?
-seeprom0 at iic0 addr 0x50 size 128
-#s3531rtc0 at iic0 addr 0x30
+seeprom0 at iic? addr 0x50 size 128
+#s3531rtc0 at iic? addr 0x30
# PCMCIA bus support
pcmcia* at eppcic0 controller ? socket ?
diff --git a/sys/arch/evbarm/conf/CUBOX b/sys/arch/evbarm/conf/CUBOX
index e91e8e70609..2506f40bc0b 100644
--- a/sys/arch/evbarm/conf/CUBOX
+++ b/sys/arch/evbarm/conf/CUBOX
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.6 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: CUBOX,v 1.7 2018/06/07 13:36:28 thorpej Exp $
#
# CUBOX -- SolidRun Ltd. Cubox kernel
#
@@ -250,9 +250,9 @@ spiflash0 at spiflashbus?
gttwsi* at mvsoc? offset ? irq ?
iic* at gttwsi?
-#TDA998x at iic0 addr 0x34 # HDMI transmitters
-#Si5351A at iic0 addr 0x60 # Programmable Any-Frequency CMOS Clock Generator
-#lcdc at iic0 addr 0x70
+#TDA998x at iic? addr 0x34 # HDMI transmitters
+#Si5351A at iic? addr 0x60 # Programmable Any-Frequency CMOS Clock Generator
+#lcdc at iic? addr 0x70
# On-chip UART Interface
com* at mvsoc? offset ? irq ?
diff --git a/sys/arch/evbarm/conf/DNS323 b/sys/arch/evbarm/conf/DNS323
index 5a0e9637924..eb099a0c6fe 100644
--- a/sys/arch/evbarm/conf/DNS323
+++ b/sys/arch/evbarm/conf/DNS323
@@ -1,4 +1,4 @@
-# $NetBSD: DNS323,v 1.10 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: DNS323,v 1.11 2018/06/07 13:36:28 thorpej Exp $
#
# DNS323 -- D-Link. DNS-323 platform kernel
#
@@ -30,8 +30,8 @@ makeoptions COPY_SYMTAB=1
#options AUDIO_DEBUG=2
-g760a* at iic0 addr 0x3e # G760a fan speed controller
-lmtemp* at iic0 addr 0x48 # LM75 temperature sensor
-strtc* at iic0 addr 0x68 # ST M41T80 Real-Time Clock
+g760a* at iic? addr 0x3e # G760a fan speed controller
+lmtemp* at iic? addr 0x48 # LM75 temperature sensor
+strtc* at iic? addr 0x68 # ST M41T80 Real-Time Clock
options STRTC_NO_USERRAM
options STRTC_NO_WATCHDOG
diff --git a/sys/arch/evbarm/conf/GUMSTIX b/sys/arch/evbarm/conf/GUMSTIX
index 4d5fbfa294c..8d9c943e941 100644
--- a/sys/arch/evbarm/conf/GUMSTIX
+++ b/sys/arch/evbarm/conf/GUMSTIX
@@ -1,4 +1,4 @@
-# $NetBSD: GUMSTIX,v 1.95 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: GUMSTIX,v 1.96 2018/06/07 13:36:28 thorpej Exp $
#
# GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
#
@@ -229,7 +229,7 @@ smsh0 at gxio? addr 0x04000300 gpirq 99 # netmicroSD-vx, netpro-vx
# Inter-Integrated Circuit controller
gxiic0 at pxaip? addr 0x40300000
iic* at gxiic?
-#dsrtc* at iic0 addr 0x68 # Can mount DS1307 at console, breakout
+#dsrtc* at iic? addr 0x68 # Can mount DS1307 at console, breakout
# integrated PCMCIA/CF controller
pxapcic0 at pxaip? addr 0x20000000 # cfstix, netCF
diff --git a/sys/arch/evbarm/conf/KUROBOX_PRO b/sys/arch/evbarm/conf/KUROBOX_PRO
index 85abab6f7c6..c035e2045aa 100644
--- a/sys/arch/evbarm/conf/KUROBOX_PRO
+++ b/sys/arch/evbarm/conf/KUROBOX_PRO
@@ -1,4 +1,4 @@
-# $NetBSD: KUROBOX_PRO,v 1.9 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: KUROBOX_PRO,v 1.10 2018/06/07 13:36:28 thorpej Exp $
#
# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
#
@@ -36,7 +36,7 @@ makeoptions COPY_SYMTAB=1
no gtpci* at mvsoc?
no pci* at gtpci?
-rs5c372rtc* at iic0 addr 0x32 # RICOH RS5C372 RTC
+rs5c372rtc* at iic? addr 0x32 # RICOH RS5C372 RTC
# PCI network interfaces
#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
diff --git a/sys/arch/evbarm/conf/KURONAS_X4 b/sys/arch/evbarm/conf/KURONAS_X4
index 3475d26728e..e149de7c576 100644
--- a/sys/arch/evbarm/conf/KURONAS_X4
+++ b/sys/arch/evbarm/conf/KURONAS_X4
@@ -1,4 +1,4 @@
-# $NetBSD: KURONAS_X4,v 1.2 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: KURONAS_X4,v 1.3 2018/06/07 13:36:28 thorpej Exp $
#
# KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
#
@@ -32,7 +32,7 @@ makeoptions COPY_SYMTAB=1
#options AUDIO_DEBUG=2
-rs5c372rtc* at iic0 addr 0x32 # RICOH RS5C372 RTC
+rs5c372rtc* at iic? addr 0x32 # RICOH RS5C372 RTC
# PCI network interfaces
#mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet
diff --git a/sys/arch/evbarm/conf/MMNET_GENERIC b/sys/arch/evbarm/conf/MMNET_GENERIC
index 238ceafa32e..0c20546b7b2 100644
--- a/sys/arch/evbarm/conf/MMNET_GENERIC
+++ b/sys/arch/evbarm/conf/MMNET_GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.35 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: MMNET_GENERIC,v 1.36 2018/06/07 13:36:28 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mmnet"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.35 $"
+#ident "GENERIC-$Revision: 1.36 $"
maxusers 32 # estimated number of users
@@ -288,9 +288,9 @@ iic0 at at91twi?
# Hardware monitors
# AMD 768 and 8111 power/ACPI controllers
-#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-#dbcool* at iic0 addr 0x2D # Tyan S2881
-#dbcool* at iic0 addr 0x2E # Tyan S2882-D
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# 1-Wire support
#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio
diff --git a/sys/arch/evbarm/conf/MPCSA_GENERIC b/sys/arch/evbarm/conf/MPCSA_GENERIC
index 791839d4a5b..41981f8cb0a 100644
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.56 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.57 2018/06/07 13:36:28 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.56 $"
+#ident "GENERIC-$Revision: 1.57 $"
maxusers 32 # estimated number of users
@@ -302,9 +302,9 @@ com* at pcmcom? slave ? # ...and the slave devices
# Hardware monitors
# AMD 768 and 8111 power/ACPI controllers
-#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-#dbcool* at iic0 addr 0x2D # Tyan S2881
-#dbcool* at iic0 addr 0x2E # Tyan S2882-D
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# 1-Wire support
#gpioow* at gpio? offset 6 mask 0x1 # 1-wire bitbanging via gpio
diff --git a/sys/arch/evbarm/conf/MV2120 b/sys/arch/evbarm/conf/MV2120
index c32247d60c9..b78288e3d8d 100644
--- a/sys/arch/evbarm/conf/MV2120
+++ b/sys/arch/evbarm/conf/MV2120
@@ -1,4 +1,4 @@
-# $NetBSD: MV2120,v 1.36 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: MV2120,v 1.37 2018/06/07 13:36:28 thorpej Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
@@ -196,7 +196,7 @@ gpio* at mvsocgpp?
mvsoctmr* at mvsoc? offset ? irq ?
# Real Time Clock
-pcf8563rtc* at iic0 addr 0x51
+pcf8563rtc* at iic? addr 0x51
# MII/PHY support
makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR b/sys/arch/evbarm/conf/TEAMASA_NPWR
index b7caea6dff1..cb197769bc1 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR
@@ -1,4 +1,4 @@
-# $NetBSD: TEAMASA_NPWR,v 1.93 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: TEAMASA_NPWR,v 1.94 2018/06/07 13:36:28 thorpej Exp $
#
# TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
# server appliance.
@@ -146,7 +146,7 @@ iopxs* at mainbus?
iopiic* at iopxs? # I2C Controller Unit
iic* at iopiic?
-m41trtc* at iic0 addr 0x68
+m41trtc* at iic? addr 0x68
pci* at iopxs? bus ?
diff --git a/sys/arch/evbarm/conf/VTC100 b/sys/arch/evbarm/conf/VTC100
index bc2886b6800..c933159a6d6 100644
--- a/sys/arch/evbarm/conf/VTC100
+++ b/sys/arch/evbarm/conf/VTC100
@@ -1,5 +1,5 @@
#
-# $NetBSD: VTC100,v 1.16 2018/05/15 01:24:23 thorpej Exp $
+# $NetBSD: VTC100,v 1.17 2018/06/07 13:36:28 thorpej Exp $
#
# VTC100 -- NEXCOM VTC100 Kernel
#
@@ -193,12 +193,12 @@ gpio3 at omapgpio3
# I2C Controller
tiiic0 at obio0 addr 0x44e0b000 size 0x1000 intr 70
iic* at tiiic?
-#? at iic0 addr 0x00
-#tps65910pmic0 at iic0 addr 0x12 # TPS65910 ID0 (SmartReflex)
-#tlv320aic3x at iic0 addr 0x18 # TLV320AIC3x
-#tps65910pmic1 at iic0 addr 0x2d # TPS65910 ID1 # RTC
-#micon at iic0 addr 0x5a
-#? at iic0 addr 0x76
+#? at iic? addr 0x00
+#tps65910pmic0 at iic? addr 0x12 # TPS65910 ID0 (SmartReflex)
+#tlv320aic3x at iic? addr 0x18 # TLV320AIC3x
+#tps65910pmic1 at iic? addr 0x2d # TPS65910 ID1 # RTC
+#micon at iic? addr 0x5a
+#? at iic? addr 0x76
# On-board 16550 UARTs
com0 at obio1 addr 0x48022000 size 0x1000 intr 73 mult 4 # UART1
diff --git a/sys/arch/evbmips/conf/GDIUM b/sys/arch/evbmips/conf/GDIUM
index 40ca7773c75..66b191b8a62 100644
--- a/sys/arch/evbmips/conf/GDIUM
+++ b/sys/arch/evbmips/conf/GDIUM
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM,v 1.30 2018/05/14 21:50:02 thorpej Exp $
+# $NetBSD: GDIUM,v 1.31 2018/06/07 13:36:29 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.gdium"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GDIUM-$Revision: 1.30 $"
+#ident "GDIUM-$Revision: 1.31 $"
maxusers 16
@@ -152,11 +152,11 @@ bonito0 at mainbus0
pci0 at bonito0
voyager0 at pci0 dev ? function ?
voyagerfb0 at voyager0
-iic0 at voyager0
-strtc* at iic0 addr 0x68
+iic* at voyager0
+strtc* at iic? addr 0x68
options STRTC_NO_USERRAM
-lmtemp* at iic0 addr 0x48
-#stvii* at iic0 addr 0x40
+lmtemp* at iic? addr 0x48
+#stvii* at iic? addr 0x40
#genfb0 at pci0 dev ? function ?
wsdisplay0 at wsemuldisplaydev?
ehci* at pci0 dev ? function ?
diff --git a/sys/arch/evbmips/conf/LOONGSON b/sys/arch/evbmips/conf/LOONGSON
index e3059c9e274..6cd6d344d7a 100644
--- a/sys/arch/evbmips/conf/LOONGSON
+++ b/sys/arch/evbmips/conf/LOONGSON
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.37 2018/05/14 21:50:02 thorpej Exp $
+# $NetBSD: LOONGSON,v 1.38 2018/06/07 13:36:29 thorpej Exp $
#
# LOONGSON machine description file
#
@@ -22,7 +22,7 @@ include "arch/evbmips/conf/std.loongson"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "LOONGSON-$Revision: 1.37 $"
+#ident "LOONGSON-$Revision: 1.38 $"
maxusers 16
@@ -168,11 +168,11 @@ sisfb0 at pci0 dev ? function ?
voyager0 at pci0 dev ? function ? # SM502 on GDIUM
voyagerfb0 at voyager0 # framebuffer portion
pwmclock0 at voyager0 # clock and CPU freq scaling
-iic0 at voyager0
-strtc* at iic0 addr 0x68 # GDIUM's real time clock
+iic* at voyager0
+strtc* at iic? addr 0x68 # GDIUM's real time clock
options STRTC_NO_USERRAM
-lmtemp* at iic0 addr 0x48 # GDIUM's temperature sensor
-stvii* at iic0 addr 0x40 # GDIUM's onboard microcontroller
+lmtemp* at iic? addr 0x48 # GDIUM's temperature sensor
+stvii* at iic? addr 0x40 # GDIUM's onboard microcontroller
lynxfb0 at pci0 dev ? function ? # SM712 on Yeeloong Notebook
#genfb0 at pci0 dev ? function ?
wsdisplay* at wsemuldisplaydev?
diff --git a/sys/arch/hpcarm/conf/NETBOOKPRO b/sys/arch/hpcarm/conf/NETBOOKPRO
index 4cc2c2301dd..9b3b340eea5 100644
--- a/sys/arch/hpcarm/conf/NETBOOKPRO
+++ b/sys/arch/hpcarm/conf/NETBOOKPRO
@@ -1,4 +1,4 @@
-# $NetBSD: NETBOOKPRO,v 1.23 2018/05/14 21:58:14 thorpej Exp $
+# $NetBSD: NETBOOKPRO,v 1.24 2018/06/07 13:36:29 thorpej Exp $
#
# NETBOOKPRO -- Psion Teklogix NETBOOK PRO
#
@@ -8,7 +8,7 @@ include "arch/hpcarm/conf/files.netbookpro"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.23 $"
+#ident "GENERIC-$Revision: 1.24 $"
# estimated number of users
maxusers 32
@@ -175,9 +175,9 @@ spkr* at audio? # PC speaker (synthesized)
nbpiic0 at pxaip? addr 0x40300000 intr 18
iic* at nbpiic?
-nbppcon* at iic0 addr 0x13 # PCon
-r2025rtc* at iic0 addr 0x32 # R2025S RTC
-seeprom* at iic0 addr 0x53 size 128
+nbppcon* at iic? addr 0x13 # PCon
+r2025rtc* at iic? addr 0x32 # R2025S RTC
+seeprom* at iic? addr 0x53 size 128
nbppm* at nbppcon? tag 0x05
hpcapm* at nbppm?
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index e85776541db..2b576a43f6b 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.439 2018/05/15 01:53:27 thorpej Exp $
+# $NetBSD: ALL,v 1.440 2018/06/07 13:36:29 thorpej Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.439 $"
+#ident "ALL-$Revision: 1.440 $"
maxusers 64 # estimated number of users
@@ -712,20 +712,20 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# dbCool Thermal monitor and fan controller
-dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-dbcool* at iic0 addr 0x2D # Tyan S2881
-dbcool* at iic0 addr 0x2E # Tyan S2882-D
+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 Hawk Integrated Systems Management Processor
-ibmhawk0 at iic0 addr 0x37
+ibmhawk0 at iic? addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
-lm0 at iic0 addr 0x2e flags 0x0
+lm0 at iic? addr 0x2e flags 0x0
# SMSC LPC47M192 hardware monitor
-smscmon* at iic0 addr 0x2c
-#smscmon* at iic0 addr 0x2d # (alternate address)
+smscmon* at iic? addr 0x2c
+#smscmon* at iic? addr 0x2d # (alternate address)
# IBM Thinkpad Active Protection System
aps0 at isa? port 0x1600
@@ -758,22 +758,22 @@ ug0 at isa? port 0xe0
viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules and optional temp sensors
-spdmem* at iic0 addr 0x50
-spdmem* at iic0 addr 0x51
-spdmem* at iic0 addr 0x52
-spdmem* at iic0 addr 0x53
-spdmem* at iic0 addr 0x54
-spdmem* at iic0 addr 0x55
-spdmem* at iic0 addr 0x56
-spdmem* at iic0 addr 0x57
-sdtemp* at iic0 addr 0x18
-sdtemp* at iic0 addr 0x19
-sdtemp* at iic0 addr 0x1a
-sdtemp* at iic0 addr 0x1b
-sdtemp* at iic0 addr 0x1c
-sdtemp* at iic0 addr 0x1d
-sdtemp* at iic0 addr 0x1e
-sdtemp* at iic0 addr 0x1f
+spdmem* at iic? addr 0x50
+spdmem* at iic? addr 0x51
+spdmem* at iic? addr 0x52
+spdmem* at iic? addr 0x53
+spdmem* at iic? addr 0x54
+spdmem* at iic? addr 0x55
+spdmem* at iic? addr 0x56
+spdmem* at iic? addr 0x57
+sdtemp* at iic? addr 0x18
+sdtemp* at iic? addr 0x19
+sdtemp* at iic? addr 0x1a
+sdtemp* at iic? addr 0x1b
+sdtemp* at iic? addr 0x1c
+sdtemp* at iic? addr 0x1d
+sdtemp* at iic? addr 0x1e
+sdtemp* at iic? addr 0x1f
# I2C HID devices
ihidev* at iic?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 6af8d95e9e6..a1ad348df8b 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1179 2018/05/22 08:15:26 maxv Exp $
+# $NetBSD: GENERIC,v 1.1180 2018/06/07 13:36:29 thorpej Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1179 $"
+#ident "GENERIC-$Revision: 1.1180 $"
maxusers 64 # estimated number of users
@@ -661,9 +661,9 @@ dwiic* at pci? # I2C controller
iic* at dwiic?
# dbCool Thermal monitor and fan controller
-#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-#dbcool* at iic0 addr 0x2D # Tyan S2881
-#dbcool* at iic0 addr 0x2E # Tyan S2882-D
+#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
@@ -679,7 +679,7 @@ iic* at dwiic?
#wbsio* at isa? port 0x4e
# IBM Hawk Integrated Systems Management Processor
-#ibmhawk0 at iic0 addr 0x37
+#ibmhawk0 at iic? addr 0x37
# LM7[89] and compatible hardware monitors
# Use flags to select temp sensor type (see lm(4) man page for details)
@@ -690,8 +690,8 @@ iic* at dwiic?
#smsc0 at isa? port 0x02e
# SMSC LPC47M192 hardware monitor
-#smscmon* at iic0 addr 0x2c
-#smscmon* at iic0 addr 0x2d # (alternate address)
+#smscmon* at iic? addr 0x2c
+#smscmon* at iic? addr 0x2d # (alternate address)
# PC87366 hardware monitor
nsclpcsio* at isa?
@@ -703,22 +703,22 @@ nsclpcsio* at isa?
#viaenv* at pci? dev ? function ?
# Serial Presence Detect capable memory modules
-#spdmem* at iic0 addr 0x50
-#spdmem* at iic0 addr 0x51
-#spdmem* at iic0 addr 0x52
-#spdmem* at iic0 addr 0x53
-#spdmem* at iic0 addr 0x54
-#spdmem* at iic0 addr 0x55
-#spdmem* at iic0 addr 0x56
-#spdmem* at iic0 addr 0x57
-#sdtemp* at iic0 addr 0x18
-#sdtemp* at iic0 addr 0x19
-#sdtemp* at iic0 addr 0x1a
-#sdtemp* at iic0 addr 0x1b
-#sdtemp* at iic0 addr 0x1c
-#sdtemp* at iic0 addr 0x1d
-#sdtemp* at iic0 addr 0x1e
-#sdtemp* at iic0 addr 0x1f
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
# I2C HID devices
ihidev* at iic?
diff --git a/sys/arch/i386/conf/XEN3_DOM0 b/sys/arch/i386/conf/XEN3_DOM0
index 0031a44e97d..f744086fac6 100644
--- a/sys/arch/i386/conf/XEN3_DOM0
+++ b/sys/arch/i386/conf/XEN3_DOM0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.128 2018/05/15 01:53:27 thorpej Exp $
+# $NetBSD: XEN3_DOM0,v 1.129 2018/06/07 13:36:29 thorpej Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -275,27 +275,27 @@ iic* at dwiic?
# dbCool thermal monitor and fan controller
#iic* at amdpm? # sensors below are on this bus
-#dbcool* at iic0 addr 0x2C # Unknown other motherboard(s)
-#dbcool* at iic0 addr 0x2D # Tyan S2881
-#dbcool* at iic0 addr 0x2E # Tyan S2882-D
+#dbcool* at iic? addr 0x2C # Unknown other motherboard(s)
+#dbcool* at iic? addr 0x2D # Tyan S2881
+#dbcool* at iic? addr 0x2E # Tyan S2882-D
# Serial Presence Detect capable memory modules
-#spdmem* at iic0 addr 0x50
-#spdmem* at iic0 addr 0x51
-#spdmem* at iic0 addr 0x52
-#spdmem* at iic0 addr 0x53
-#spdmem* at iic0 addr 0x54
-#spdmem* at iic0 addr 0x55
-#spdmem* at iic0 addr 0x56
-#spdmem* at iic0 addr 0x57
-#sdtemp* at iic0 addr 0x18
-#sdtemp* at iic0 addr 0x19
-#sdtemp* at iic0 addr 0x1a
-#sdtemp* at iic0 addr 0x1b
-#sdtemp* at iic0 addr 0x1c
-#sdtemp* at iic0 addr 0x1d
-#sdtemp* at iic0 addr 0x1e
-#sdtemp* at iic0 addr 0x1f
+#spdmem* at iic? addr 0x50
+#spdmem* at iic? addr 0x51
+#spdmem* at iic? addr 0x52
+#spdmem* at iic? addr 0x53
+#spdmem* at iic? addr 0x54
+#spdmem* at iic? addr 0x55
+#spdmem* at iic? addr 0x56
+#spdmem* at iic? addr 0x57
+#sdtemp* at iic? addr 0x18
+#sdtemp* at iic? addr 0x19
+#sdtemp* at iic? addr 0x1a
+#sdtemp* at iic? addr 0x1b
+#sdtemp* at iic? addr 0x1c
+#sdtemp* at iic? addr 0x1d
+#sdtemp* at iic? addr 0x1e
+#sdtemp* at iic? addr 0x1f
# Winbond LPC Super I/O
#wbsio* at isa? port 0x2e
diff --git a/sys/arch/mmeye/conf/MMEYE_WLF b/sys/arch/mmeye/conf/MMEYE_WLF
index 22201e6c723..370d9d9112f 100644
--- a/sys/arch/mmeye/conf/MMEYE_WLF
+++ b/sys/arch/mmeye/conf/MMEYE_WLF
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.24 2018/05/14 22:01:57 thorpej Exp $
+# $NetBSD: MMEYE_WLF,v 1.25 2018/06/07 13:36:29 thorpej Exp $
#
# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.24 $"
+#ident "GENERIC-$Revision: 1.25 $"
maxusers 16 # estimated number of users
@@ -159,7 +159,7 @@ sci0 at shb?
rtciic0 at mainbus? addr1 0xb100000e
iic* at rtciic?
-rs5c372rtc* at iic0 addr 0x32
+rs5c372rtc* at iic? addr 0x32
#ac97x at mainbus? addr1 0xb3000000-0xb300000f irq1 1 # AD1881A
audio* at audiobus?
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index c5dcb93f4ec..dc84113ddaa 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.76 2018/05/15 00:44:56 thorpej Exp $
+# $NetBSD: GENERIC,v 1.77 2018/06/07 13:36:29 thorpej Exp $
#
# GENERIC machine description file
#
@@ -192,7 +192,7 @@ scoop0 at pxaip?
scoop1 at pxaip?
# alternate GPIO contoller for SL-C1000
-ioexp0 at iic0 addr 0x18
+ioexp0 at iic? addr 0x18
# ADC, touchpad, backlight
zssp0 at pxaip?
@@ -218,7 +218,7 @@ wsdisplay* at w100lcd? console ?
lcdctl0 at zssp0
# WM8750 Audio
-zaudio0 at iic0 addr 0x1b
+zaudio0 at iic? addr 0x1b
audio* at zaudio?
#options ZAUDIO_VOLUME_STRIDE=8
diff --git a/sys/arch/zaurus/conf/INSTALL b/sys/arch/zaurus/conf/INSTALL
index a18ead47c9b..03672c596be 100644
--- a/sys/arch/zaurus/conf/INSTALL
+++ b/sys/arch/zaurus/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.36 2018/05/15 00:44:56 thorpej Exp $
+# $NetBSD: INSTALL,v 1.37 2018/06/07 13:36:29 thorpej Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -68,7 +68,7 @@ no zrc0 at pxaip?
no ztp0 at zssp?
no wsmouse* at ztp?
-no zaudio0 at iic0
+no zaudio0 at iic?
no audio* at zaudio?
no spkr* at audio?
diff --git a/sys/arch/zaurus/conf/INSTALL_C700 b/sys/arch/zaurus/conf/INSTALL_C700
index 0cd2ee3e315..8a9c6da4ab9 100644
--- a/sys/arch/zaurus/conf/INSTALL_C700
+++ b/sys/arch/zaurus/conf/INSTALL_C700
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.3 2018/05/15 00:44:56 thorpej Exp $
+# $NetBSD: INSTALL_C700,v 1.4 2018/06/07 13:36:29 thorpej Exp $
#
# INSTALL config file (C700 with memory disk root)
#
@@ -15,7 +15,7 @@ no makeoptions LOADADDRESS
makeoptions LOADADDRESS="0xc0400000"
no scoop1 at pxaip?
-no ioexp0 at iic0
+no ioexp0 at iic?
no lcd0 at pxaip?
no wsdisplay* at lcd?