work in progress on a tumbler driver, driver is commented out for now.

3 files changed, 400 insertions, 2 deletions

diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index 534ba7427de..f6849829cda 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.93 2005/10/31 00:04:53 joris Exp $g
+#	$OpenBSD: GENERIC,v 1.94 2005/10/31 00:24:57 brad 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
+#tumbler*	at macobio?	# Tumbler audio device
 aoa*		at macobio?	# aoa audio device
 daca*		at macobio?	# Dac3550a audio device
 
@@ -263,6 +264,7 @@ wsdisplay*	at vgafb?
 # Audio support
 audio*		at awacs?
 audio*		at snapper?
+#audio*		at tumbler?
 audio*		at eap?
 audio*		at uaudio?
 audio*		at aoa?
diff --git a/sys/arch/macppc/conf/files.macppc b/sys/arch/macppc/conf/files.macppc
index e04786691bb..368b711a37b 100644
--- a/sys/arch/macppc/conf/files.macppc
+++ b/sys/arch/macppc/conf/files.macppc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.macppc,v 1.30 2005/10/31 00:04:53 joris Exp $
+#	$OpenBSD: files.macppc,v 1.31 2005/10/31 00:24:57 brad 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
 
+# tumbler audio
+device	tumbler: audio, auconv, mulaw, i2s
+attach	tumbler at macobio
+file	arch/macppc/dev/tumbler.c			tumbler
+
 # aoa audio
 device	aoa: audio, auconv, mulaw, i2s
 attach	aoa at macobio
diff --git a/sys/arch/macppc/dev/tumbler.c b/sys/arch/macppc/dev/tumbler.c
new file mode 100644
index 00000000000..c8787c02cc5
--- /dev/null
+++ b/sys/arch/macppc/dev/tumbler.c
@@ -0,0 +1,391 @@
+/*	$OpenBSD: tumbler.c,v 1.1 2005/10/31 00:24:57 brad Exp $	*/
+/*	$Id: tumbler.c,v 1.1 2005/10/31 00:24:57 brad Exp $	*/
+
+/*-
+ * Copyright (c) 2001,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.
+ */
+
+/*
+ * Datasheet is available from
+ * http://www.ti.com/sc/docs/products/analog/tas3001.html
+ */
+
+#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 <uvm/uvm_extern.h>
+
+#include <machine/autoconf.h>
+#include <machine/pio.h>
+
+#include <macppc/dev/i2svar.h>
+
+#ifdef TUMBLER_DEBUG
+# define DPRINTF printf
+#else
+# define DPRINTF while (0) printf
+#endif
+
+/* XXX */
+#define tumbler_softc i2s_softc
+
+/* XXX */
+int ki2c_write(struct device *, int, int, const void *, int);
+int ki2c_writereg(struct device *, int, u_int);
+
+void tumbler_init(struct tumbler_softc *);
+int tumbler_getdev(void *, struct audio_device *);
+int tumbler_match(struct device *, void *, void *);
+void tumbler_attach(struct device *, struct device *, void *);
+void tumbler_defer(struct device *);
+void tumbler_set_volume(struct tumbler_softc *, int, int);
+
+int tas3001_write(struct tumbler_softc *, u_int, const void *);
+int tas3001_init(struct tumbler_softc *);
+
+struct cfattach tumbler_ca = {
+	sizeof(struct tumbler_softc), tumbler_match, tumbler_attach
+};
+struct cfdriver tumbler_cd = {
+	NULL, "tumbler", DV_DULL
+};
+
+struct audio_hw_if tumbler_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,
+	tumbler_getdev,
+	NULL,
+	i2s_set_port,
+	i2s_get_port,
+	i2s_query_devinfo,
+	i2s_allocm,		/* allocm */
+	NULL,
+	i2s_round_buffersize,
+	i2s_mappage,
+	i2s_get_props,
+	i2s_trigger_output,
+	i2s_trigger_input,
+};
+
+struct audio_device tumbler_device = {
+	"TUMBLER",
+	"",
+	"tumbler"
+};
+
+/* TAS3001 registers */
+#define DEQ_MCR		0x01	/* Main Control Register (1byte) */
+#define DEQ_DRC		0x02	/* Dynamic Range Compression (2bytes) */
+#define DEQ_VOLUME	0x04	/* Volume (6bytes) */
+#define DEQ_TREBLE	0x05	/* Treble Control Register (1byte) */
+#define DEQ_BASS	0x06	/* Bass Control Register (1byte) */
+#define DEQ_MIXER1	0x07	/* Mixer 1 (3bytes) */
+#define DEQ_MIXER2	0x08	/* Mixer 2 (3bytes) */
+#define DEQ_LB0		0x0a	/* Left Biquad 0 (15bytes) */
+#define DEQ_LB1		0x0b	/* Left Biquad 1 (15bytes) */
+#define DEQ_LB2		0x0c	/* Left Biquad 2 (15bytes) */
+#define DEQ_LB3		0x0d	/* Left Biquad 3 (15bytes) */
+#define DEQ_LB4		0x0e	/* Left Biquad 4 (15bytes) */
+#define DEQ_LB5		0x0f	/* Left Biquad 5 (15bytes) */
+#define DEQ_RB0		0x13	/* Right Biquad 0 (15bytes) */
+#define DEQ_RB1		0x14	/* Right Biquad 1 (15bytes) */
+#define DEQ_RB2		0x15	/* Right Biquad 2 (15bytes) */
+#define DEQ_RB3		0x16	/* Right Biquad 3 (15bytes) */
+#define DEQ_RB4		0x17	/* Right Biquad 4 (15bytes) */
+#define DEQ_RB5		0x18	/* Right Biquad 5 (15bytes) */
+
+#define DEQ_MCR_FL	0x80	/* Fast load */
+#define DEQ_MCR_SC	0x40	/* SCLK frequency */
+#define  DEQ_MCR_SC_32	0x00	/*  32fs */
+#define  DEQ_MCR_SC_64	0x40	/*  64fs */
+#define DEQ_MCR_OM	0x30	/* Output serial port mode */
+#define  DEQ_MCR_OM_L	0x00	/*  Left justified */
+#define  DEQ_MCR_OM_R	0x10	/*  Right justified */
+#define  DEQ_MCR_OM_I2S	0x20	/*  I2S */
+#define DEQ_MCR_IM	0x0c	/* Input serial port mode */
+#define  DEQ_MCR_IM_L	0x00	/*  Left justified */
+#define  DEQ_MCR_IM_R	0x04	/*  Right justified */
+#define  DEQ_MCR_IM_I2S	0x08	/*  I2S */
+#define DEQ_MCR_W	0x03	/* Serial port word length */
+#define  DEQ_MCR_W_16	0x00	/*  16 bit */
+#define  DEQ_MCR_W_18	0x01	/*  18 bit */
+#define  DEQ_MCR_W_20	0x02	/*  20 bit */
+
+#define DEQ_DRC_CR	0xc0	/* Compression ratio */
+#define  DEQ_DRC_CR_31	0xc0	/*  3:1 */
+#define DEQ_DRC_EN	0x01	/* Enable DRC */
+
+#define DEQ_MCR_I2S	(DEQ_MCR_OM_I2S | DEQ_MCR_IM_I2S)
+
+struct tas3001_reg {
+	u_char MCR[1];
+	u_char DRC[2];
+	u_char VOLUME[6];
+	u_char TREBLE[1];
+	u_char BASS[1];
+	u_char MIXER1[3];
+	u_char MIXER2[3];
+	u_char LB0[15];
+	u_char LB1[15];
+	u_char LB2[15];
+	u_char LB3[15];
+	u_char LB4[15];
+	u_char LB5[15];
+	u_char RB0[15];
+	u_char RB1[15];
+	u_char RB2[15];
+	u_char RB3[15];
+	u_char RB4[15];
+	u_char RB5[15];
+};
+
+int
+tumbler_match(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, "tumbler") != 0)
+		return 0;
+
+	return 1;
+}
+
+void
+tumbler_attach(struct device *parent, struct device *self, void *aux)
+{
+	struct tumbler_softc *sc = (struct tumbler_softc *)self;
+
+	sc->sc_setvolume = tumbler_set_volume;
+
+	i2s_attach(parent, sc, aux);
+	config_defer(self, tumbler_defer);
+}
+
+void
+tumbler_defer(struct device *dev)
+{
+	struct tumbler_softc *sc = (struct tumbler_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;
+	}
+
+	/* XXX If i2c has failed to attach, what should we do? */
+
+	audio_attach_mi(&tumbler_hw_if, sc, &sc->sc_dev);
+
+	tumbler_init(sc);
+}
+
+void
+tumbler_set_volume(struct tumbler_softc *sc, int left, int right)
+{
+	u_char vol[6];
+
+	sc->sc_vol_l = left;
+	sc->sc_vol_r = right;
+
+	left <<= 6;	/* XXX for now */
+	right <<= 6;
+
+	vol[0] = left >> 16;
+	vol[1] = left >> 8;
+	vol[2] = left;
+	vol[3] = right >> 16;
+	vol[4] = right >> 8;
+	vol[5] = right;
+
+	tas3001_write(sc, DEQ_VOLUME, vol);
+}
+
+const struct tas3001_reg tas3001_initdata = {
+	{ DEQ_MCR_SC_64 | DEQ_MCR_I2S | DEQ_MCR_W_20 },		/* MCR */
+	{ DEQ_DRC_CR_31, 0xa0 },				/* DRC */
+	{ 0, 0, 0, 0, 0, 0 },					/* VOLUME */
+	{ 0x72 },						/* TREBLE */
+	{ 0x3e },						/* BASS */
+	{ 0x10, 0x00, 0x00 },					/* MIXER1 */
+	{ 0x00, 0x00, 0x00 },					/* MIXER2 */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+	{ 0x10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },	/* BIQUAD */
+};
+
+const char tas3001_regsize[] = {
+	0,					/* 0x00 */
+	sizeof tas3001_initdata.MCR,		/* 0x01 */
+	sizeof tas3001_initdata.DRC,		/* 0x02 */
+	0,					/* 0x03 */
+	sizeof tas3001_initdata.VOLUME,		/* 0x04 */
+	sizeof tas3001_initdata.TREBLE,		/* 0x05 */
+	sizeof tas3001_initdata.BASS,		/* 0x06 */
+	sizeof tas3001_initdata.MIXER1,		/* 0x07 */
+	sizeof tas3001_initdata.MIXER2,		/* 0x08 */
+	0,					/* 0x09 */
+	sizeof tas3001_initdata.LB0,		/* 0x0a */
+	sizeof tas3001_initdata.LB1,		/* 0x0b */
+	sizeof tas3001_initdata.LB2,		/* 0x0c */
+	sizeof tas3001_initdata.LB3,		/* 0x0d */
+	sizeof tas3001_initdata.LB4,		/* 0x0e */
+	sizeof tas3001_initdata.LB5,		/* 0x0f */
+	0,					/* 0x10 */
+	0,					/* 0x11 */
+	0,					/* 0x12 */
+	sizeof tas3001_initdata.RB0,		/* 0x13 */
+	sizeof tas3001_initdata.RB1,		/* 0x14 */
+	sizeof tas3001_initdata.RB2,		/* 0x15 */
+	sizeof tas3001_initdata.RB3,		/* 0x16 */
+	sizeof tas3001_initdata.RB4,		/* 0x17 */
+	sizeof tas3001_initdata.RB5		/* 0x18 */
+};
+
+#define DEQaddr 0x68
+
+int
+tas3001_write(struct tumbler_softc *sc, u_int reg, const void *data)
+{
+	int size;
+
+	KASSERT(reg < sizeof tas3001_regsize);
+	size = tas3001_regsize[reg];
+	KASSERT(size > 0);
+
+	if (ki2c_write(sc->sc_i2c, DEQaddr, reg, data, size))
+		return -1;
+
+	return 0;
+}
+
+#define DEQ_WRITE(sc, reg, addr) \
+	if (tas3001_write(sc, reg, addr)) goto err
+
+int
+tas3001_init(struct tumbler_softc *sc)
+{
+	deq_reset(sc);
+
+	/* Initialize TAS3001 registers. */
+	DEQ_WRITE(sc, DEQ_LB0, tas3001_initdata.LB0);
+	DEQ_WRITE(sc, DEQ_LB1, tas3001_initdata.LB1);
+	DEQ_WRITE(sc, DEQ_LB2, tas3001_initdata.LB2);
+	DEQ_WRITE(sc, DEQ_LB3, tas3001_initdata.LB3);
+	DEQ_WRITE(sc, DEQ_LB4, tas3001_initdata.LB4);
+	DEQ_WRITE(sc, DEQ_LB5, tas3001_initdata.LB5);
+	DEQ_WRITE(sc, DEQ_RB0, tas3001_initdata.RB0);
+	DEQ_WRITE(sc, DEQ_RB1, tas3001_initdata.RB1);
+	DEQ_WRITE(sc, DEQ_RB1, tas3001_initdata.RB1);
+	DEQ_WRITE(sc, DEQ_RB2, tas3001_initdata.RB2);
+	DEQ_WRITE(sc, DEQ_RB3, tas3001_initdata.RB3);
+	DEQ_WRITE(sc, DEQ_RB4, tas3001_initdata.RB4);
+	DEQ_WRITE(sc, DEQ_MCR, tas3001_initdata.MCR);
+	DEQ_WRITE(sc, DEQ_DRC, tas3001_initdata.DRC);
+	DEQ_WRITE(sc, DEQ_VOLUME, tas3001_initdata.VOLUME);
+	DEQ_WRITE(sc, DEQ_TREBLE, tas3001_initdata.TREBLE);
+	DEQ_WRITE(sc, DEQ_BASS, tas3001_initdata.BASS);
+	DEQ_WRITE(sc, DEQ_MIXER1, tas3001_initdata.MIXER1);
+	DEQ_WRITE(sc, DEQ_MIXER2, tas3001_initdata.MIXER2);
+
+	return 0;
+err:
+	printf("%s: tas3001_init: error\n", sc->sc_dev.dv_xname);
+	return -1;
+}
+
+void
+tumbler_init(struct tumbler_softc *sc)
+{
+
+	/* "sample-rates" (44100, 48000) */
+	i2s_set_rate(sc, 44100);
+
+#if 1
+	/* Enable I2C interrupts. */
+#define IER 4
+#define I2C_INT_DATA 0x01
+#define I2C_INT_ADDR 0x02
+#define I2C_INT_STOP 0x04
+	ki2c_writereg(sc->sc_i2c, IER,I2C_INT_DATA|I2C_INT_ADDR|I2C_INT_STOP);
+#endif
+
+	if (tas3001_init(sc))
+		return;
+
+	tumbler_set_volume(sc, 80, 80);
+}
+
+int
+tumbler_getdev(void *h, struct audio_device *retp)
+{
+	*retp = tumbler_device;
+	return 0;
+}