Fully specifiy the location of indirectly-configured I2C devices. In trunk
authorthorpej <thorpej@NetBSD.org>
Mon, 14 May 2018 21:50:02 +0000
branchtrunk
changeset 319053 74b1e41d191d
parent 319052 716b4759034f
child 319054 1059634cfba4
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.
sys/arch/evbmips/conf/GDIUM
sys/arch/evbmips/conf/LOONGSON
sys/arch/hpcarm/conf/NETBOOKPRO
sys/arch/mmeye/conf/MMEYE_WLF
--- a/sys/arch/evbmips/conf/GDIUM	Mon May 14 21:05:17 2018 +0000
+++ b/sys/arch/evbmips/conf/GDIUM	Mon May 14 21:50:02 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM,v 1.29 2017/09/14 07:58:40 mrg Exp $
+# $NetBSD: GDIUM,v 1.30 2018/05/14 21:50:02 thorpej Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GDIUM-$Revision: 1.29 $"
+#ident 		"GDIUM-$Revision: 1.30 $"
 
 maxusers	16
 
@@ -152,11 +152,11 @@
 pci0		at bonito0
 voyager0	at pci0 dev ? function ?
 voyagerfb0	at voyager0
-iic*		at voyager0
-strtc*	at iic? addr 0x68
+iic0		at voyager0
+strtc*	at iic0 addr 0x68
 options	STRTC_NO_USERRAM
-lmtemp*	at iic? addr 0x48
-#stvii*	at iic? addr 0x40
+lmtemp*	at iic0 addr 0x48
+#stvii*	at iic0 addr 0x40
 #genfb0		at pci0 dev ? function ?
 wsdisplay0	at wsemuldisplaydev?
 ehci*		at pci0 dev ? function ?
--- a/sys/arch/evbmips/conf/LOONGSON	Mon May 14 21:05:17 2018 +0000
+++ b/sys/arch/evbmips/conf/LOONGSON	Mon May 14 21:50:02 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.36 2018/01/18 23:17:09 maya Exp $
+# $NetBSD: LOONGSON,v 1.37 2018/05/14 21:50:02 thorpej Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"LOONGSON-$Revision: 1.36 $"
+#ident 		"LOONGSON-$Revision: 1.37 $"
 
 maxusers	16
 
@@ -168,11 +168,11 @@
 voyager0	at pci0 dev ? function ?	# SM502 on GDIUM
 voyagerfb0	at voyager0			# framebuffer portion
 pwmclock0	at voyager0			# clock and CPU freq scaling
-iic*		at voyager0
-strtc*		at iic? addr 0x68		# GDIUM's real time clock
+iic0		at voyager0
+strtc*		at iic0 addr 0x68		# GDIUM's real time clock
 options 	STRTC_NO_USERRAM
-lmtemp*		at iic? addr 0x48		# GDIUM's temperature sensor
-stvii*		at iic? addr 0x40		# GDIUM's onboard microcontroller
+lmtemp*		at iic0 addr 0x48		# GDIUM's temperature sensor
+stvii*		at iic0 addr 0x40		# GDIUM's onboard microcontroller
 lynxfb0		at pci0 dev ? function ?	# SM712 on Yeeloong Notebook
 #genfb0		at pci0 dev ? function ?
 wsdisplay*	at wsemuldisplaydev?
--- a/sys/arch/hpcarm/conf/NETBOOKPRO	Mon May 14 21:05:17 2018 +0000
+++ b/sys/arch/hpcarm/conf/NETBOOKPRO	Mon May 14 21:50:02 2018 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: NETBOOKPRO,v 1.22 2017/09/14 07:58:41 mrg Exp $
+#	$NetBSD: NETBOOKPRO,v 1.23 2018/05/14 21:58:14 thorpej Exp $
 #
 #	NETBOOKPRO -- Psion Teklogix NETBOOK PRO
 #
@@ -8,7 +8,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.22 $"
+#ident 		"GENERIC-$Revision: 1.23 $"
 
 # estimated number of users
 maxusers	32
@@ -175,9 +175,9 @@
 nbpiic0	at pxaip? addr 0x40300000 intr 18
 iic*	at nbpiic?
 
-nbppcon* at iic? addr 0x13			# PCon
-r2025rtc* at iic? addr 0x32			# R2025S RTC
-seeprom* at iic? addr 0x53 size 128
+nbppcon* at iic0 addr 0x13			# PCon
+r2025rtc* at iic0 addr 0x32			# R2025S RTC
+seeprom* at iic0 addr 0x53 size 128
 
 nbppm* at nbppcon? tag 0x05
 hpcapm* at nbppm?
--- a/sys/arch/mmeye/conf/MMEYE_WLF	Mon May 14 21:05:17 2018 +0000
+++ b/sys/arch/mmeye/conf/MMEYE_WLF	Mon May 14 21:50:02 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.23 2017/09/14 07:58:42 mrg Exp $
+# $NetBSD: MMEYE_WLF,v 1.24 2018/05/14 22:01:57 thorpej Exp $
 #
 # MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
 #
@@ -22,7 +22,7 @@
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.23 $"
+#ident 		"GENERIC-$Revision: 1.24 $"
 
 maxusers	16		# estimated number of users
 
@@ -159,7 +159,7 @@
 
 rtciic0	at mainbus? addr1 0xb100000e
 iic* at rtciic?
-rs5c372rtc* at iic? addr 0x32
+rs5c372rtc* at iic0 addr 0x32
 
 #ac97x	at mainbus? addr1 0xb3000000-0xb300000f irq1 1	# AD1881A
 audio* at audiobus?