Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Revert changes that pinned-down i2c parent specs. ...



details:   https://anonhg.NetBSD.org/src/rev/fa58248034d1
branches:  trunk
changeset: 323296:fa58248034d1
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jun 07 13:36:28 2018 +0000

description:
Revert changes that pinned-down i2c parent specs.  The i2c subsystem
has been enhanced to make this unnecessary.

diffstat:

 sys/arch/acorn32/conf/EB7500ATX     |   8 ++--
 sys/arch/acorn32/conf/GENERIC       |   6 +-
 sys/arch/acorn32/conf/INSTALL       |   6 +-
 sys/arch/acorn32/conf/LOWMEM_WSCONS |   4 +-
 sys/arch/acorn32/conf/NC            |   4 +-
 sys/arch/alpha/conf/GENERIC         |  28 +++++++++---------
 sys/arch/amd64/conf/ALL             |  56 ++++++++++++++++++------------------
 sys/arch/amd64/conf/GENERIC         |  48 +++++++++++++++---------------
 sys/arch/amd64/conf/XEN3_DOM0       |  42 +++++++++++++-------------
 sys/arch/evbarm/conf/ARMADAXP       |   4 +-
 sys/arch/evbarm/conf/ARMADILLO210   |   4 +-
 sys/arch/evbarm/conf/ARMADILLO9     |   6 +-
 sys/arch/evbarm/conf/CUBOX          |   8 ++--
 sys/arch/evbarm/conf/DNS323         |   8 ++--
 sys/arch/evbarm/conf/GUMSTIX        |   4 +-
 sys/arch/evbarm/conf/KUROBOX_PRO    |   4 +-
 sys/arch/evbarm/conf/KURONAS_X4     |   4 +-
 sys/arch/evbarm/conf/MMNET_GENERIC  |  10 +++---
 sys/arch/evbarm/conf/MPCSA_GENERIC  |  10 +++---
 sys/arch/evbarm/conf/MV2120         |   4 +-
 sys/arch/evbarm/conf/TEAMASA_NPWR   |   4 +-
 sys/arch/evbarm/conf/VTC100         |  14 ++++----
 sys/arch/evbmips/conf/GDIUM         |  12 +++---
 sys/arch/evbmips/conf/LOONGSON      |  12 +++---
 sys/arch/hpcarm/conf/NETBOOKPRO     |  10 +++---
 sys/arch/i386/conf/ALL              |  50 ++++++++++++++++----------------
 sys/arch/i386/conf/GENERIC          |  48 +++++++++++++++---------------
 sys/arch/i386/conf/XEN3_DOM0        |  40 +++++++++++++-------------
 sys/arch/mmeye/conf/MMEYE_WLF       |   6 +-
 sys/arch/zaurus/conf/GENERIC        |   6 +-
 sys/arch/zaurus/conf/INSTALL        |   4 +-
 sys/arch/zaurus/conf/INSTALL_C700   |   4 +-
 32 files changed, 239 insertions(+), 239 deletions(-)

diffs (truncated from 1131 to 300 lines):

diff -r a543321b9849 -r fa58248034d1 sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX   Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX   Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 
 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 @@
 
 # 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 -r a543321b9849 -r fa58248034d1 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 
 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 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic0 addr 0x50
+pcfrtc*        at iic? addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r a543321b9849 -r fa58248034d1 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL     Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/acorn32/conf/INSTALL     Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 
 #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 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic0 addr 0x50
+pcfrtc*        at iic? addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r a543321b9849 -r fa58248034d1 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS       Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS       Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic0 addr 0x50
+pcfrtc*        at iic? addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r a543321b9849 -r fa58248034d1 sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC  Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/acorn32/conf/NC  Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic0 addr 0x50
+pcfrtc*        at iic? addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r a543321b9849 -r fa58248034d1 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 
 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 @@
 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 -r a543321b9849 -r fa58248034d1 sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL   Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/amd64/conf/ALL   Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 
 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 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 @@
 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 @@
 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 @@
 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 -r a543321b9849 -r fa58248034d1 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Thu Jun 07 13:35:31 2018 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Thu Jun 07 13:36:28 2018 +0000
@@ -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 @@
 
 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 @@
 #wbsio*        at isa? port 0x4e
 
 # IBM Hawk Integrated Systems Management Processor
-#ibmhawk0      at iic0 addr 0x37
+#ibmhawk0      at iic? addr 0x37
 



Home | Main Index | Thread Index | Old Index