add daca audio support, found in some macppc machines;

ok drahn@

3 files changed, 215 insertions, 2 deletions

diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 9c85a01625b..18c7f3592a1 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.91 2005/10/19 14:46:00 kettenis Exp $g
+#	$OpenBSD: GENERIC,v 1.92 2005/10/30 23:55:02 joris Exp $g
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -143,6 +143,7 @@ zstty*		at zsc?
 awacs*		at macobio?	# Apple audio device
 ki2c*		at macobio?	# Keywest I2C
 snapper*	at macobio?	# Snapper audio device
+daca*		at macobio?	# Dac3550a audio device
 
 bktr0		at pci?		# Bt8[47][89] tv/fmradio/video
 radio*		at bktr?
@@ -263,6 +264,7 @@ audio*		at awacs?
 audio*		at snapper?
 audio*		at eap?
 audio*		at uaudio?
+audio*		at daca?
 
 sd*		at scsibus?
 st*		at scsibus?
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index afa16d17508..4d26e998349 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.28 2005/10/26 17:57:20 joris Exp $
+#	$OpenBSD: files.macppc,v 1.29 2005/10/30 23:55:02 joris Exp $
 
 #
 # macppc-specific configuration info
@@ -202,6 +202,11 @@ device	snapper: audio, auconv, mulaw, i2s
 attach	snapper at macobio
 file	arch/macppc/dev/snapper.c			snapper
 
+# daca audio
+device	daca: audio, auconv, mulaw, i2s
+attach	daca at macobio
+file	arch/macppc/dev/daca.c				daca
+
 #device	nvram
 #attach	nvram at macobio
 #file	arch/macppc/dev/nvram.c				nvram needs-flag
diff --git a/sys/arch/macppc/dev/daca.c b/sys/arch/macppc/dev/daca.c
new file mode 100644
index 00000000000..9d67508ea06
--- /dev/null
+++ b/sys/arch/macppc/dev/daca.c
@@ -0,0 +1,206 @@
+/*	$OpenBSD: daca.c,v 1.1 2005/10/30 23:55:03 joris Exp $	*/
+/*	$Id: daca.c,v 1.1 2005/10/30 23:55:03 joris Exp $	*/
+
+/*-
+ * Copyright (c) 2002,2003 Tsubai Masanari.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/param.h>
+#include <sys/audioio.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/systm.h>
+
+#include <dev/auconv.h>
+#include <dev/audio_if.h>
+#include <dev/mulaw.h>
+#include <dev/ofw/openfirm.h>
+#include <macppc/dev/dbdma.h>
+
+#include <machine/autoconf.h>
+
+#include <macppc/dev/i2svar.h>
+
+#ifdef DACA_DEBUG
+# define DPRINTF printf
+#else
+# define DPRINTF while (0) printf
+#endif
+
+#define daca_softc i2s_softc		/* XXX */
+
+int daca_getdev(void *, struct audio_device *);
+int daca_match(struct device *, void *, void *);
+void daca_attach(struct device *, struct device *, void *);
+void daca_defer(struct device *);
+void daca_init(struct daca_softc *);
+void daca_set_volume(struct daca_softc *, int, int);
+
+/* XXX */
+int ki2c_write(struct device *, int, int, const void *, int);
+int ki2c_writereg(struct device *, int, u_int);
+
+struct cfattach daca_ca = {
+	sizeof(struct daca_softc), daca_match, daca_attach
+};
+
+struct cfdriver daca_cd = {
+	NULL, "daca", DV_DULL
+};
+
+struct audio_hw_if daca_hw_if = {
+	i2s_open,
+	i2s_close,
+	NULL,
+	i2s_query_encoding,
+	i2s_set_params,
+	i2s_round_blocksize,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	i2s_halt_output,
+	i2s_halt_input,
+	NULL,
+	daca_getdev,
+	NULL,
+	i2s_set_port,
+	i2s_get_port,
+	i2s_query_devinfo,
+	i2s_allocm,
+	NULL,
+	i2s_round_buffersize,
+	i2s_mappage,
+	i2s_get_props,
+	i2s_trigger_output,
+	i2s_trigger_input,
+};
+
+struct audio_device daca_device = {
+	"DACA",
+	"",
+	"daca"
+};
+
+/* DAC3550 registers */
+#define DEQ_SR		0x01	/* Sample rate control (8) */
+#define DEQ_AVOL	0x02	/* Analog volume (16) */
+#define DEQ_GCFG	0x03	/* Global configuration (8) */
+
+int
+daca_match(parent, match, aux)
+	struct device *parent;
+	void *match;
+	void *aux;
+{
+	struct confargs *ca = aux;
+	int soundbus, soundchip;
+	char compat[32];
+
+	if (strcmp(ca->ca_name, "i2s") != 0)
+		return 0;
+
+	if ((soundbus = OF_child(ca->ca_node)) == 0 ||
+	    (soundchip = OF_child(soundbus)) == 0)
+		return 0;
+
+	bzero(compat, sizeof compat);
+	OF_getprop(soundchip, "compatible", compat, sizeof compat);
+
+	if (strcmp(compat, "daca") != 0)
+		return 0;
+
+	return 1;
+}
+
+#define DEQaddr 0x9a
+
+void
+daca_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	struct daca_softc *sc = (struct daca_softc *)self;
+
+	/* "set volume" callback */
+	sc->sc_setvolume = daca_set_volume;
+
+	i2s_attach(parent, sc, aux);
+	config_defer(self, daca_defer);
+}
+
+void
+daca_defer(struct device *dev)
+{
+	struct daca_softc *sc = (struct daca_softc *)dev;
+	struct device *dv;
+
+	TAILQ_FOREACH(dv, &alldevs, dv_list) {
+		if (strncmp(dv->dv_xname, "ki2c", 4) == 0 &&
+		    strncmp(dv->dv_parent->dv_xname, "macobio", 7) == 0)
+			sc->sc_i2c = dv;
+	}
+
+	if (sc->sc_i2c == NULL) {
+		printf("%s: unable to find i2c\n", sc->sc_dev.dv_xname);
+		return;
+	}
+
+	audio_attach_mi(&daca_hw_if, sc, &sc->sc_dev);
+	daca_init(sc);
+}
+
+void
+daca_init(struct daca_softc *sc)
+{
+	i2s_set_rate(sc, 44100);
+	ki2c_writereg(sc->sc_i2c, 4, 0x01 | 0x02 | 0x04);
+}
+
+int
+daca_getdev(h, retp)
+	void *h;
+	struct audio_device *retp;
+{
+	*retp = daca_device;
+	return 0;
+}
+
+void
+daca_set_volume(sc, left, right)
+	struct daca_softc *sc;
+	int left, right;
+{
+	u_int16_t data;
+
+	sc->sc_vol_l = left;
+	sc->sc_vol_r = right;
+
+	left >>= 2;
+	right >>= 2;
+	data = left << 8 | right;
+	ki2c_write(sc->sc_i2c, DEQaddr, DEQ_AVOL, &data, 2);
+}