Module Name: src
Committed By: thorpej
Date: Tue May 15 00:44:56 UTC 2018
Modified Files:
src/sys/arch/zaurus/conf: GENERIC INSTALL INSTALL_C700
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.75 -r1.76 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/zaurus/conf/INSTALL
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/zaurus/conf/INSTALL_C700
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/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.75 src/sys/arch/zaurus/conf/GENERIC:1.76
--- src/sys/arch/zaurus/conf/GENERIC:1.75 Thu Sep 14 07:58:44 2017
+++ src/sys/arch/zaurus/conf/GENERIC Tue May 15 00:44:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.75 2017/09/14 07:58:44 mrg Exp $
+# $NetBSD: GENERIC,v 1.76 2018/05/15 00:44:56 thorpej Exp $
#
# GENERIC machine description file
#
@@ -192,7 +192,7 @@ scoop0 at pxaip?
scoop1 at pxaip?
# alternate GPIO contoller for SL-C1000
-ioexp0 at iic? addr 0x18
+ioexp0 at iic0 addr 0x18
# ADC, touchpad, backlight
zssp0 at pxaip?
@@ -218,7 +218,7 @@ wsdisplay* at w100lcd? console ?
lcdctl0 at zssp0
# WM8750 Audio
-zaudio0 at iic? addr 0x1b
+zaudio0 at iic0 addr 0x1b
audio* at zaudio?
#options ZAUDIO_VOLUME_STRIDE=8
Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.35 src/sys/arch/zaurus/conf/INSTALL:1.36
--- src/sys/arch/zaurus/conf/INSTALL:1.35 Sun Jan 28 01:09:58 2018
+++ src/sys/arch/zaurus/conf/INSTALL Tue May 15 00:44:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.35 2018/01/28 01:09:58 rin Exp $
+# $NetBSD: INSTALL,v 1.36 2018/05/15 00:44:56 thorpej Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -68,7 +68,7 @@ no zrc0 at pxaip?
no ztp0 at zssp?
no wsmouse* at ztp?
-no zaudio0 at iic?
+no zaudio0 at iic0
no audio* at zaudio?
no spkr* at audio?
Index: src/sys/arch/zaurus/conf/INSTALL_C700
diff -u src/sys/arch/zaurus/conf/INSTALL_C700:1.2 src/sys/arch/zaurus/conf/INSTALL_C700:1.3
--- src/sys/arch/zaurus/conf/INSTALL_C700:1.2 Fri Aug 12 09:26:35 2016
+++ src/sys/arch/zaurus/conf/INSTALL_C700 Tue May 15 00:44:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_C700,v 1.2 2016/08/12 09:26:35 nonaka Exp $
+# $NetBSD: INSTALL_C700,v 1.3 2018/05/15 00:44:56 thorpej Exp $
#
# INSTALL config file (C700 with memory disk root)
#
@@ -15,7 +15,7 @@ no makeoptions LOADADDRESS
makeoptions LOADADDRESS="0xc0400000"
no scoop1 at pxaip?
-no ioexp0 at iic?
+no ioexp0 at iic0
no lcd0 at pxaip?
no wsdisplay* at lcd?
