Source-Changes-HG archive

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

[src/trunk]: src/sys/arch Fully specifiy the location of indirectly-configure...



details:   https://anonhg.NetBSD.org/src/rev/6112be6faf05
branches:  trunk
changeset: 832496:6112be6faf05
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon May 14 21:05:17 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.

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         |  32 ++++++++++++++++----------------
 6 files changed, 30 insertions(+), 30 deletions(-)

diffs (183 lines):

diff -r 9b7affeec7ac -r 6112be6faf05 sys/arch/acorn32/conf/EB7500ATX
--- a/sys/arch/acorn32/conf/EB7500ATX   Mon May 14 17:34:26 2018 +0000
+++ b/sys/arch/acorn32/conf/EB7500ATX   Mon May 14 21:05:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: EB7500ATX,v 1.64 2018/01/23 14:47:53 sevan Exp $
+#      $NetBSD: EB7500ATX,v 1.65 2018/05/14 21:05:17 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.64 $"
+#ident         "EB7500ATX-$Revision: 1.65 $"
 
 # estimated number of users
 maxusers       32
@@ -159,10 +159,10 @@
 
 # IIC bus device
 #iomdiic* at iomd?
-#iic* at iomdiic?
+#iic0 at iomdiic?
 
 # RTC device via IIC bus
-#pcfrtc*       at iic? addr 0x50
+#pcfrtc*       at iic0 addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r 9b7affeec7ac -r 6112be6faf05 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Mon May 14 17:34:26 2018 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Mon May 14 21:05:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.124 2018/01/23 14:47:53 sevan Exp $
+#      $NetBSD: GENERIC,v 1.125 2018/05/14 21:05:17 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.124 $"
+#ident         "GENERIC-$Revision: 1.125 $"
 
 # estimated number of users
 maxusers       32
@@ -166,7 +166,7 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic? addr 0x50
+pcfrtc*        at iic0 addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r 9b7affeec7ac -r 6112be6faf05 sys/arch/acorn32/conf/INSTALL
--- a/sys/arch/acorn32/conf/INSTALL     Mon May 14 17:34:26 2018 +0000
+++ b/sys/arch/acorn32/conf/INSTALL     Mon May 14 21:05:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: INSTALL,v 1.78 2017/09/14 07:58:38 mrg Exp $
+#      $NetBSD: INSTALL,v 1.79 2018/05/14 21:05:17 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.78 $"
+#ident         "INSTALL-$Revision: 1.79 $"
 
 # estimated number of users
 maxusers       32
@@ -148,7 +148,7 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic? addr 0x50
+pcfrtc*        at iic0 addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r 9b7affeec7ac -r 6112be6faf05 sys/arch/acorn32/conf/LOWMEM_WSCONS
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS       Mon May 14 17:34:26 2018 +0000
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS       Mon May 14 21:05:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: LOWMEM_WSCONS,v 1.72 2017/09/14 07:58:38 mrg Exp $
+#      $NetBSD: LOWMEM_WSCONS,v 1.73 2018/05/14 21:05:17 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 iic? addr 0x50
+pcfrtc*        at iic0 addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r 9b7affeec7ac -r 6112be6faf05 sys/arch/acorn32/conf/NC
--- a/sys/arch/acorn32/conf/NC  Mon May 14 17:34:26 2018 +0000
+++ b/sys/arch/acorn32/conf/NC  Mon May 14 21:05:17 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NC,v 1.71 2017/09/14 07:58:38 mrg Exp $
+#      $NetBSD: NC,v 1.72 2018/05/14 21:05:17 thorpej Exp $
 #
 #      NC - with wscons
 #
@@ -122,7 +122,7 @@
 iic0 at iomdiic?
 
 # RTC device via IIC bus
-pcfrtc*        at iic? addr 0x50
+pcfrtc*        at iic0 addr 0x50
 
 # VIDC device
 vidc0          at mainbus?
diff -r 9b7affeec7ac -r 6112be6faf05 sys/arch/alpha/conf/GENERIC
--- a/sys/arch/alpha/conf/GENERIC       Mon May 14 17:34:26 2018 +0000
+++ b/sys/arch/alpha/conf/GENERIC       Mon May 14 21:05:17 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.379 2018/01/23 14:47:53 sevan Exp $
+# $NetBSD: GENERIC,v 1.380 2018/05/14 21:11:39 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.379 $"
+ident          "GENERIC-$Revision: 1.380 $"
 
 maxusers 32
 
@@ -210,7 +210,7 @@
 
 tsc*   at      mainbus0
 tsciic*        at      tsc?
-iic*   at      tsciic?
+iic0   at      tsciic?
 
 # DECpc AXP150 (Jensen) internal bus support
 jensenio* at   mainbus0
@@ -536,21 +536,21 @@
 
 # Acer Labs M7101 SMBus controller
 alipm*         at pci? dev ? function ?
-iic*   at alipm?
+iic0   at alipm?
 
 # AlphaServer DS20L i2c devices
-#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
+#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
 #seeprom*      at iic0 addr 0x51 flags 0x2
 
 # PCMCIA USB controllers



Home | Main Index | Thread Index | Old Index