Module Name: src
Committed By: thorpej
Date: Mon May 14 21:50:02 UTC 2018
Modified Files:
src/sys/arch/evbmips/conf: GDIUM LOONGSON
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbmips/conf/GDIUM
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbmips/conf/LOONGSON
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/conf/GDIUM
diff -u src/sys/arch/evbmips/conf/GDIUM:1.29 src/sys/arch/evbmips/conf/GDIUM:1.30
--- src/sys/arch/evbmips/conf/GDIUM:1.29 Thu Sep 14 07:58:40 2017
+++ src/sys/arch/evbmips/conf/GDIUM Mon May 14 21:50:02 2018
@@ -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 @@ include "arch/evbmips/conf/std.gdium"
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 @@ bonito0 at mainbus0
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 ?
Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.36 src/sys/arch/evbmips/conf/LOONGSON:1.37
--- src/sys/arch/evbmips/conf/LOONGSON:1.36 Thu Jan 18 23:17:09 2018
+++ src/sys/arch/evbmips/conf/LOONGSON Mon May 14 21:50:02 2018
@@ -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 @@ include "arch/evbmips/conf/std.loongson
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 @@ sisfb0 at pci0 dev ? function ?
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?
