[src/trunk]: src/sys/arch Fully specifiy the location of indirec...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch Fully specifiy the location of indirec...
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Tue, 15 May 2018 04:01:30 +0000
details:   https://anonhg.NetBSD.org/src/rev/8688af2e71fa
branches:  trunk
changeset: 319066:8688af2e71fa
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue May 15 01:53:27 2018 +0000
description:
Fully specifiy the location of indirectly-configured I2C devices. In
particular, the parent spec must not be wild-carded, as doing so doesn't
work well on systems where more than one I2C bus is present.

N.B. The x86 platforms are sort of a mess, here... legacy indirect
config and ACPI direct config sort of smashed together with the
same config file directives.

diffstat:

 sys/arch/amd64/conf/ALL       |  56 +++++++++++++++++++++---------------------
 sys/arch/amd64/conf/GENERIC   |  48 ++++++++++++++++++------------------
 sys/arch/amd64/conf/XEN3_DOM0 |  42 ++++++++++++++++----------------
 sys/arch/i386/conf/ALL        |  50 +++++++++++++++++++-------------------
 sys/arch/i386/conf/GENERIC    |  48 ++++++++++++++++++------------------
 sys/arch/i386/conf/XEN3_DOM0  |  40 +++++++++++++++---------------
 6 files changed, 142 insertions(+), 142 deletions(-)

diffs (truncated from 491 to 300 lines):

diff -r 39fa8c7cb29e -r 8688af2e71fa sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Tue May 15 01:41:29 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Tue May 15 01:53:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.86 2018/05/01 16:16:05 maya Exp $
+# $NetBSD: ALL,v 1.87 2018/05/15 01:53:27 thorpej Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.86 $"
+#ident         "ALL-$Revision: 1.87 $"
 
 maxusers       64              # estimated number of users
 
@@ -594,7 +594,7 @@
 wbsio* at isa? port 0x4e
 
 # IBM Hawk Integrated Systems Management Processor
-ibmhawk0       at iic? addr 0x37
+ibmhawk0       at iic0 addr 0x37
 
 # Intel Integrated Memory Controller SMBus (experimental)
 imc* at pci? dev ? function ?          # Intel Integrated Memory Controller,
@@ -610,8 +610,8 @@
 smsc0  at isa? port 0x02e
 
 # SMSC LPC47M192 hardware monitor
-smscmon*       at iic? addr 0x2c
-smscmon*       at iic? addr 0x2d       # (alternate address)
+smscmon*       at iic0 addr 0x2c
+smscmon*       at iic0 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 @@
 iic*           at dwiic?
 
 # dbCool 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
+dbcool* at iic0 addr 0x2C              # Unknown other motherboard(s)
+dbcool* at iic0 addr 0x2D              # Tyan S2881
+dbcool* at iic0 addr 0x2E              # Tyan S2882-D
 
 # IBM Hawk Integrated Systems Management Processor
-ibmhawk0       at iic? addr 0x37
+ibmhawk0       at iic0 addr 0x37
 
 # LM7[89] and compatible hardware monitors
 # Use flags to select temp sensor type (see lm(4) man page for details)
-lm0    at iic? addr 0x2e flags 0x0
+lm0    at iic0 addr 0x2e flags 0x0
 
 # SMSC LPC47M192 hardware monitor
-smscmon*       at iic? addr 0x2c
-#smscmon*      at iic? addr 0x2d       # (alternate address)
+smscmon*       at iic0 addr 0x2c
+#smscmon*      at iic0 addr 0x2d       # (alternate address)
 
 # IBM Thinkpad Active Protection System
 aps0   at isa? port 0x1600
@@ -685,22 +685,22 @@
 viaenv*        at pci? dev ? function ?
 
 # Serial Presence Detect capable memory modules and optional temp sensors
-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
+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
 
 # I2C HID devices
 ihidev* at iic?
diff -r 39fa8c7cb29e -r 8688af2e71fa sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Tue May 15 01:41:29 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Tue May 15 01:53:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.490 2018/05/11 07:44:47 maya Exp $
+# $NetBSD: GENERIC,v 1.491 2018/05/15 01:53:27 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.490 $"
+#ident         "GENERIC-$Revision: 1.491 $"
 
 maxusers       64              # estimated number of users
 
@@ -485,7 +485,7 @@
 #wbsio*        at isa? port 0x4e
 
 # IBM Hawk Integrated Systems Management Processor
-#ibmhawk0      at iic? addr 0x37
+#ibmhawk0      at iic0 addr 0x37
 
 # LM7[89] and compatible hardware monitors
 # Use flags to select temp sensor type (see lm(4) man page for details)
@@ -496,8 +496,8 @@
 #smsc0 at isa? port 0x02e
 
 # SMSC LPC47M192 hardware monitor
-#smscmon*      at iic? addr 0x2c
-#smscmon*      at iic? addr 0x2d       # (alternate address)
+#smscmon*      at iic0 addr 0x2c
+#smscmon*      at iic0 addr 0x2d       # (alternate address)
 
 # AMD 768 and 8111 power/ACPI controllers
 amdpm* at pci? dev ? function ?        # RNG and SMBus 1.0 interface
@@ -525,9 +525,9 @@
 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
+#dbcool* at iic0 addr 0x2C             # Unknown other motherboard(s)
+#dbcool* at iic0 addr 0x2D             # Tyan S2881
+#dbcool* at iic0 addr 0x2E             # Tyan S2882-D
 
 # IBM Thinkpad Active Protection System
 #aps0  at isa? port 0x1600
@@ -542,22 +542,22 @@
 #ug0   at isa? port 0xe0
 
 # Serial Presence Detect capable memory modules
-#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
+#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
 
 # I2C HID devices
 ihidev* at iic?
diff -r 39fa8c7cb29e -r 8688af2e71fa sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Tue May 15 01:41:29 2018 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Tue May 15 01:53:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.149 2018/02/17 01:31:01 sevan Exp $
+# $NetBSD: XEN3_DOM0,v 1.150 2018/05/15 01:53:27 thorpej Exp $
 
 include        "arch/amd64/conf/std.xen"
 
@@ -10,7 +10,7 @@
 #options       UVMHIST_PRINT
 #options       SYSCALL_DEBUG
 
-#ident         "XEN3_DOM0-$Revision: 1.149 $"
+#ident         "XEN3_DOM0-$Revision: 1.150 $"
 
 maxusers       32              # estimated number of users
 
@@ -314,27 +314,27 @@
 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
+#dbcool* at iic0 addr 0x2C             # Unknown other motherboard(s)
+#dbcool* at iic0 addr 0x2D             # Tyan S2881
+#dbcool* at iic0 addr 0x2E             # Tyan S2882-D
 
 # Serial Presence Detect capable memory modules
-#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
+#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
 
 # Winbond LPC Super I/O
 #wbsio*        at isa? port 0x2e
diff -r 39fa8c7cb29e -r 8688af2e71fa sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL    Tue May 15 01:41:29 2018 +0000
+++ b/sys/arch/i386/conf/ALL    Tue May 15 01:53:27 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.438 2018/05/01 16:16:05 maya Exp $
+# $NetBSD: ALL,v 1.439 2018/05/15 01:53:27 thorpej Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "ALL-$Revision: 1.438 $"
+#ident         "ALL-$Revision: 1.439 $"
 
 maxusers       64              # estimated number of users
 
@@ -712,20 +712,20 @@
 iic*           at dwiic?
 
 # dbCool 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
+dbcool* at iic0 addr 0x2C              # Unknown other motherboard(s)
+dbcool* at iic0 addr 0x2D              # Tyan S2881
+dbcool* at iic0 addr 0x2E              # Tyan S2882-D
 
 # IBM Hawk Integrated Systems Management Processor
-ibmhawk0       at iic? addr 0x37
+ibmhawk0       at iic0 addr 0x37
 
 # LM7[89] and compatible hardware monitors
 # Use flags to select temp sensor type (see lm(4) man page for details)
-lm0    at iic? addr 0x2e flags 0x0
+lm0    at iic0 addr 0x2e flags 0x0
 
 # SMSC LPC47M192 hardware monitor
-smscmon*       at iic? addr 0x2c
Prev by Date: [src/trunk]: src/sys/dev/i2c Fix a problem reported by jmcneill@...
Next by Date: [src/trunk]: src/usr.sbin/bta2dpd/bta2dpd Use the correct tag op...
Previous by Thread: [src/trunk]: src/sys/dev/i2c Fix a problem reported by jmcneill@...
Next by Thread: [src/trunk]: src/usr.sbin/bta2dpd/bta2dpd Use the correct tag op...
Indexes:
Home | Main Index | Thread Index | Old Index