summaryrefslogtreecommitdiff
path: root/sys/arch/zaurus/conf
diff options
context:
space:
mode:
authorChristopher Pascoe <pascoe@cvs.openbsd.org>2005-04-15 01:05:52 +0000
committerChristopher Pascoe <pascoe@cvs.openbsd.org>2005-04-15 01:05:52 +0000
commite98c8eadc2a658a4599ac3c5b74fcca6f94420d5 (patch)
tree31f2c2f0b0237bc01eb60051de7954a6e0e64505 /sys/arch/zaurus/conf
parent89ffd6176c431304bc414278cedeb5aed33a580a (diff)
Add basic audio playback support for the Zaurus SL-C3000.
ok dlg@ drahn@ uwe@ deraadt@
Diffstat (limited to 'sys/arch/zaurus/conf')
-rw-r--r--sys/arch/zaurus/conf/GENERIC5
-rw-r--r--sys/arch/zaurus/conf/files.zaurus9
2 files changed, 11 insertions, 3 deletions
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index bc0248518c4..eacbdf27b6b 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.32 2005/04/14 23:40:34 pascoe Exp $
+# $OpenBSD: GENERIC,v 1.33 2005/04/15 01:05:50 pascoe Exp $
#
# GENERIC machine description file
#
@@ -148,7 +148,8 @@ com1 at pxaip? addr 0x40200000 intr 21 # BlueTooth UART
options FFUARTCONSOLE
#options BTUARTCONSOLE
-#aupxa0 at pxaip? # AC97 interface
+zaudio0 at pxaip? # Zaurus I2S/I2C sound
+audio* at zaudio?
# CF (pcmcia) support
pxapcic0 at pxaip?
diff --git a/sys/arch/zaurus/conf/files.zaurus b/sys/arch/zaurus/conf/files.zaurus
index 51726538074..6813b3395e9 100644
--- a/sys/arch/zaurus/conf/files.zaurus
+++ b/sys/arch/zaurus/conf/files.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: files.zaurus,v 1.15 2005/01/28 17:14:31 drahn Exp $
+# $OpenBSD: files.zaurus,v 1.16 2005/04/15 01:05:50 pascoe Exp $
#
# First try for arm-specific configuration info
#
@@ -52,6 +52,13 @@ device zts: wsmousedev
attach zts at pxaip
file arch/zaurus/dev/zts.c zts
+# Zaurus sound
+device zaudio: audio
+attach zaudio at pxaip
+file arch/zaurus/dev/zaurus_audio.c zaudio
+file arch/arm/xscale/pxa2x0_i2s.c zaudio
+file arch/arm/xscale/pxa2x0_i2c.c zaudio
+
#
# Machine-independent ATA drivers
#