[src/trunk]: src/sys/arch/evbarm/conf Fully specifiy the location of indirect...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/evbarm/conf Fully specifiy the location of indirect...
From: thorpej <thorpej%NetBSD.org@localhost>
Date: Tue, 07 Apr 2020 10:06:52 +0000
details:   https://anonhg.NetBSD.org/src/rev/e832843248f2
branches:  trunk
changeset: 832507:e832843248f2
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue May 15 01:24:23 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/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 +++++++-------
 13 files changed, 42 insertions(+), 42 deletions(-)

diffs (281 lines):

diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/ARMADAXP
--- a/sys/arch/evbarm/conf/ARMADAXP     Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/ARMADAXP     Tue May 15 01:24:23 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: ARMADAXP,v 1.21 2017/09/14 07:58:40 mrg Exp $
+#      $NetBSD: ARMADAXP,v 1.22 2018/05/15 01:24:23 thorpej Exp $
 #
 #      ARMADA XP DEV BOARD
 #
@@ -185,7 +185,7 @@
 m25p0          at spi? slave 0
 
 # TWSI SDRAM Serial Presence Detect
-spdmem0                at iic? addr 0x56
+spdmem0                at iic0 addr 0x56
 
 # On-chip Cryptographic Engines and Security Accelerator (S/W chaining)
 mvcesa*        at mvsoc? offset ? irq ?
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/ARMADILLO210
--- a/sys/arch/evbarm/conf/ARMADILLO210 Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO210 Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ARMADILLO210,v 1.38 2017/09/14 07:58:40 mrg Exp $
+#      $NetBSD: ARMADILLO210,v 1.39 2018/05/15 01:24:23 thorpej Exp $
 #
 #      ARMADILLO210 -- Atmark Techno, Armadillo-210
 #
@@ -156,7 +156,7 @@
 # I^2C Controller Unit
 armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
 iic*           at armadillo9iic?
-seeprom0       at iic? addr 0x50 size 128
+seeprom0       at iic0 addr 0x50 size 128
 
 # MII/PHY support
 lxtphy* at mii? phy ?                  # Level One LXT-970 PHYs
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/ARMADILLO9
--- a/sys/arch/evbarm/conf/ARMADILLO9   Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/ARMADILLO9   Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: ARMADILLO9,v 1.55 2017/09/14 07:58:40 mrg Exp $
+#      $NetBSD: ARMADILLO9,v 1.56 2018/05/15 01:24:23 thorpej Exp $
 #
 #      ARMADILLO9 -- Atmark Techno, Armadillo-9
 #
@@ -167,8 +167,8 @@
 # I^2C Controller Unit
 armadillo9iic0 at epgpio0 port 1 bit1 4 bit2 5
 iic*           at armadillo9iic?
-seeprom0       at iic? addr 0x50 size 128
-#s3531rtc0     at iic? addr 0x30
+seeprom0       at iic0 addr 0x50 size 128
+#s3531rtc0     at iic0 addr 0x30
 
 # PCMCIA bus support
 pcmcia*        at eppcic0 controller ? socket ?
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/CUBOX
--- a/sys/arch/evbarm/conf/CUBOX        Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/CUBOX        Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.5 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: CUBOX,v 1.6 2018/05/15 01:24:23 thorpej Exp $
 #
 #      CUBOX -- SolidRun Ltd. Cubox kernel
 #
@@ -250,9 +250,9 @@
 gttwsi* at mvsoc? offset ? irq ?
 iic*   at gttwsi?
 
-#TDA998x at iic? addr 0x34 # HDMI transmitters
-#Si5351A at iic? addr 0x60 # Programmable Any-Frequency CMOS Clock Generator
-#lcdc at iic? addr 0x70
+#TDA998x at iic0 addr 0x34 # HDMI transmitters
+#Si5351A at iic0 addr 0x60 # Programmable Any-Frequency CMOS Clock Generator
+#lcdc at iic0 addr 0x70
 
 # On-chip UART Interface
 com*   at mvsoc? offset ? irq ?
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/DNS323
--- a/sys/arch/evbarm/conf/DNS323       Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/DNS323       Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DNS323,v 1.9 2017/11/25 04:53:24 christos Exp $
+#      $NetBSD: DNS323,v 1.10 2018/05/15 01:24:23 thorpej Exp $
 #
 #  DNS323 -- D-Link. DNS-323 platform kernel
 #
@@ -30,8 +30,8 @@
 #options       AUDIO_DEBUG=2
 
 
-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
+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
 options        STRTC_NO_USERRAM
 options        STRTC_NO_WATCHDOG
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/GUMSTIX
--- a/sys/arch/evbarm/conf/GUMSTIX      Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/GUMSTIX      Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GUMSTIX,v 1.94 2017/09/14 07:58:40 mrg Exp $
+#      $NetBSD: GUMSTIX,v 1.95 2018/05/15 01:24:23 thorpej Exp $
 #
 #      GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -229,7 +229,7 @@
 # Inter-Integrated Circuit controller
 gxiic0 at pxaip? addr 0x40300000
 iic*   at gxiic?
-#dsrtc*        at iic? addr 0x68               # Can mount DS1307 at console, breakout
+#dsrtc*        at iic0 addr 0x68               # Can mount DS1307 at console, breakout
 
 # integrated PCMCIA/CF controller
 pxapcic0 at pxaip? addr 0x20000000             # cfstix, netCF
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/KUROBOX_PRO
--- a/sys/arch/evbarm/conf/KUROBOX_PRO  Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/KUROBOX_PRO  Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: KUROBOX_PRO,v 1.8 2015/07/18 15:05:52 htodd Exp $
+#      $NetBSD: KUROBOX_PRO,v 1.9 2018/05/15 01:24:23 thorpej Exp $
 #
 #  KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
 #
@@ -36,7 +36,7 @@
 no gtpci* at mvsoc?
 no pci*        at gtpci?
 
-rs5c372rtc* at iic? addr 0x32          # RICOH RS5C372 RTC
+rs5c372rtc* at iic0 addr 0x32          # RICOH RS5C372 RTC
 
 # PCI network interfaces
 #mskc* at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/KURONAS_X4
--- a/sys/arch/evbarm/conf/KURONAS_X4   Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/KURONAS_X4   Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: KURONAS_X4,v 1.1 2016/07/12 13:28:46 kiyohara Exp $
+#      $NetBSD: KURONAS_X4,v 1.2 2018/05/15 01:24:23 thorpej Exp $
 #
 #  KUROBOX_PRO -- KUROUTOSHIKOU. KURO-BOX/PRO platform kernel
 #
@@ -32,7 +32,7 @@
 #options       AUDIO_DEBUG=2
 
 
-rs5c372rtc* at iic? addr 0x32          # RICOH RS5C372 RTC
+rs5c372rtc* at iic0 addr 0x32          # RICOH RS5C372 RTC
 
 # PCI network interfaces
 #mskc* at pci? dev ? function ?        # Marvell Yukon 2 Gigabit Ethernet
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/MMNET_GENERIC
--- a/sys/arch/evbarm/conf/MMNET_GENERIC        Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/MMNET_GENERIC        Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.34 2018/01/23 15:08:11 sevan Exp $
+# $NetBSD: MMNET_GENERIC,v 1.35 2018/05/15 01:24:23 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.34 $"
+#ident                 "GENERIC-$Revision: 1.35 $"
 
 maxusers       32              # estimated number of users
 
@@ -288,9 +288,9 @@
 # Hardware monitors
 
 # AMD 768 and 8111 power/ACPI controllers
-#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
 
 # 1-Wire support
 #gpioow*       at gpio? offset 6 mask 0x1      # 1-wire bitbanging via gpio
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/MPCSA_GENERIC
--- a/sys/arch/evbarm/conf/MPCSA_GENERIC        Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/MPCSA_GENERIC        Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.55 2018/01/23 15:08:11 sevan Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.56 2018/05/15 01:24:23 thorpej Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.55 $"
+#ident                 "GENERIC-$Revision: 1.56 $"
 
 maxusers       32              # estimated number of users
 
@@ -302,9 +302,9 @@
 # Hardware monitors
 
 # AMD 768 and 8111 power/ACPI controllers
-#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
 
 # 1-Wire support
 #gpioow*       at gpio? offset 6 mask 0x1      # 1-wire bitbanging via gpio
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/MV2120
--- a/sys/arch/evbarm/conf/MV2120       Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/MV2120       Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MV2120,v 1.35 2018/01/23 15:08:11 sevan Exp $
+#      $NetBSD: MV2120,v 1.36 2018/05/15 01:24:23 thorpej Exp $
 #
 #  This configuration supports for HP MV2120/MV5140/MV5150.
 
@@ -196,7 +196,7 @@
 mvsoctmr* at mvsoc? offset ? irq ?
 
 # Real Time Clock
-pcf8563rtc* at iic? addr 0x51
+pcf8563rtc* at iic0 addr 0x51
 
 # MII/PHY support
 makphy*        at mii? phy ?                   # Marvell Semiconductor 88E1000 PHYs
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/TEAMASA_NPWR
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR Tue May 15 01:24:23 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: TEAMASA_NPWR,v 1.92 2017/09/14 07:58:40 mrg Exp $
+#      $NetBSD: TEAMASA_NPWR,v 1.93 2018/05/15 01:24:23 thorpej Exp $
 #
 #      TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
 #      server appliance.
@@ -146,7 +146,7 @@
 
 iopiic*                at iopxs?                       # I2C Controller Unit
 iic*           at iopiic?
-m41trtc*       at iic? addr 0x68
+m41trtc*       at iic0 addr 0x68
 
 pci*           at iopxs? bus ?
 
diff -r b51f6eb81ce6 -r e832843248f2 sys/arch/evbarm/conf/VTC100
--- a/sys/arch/evbarm/conf/VTC100       Tue May 15 01:07:37 2018 +0000
+++ b/sys/arch/evbarm/conf/VTC100       Tue May 15 01:24:23 2018 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: VTC100,v 1.15 2017/11/25 04:53:24 christos Exp $
+#      $NetBSD: VTC100,v 1.16 2018/05/15 01:24:23 thorpej Exp $
 #
 #      VTC100 -- NEXCOM VTC100 Kernel
 #
@@ -193,12 +193,12 @@
 # I2C Controller
 tiiic0         at obio0 addr 0x44e0b000 size 0x1000 intr 70
 iic*           at tiiic?
-#?             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
+#?             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
 
 # On-board 16550 UARTs
 com0           at obio1 addr 0x48022000 size 0x1000 intr 73 mult 4     # UART1
Prev by Date: [src/trunk]: src/share/man/man7 Update the introduction page to section 7 of ...
Next by Date: [src/trunk]: src/usr.bin/usbhidaction Add an optional '-p pidfile' parameter.
Previous by Thread: [src/trunk]: src/share/man/man7 Update the introduction page to section 7 of ...
Next by Thread: [src/trunk]: src/usr.bin/usbhidaction Add an optional '-p pidfile' parameter.
Indexes:
Home | Main Index | Thread Index | Old Index