summaryrefslogtreecommitdiff
path: root/sys/arch/loongson/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/loongson/conf')
-rw-r--r--sys/arch/loongson/conf/GENERIC33
-rw-r--r--sys/arch/loongson/conf/RAMDISK25
-rw-r--r--sys/arch/loongson/conf/files.loongson17
3 files changed, 52 insertions, 23 deletions
diff --git a/sys/arch/loongson/conf/GENERIC b/sys/arch/loongson/conf/GENERIC
index 27ba3c0085e..546609457ad 100644
--- a/sys/arch/loongson/conf/GENERIC
+++ b/sys/arch/loongson/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.8 2010/02/12 08:14:00 miod Exp $
+# $OpenBSD: GENERIC,v 1.9 2010/02/18 22:45:26 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -34,20 +34,33 @@ clock0 at mainbus0
# Main local buses
bonito* at mainbus0
pci* at bonito?
-glxpcib* at pci?
+# Lemote Fuloong 2F and Lemote Yeeloong devices
+glxpcib* at pci?
isa0 at glxpcib?
mcclock0 at isa? port 0x70
-pckbc0 at isa?
-pckbd* at pckbc?
-wskbd* at pckbd? mux 1
-pmsi* at pckbc?
-wsmouse* at pmsi? mux 0
-com0 at isa? port 0x2f8 irq 3
-
+pckbc0 at isa? # Yeeloong only
+pckbd* at pckbc? # Yeeloong only
+wskbd* at pckbd? mux 1 # Yeeloong only
+pmsi* at pckbc? # Yeeloong only
+wsmouse* at pmsi? mux 0 # Yeeloong only
+com0 at isa? port 0x2f8 irq 3 # Fuloong 2F only
pciide* at pci?
wd* at pciide? flags 0x0000
-smfb* at pci?
+smfb* at pci? # Yeeloong only
+
+# Gdium Liberty specific devices
+voyager* at pci?
+gpio0 at voyager?
+gdiumiic0 at gpio0 offset 6 mask 0x81 # pins 6 and 13
+gdiumiic0 at gpio0 offset 46 mask 0x03 # pins 46 and 47
+iic0 at gdiumiic0
+lmtemp0 at iic0 # National Semiconductor LM75
+#gdiumiic1 at gpio0 offset 41 mask 0x03 # pins 41 and 42
+#iic* at voyager?
+#ohci* at voyager?
+smfb* at voyager?
+
wsdisplay* at smfb?
# USB Controllers
diff --git a/sys/arch/loongson/conf/RAMDISK b/sys/arch/loongson/conf/RAMDISK
index dd840abb2fd..c914357733f 100644
--- a/sys/arch/loongson/conf/RAMDISK
+++ b/sys/arch/loongson/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.6 2010/02/12 19:57:52 otto Exp $
+# $OpenBSD: RAMDISK,v 1.7 2010/02/18 22:45:26 miod Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -46,20 +46,25 @@ clock0 at mainbus0
# Main local buses
bonito* at mainbus0
pci* at bonito?
-glxpcib* at pci?
+# Lemote Fuloong 2F and Lemote Yeeloong devices
+glxpcib* at pci?
isa0 at glxpcib?
mcclock0 at isa? port 0x70
-pckbc0 at isa?
-pckbd* at pckbc?
-wskbd* at pckbd? mux 1
-pmsi* at pckbc?
-wsmouse* at pmsi? mux 0
-com0 at isa? port 0x2f8 irq 3
-
+pckbc0 at isa? # Yeeloong only
+pckbd* at pckbc? # Yeeloong only
+wskbd* at pckbd? mux 1 # Yeeloong only
+pmsi* at pckbc? # Yeeloong only
+wsmouse* at pmsi? mux 0 # Yeeloong only
+com0 at isa? port 0x2f8 irq 3 # Fuloong 2F only
pciide* at pci?
wd* at pciide? flags 0x0000
-smfb* at pci?
+smfb* at pci? # Yeeloong only
+
+# Gdium Liberty specific devices
+voyager* at pci?
+smfb* at voyager?
+
wsdisplay* at smfb?
# USB Controllers
diff --git a/sys/arch/loongson/conf/files.loongson b/sys/arch/loongson/conf/files.loongson
index f7d56de48bc..23eb91de37d 100644
--- a/sys/arch/loongson/conf/files.loongson
+++ b/sys/arch/loongson/conf/files.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: files.loongson,v 1.2 2010/02/05 20:51:20 miod Exp $
+# $OpenBSD: files.loongson,v 1.3 2010/02/18 22:45:26 miod Exp $
# Standard stanzas config(8) can't run without
maxpartitions 16
@@ -73,7 +73,18 @@ attach mcclock at isa with mcclock_isa
file arch/loongson/dev/mcclock.c mcclock
file arch/loongson/dev/mcclock_isa.c mcclock_isa
-# Silicon Motion SM712 frame buffer
+# Silicon Motion SM502 master device
+device voyager {}: gpiobus
+attach voyager at pci
+file arch/loongson/dev/voyager.c voyager
+
+# SM502 specific I2C bus bit-banging
+device gdiumiic: i2cbus, i2c_bitbang
+attach gdiumiic at gpio
+file arch/loongson/dev/gdiumiic.c gdiumiic
+
+# Silicon Motion SM502/SM712 frame buffer
device smfb: wsemuldisplaydev, rasops16
-attach smfb at pci
+attach smfb at pci with smfb_pci
+attach smfb at voyager with smfb_voyager
file arch/loongson/dev/smfb.c smfb needs-flag