Linux-2.6.12-rc2v2.6.12-rc2

Initial git repository build. I'm not bothering with the full history,
even though we have it. We can create a separate "historical" git
archive of that later if we want to, and in the meantime it's about
3.2GB when imported into git - space that would just make the early
git days unnecessarily complicated, when we don't have a lot of good
infrastructure for it.

Let it rip!

1 files changed, 369 insertions, 0 deletions

diff --git a/sound/i2c/tea6330t.c b/sound/i2c/tea6330t.c
new file mode 100644
index 000000000000..bb503e70b664
--- /dev/null
+++ b/sound/i2c/tea6330t.c
@@ -0,0 +1,369 @@
+/*
+ *  Routines for control of the TEA6330T circuit via i2c bus
+ *  Sound fader control circuit for car radios by Philips Semiconductors
+ *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ */
+
+#include <sound/driver.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include <sound/tea6330t.h>
+
+MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_DESCRIPTION("Routines for control of the TEA6330T circuit via i2c bus");
+MODULE_LICENSE("GPL");
+
+#define TEA6330T_ADDR                   (0x80>>1) /* fixed address */
+
+#define TEA6330T_SADDR_VOLUME_LEFT      0x00    /* volume left */
+#define TEA6330T_SADDR_VOLUME_RIGHT     0x01    /* volume right */
+#define TEA6330T_SADDR_BASS             0x02    /* bass control */
+#define TEA6330T_SADDR_TREBLE           0x03    /* treble control */
+#define TEA6330T_SADDR_FADER            0x04    /* fader control */
+#define   TEA6330T_MFN                  0x20    /* mute control for selected channels */
+#define   TEA6330T_FCH                  0x10    /* select fader channels - front or rear */
+#define TEA6330T_SADDR_AUDIO_SWITCH     0x05    /* audio switch */
+#define   TEA6330T_GMU                  0x80    /* mute control, general mute */
+#define   TEA6330T_EQN                  0x40    /* equalizer switchover (0=equalizer-on) */
+
+int snd_tea6330t_detect(snd_i2c_bus_t *bus, int equalizer)
+{
+        int res;
+
+        snd_i2c_lock(bus);
+        res = snd_i2c_probeaddr(bus, TEA6330T_ADDR);
+        snd_i2c_unlock(bus);
+        return res;
+}
+
+#if 0
+static void snd_tea6330t_set(tea6330t_t *tea,
+                             unsigned char addr, unsigned char value)
+{
+#if 0
+        printk("set - 0x%x/0x%x\n", addr, value);
+#endif
+        snd_i2c_write(tea->bus, TEA6330T_ADDR, addr, value, 1);
+}
+#endif
+
+#define TEA6330T_MASTER_VOLUME(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_tea6330t_info_master_volume, \
+  .get = snd_tea6330t_get_master_volume, .put = snd_tea6330t_put_master_volume }
+
+static int snd_tea6330t_info_master_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 43;
+        return 0;
+}
+
+static int snd_tea6330t_get_master_volume(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        
+        snd_i2c_lock(tea->bus);
+        ucontrol->value.integer.value[0] = tea->mleft - 0x14;
+        ucontrol->value.integer.value[1] = tea->mright - 0x14;
+        snd_i2c_unlock(tea->bus);
+        return 0;
+}
+
+static int snd_tea6330t_put_master_volume(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        int change, count, err;
+        unsigned char bytes[3];
+        unsigned char val1, val2;
+        
+        val1 = (ucontrol->value.integer.value[0] % 44) + 0x14;
+        val2 = (ucontrol->value.integer.value[1] % 44) + 0x14;
+        snd_i2c_lock(tea->bus);
+        change = val1 != tea->mleft || val2 != tea->mright;
+        tea->mleft = val1;
+        tea->mright = val2;
+        count = 0;
+        if (tea->regs[TEA6330T_SADDR_VOLUME_LEFT] != 0) {
+                bytes[count++] = TEA6330T_SADDR_VOLUME_LEFT;
+                bytes[count++] = tea->regs[TEA6330T_SADDR_VOLUME_LEFT] = tea->mleft;
+        }
+        if (tea->regs[TEA6330T_SADDR_VOLUME_RIGHT] != 0) {
+                if (count == 0)
+                        bytes[count++] = TEA6330T_SADDR_VOLUME_RIGHT;
+                bytes[count++] = tea->regs[TEA6330T_SADDR_VOLUME_RIGHT] = tea->mright;
+        }
+        if (count > 0) {
+                if ((err = snd_i2c_sendbytes(tea->device, bytes, count)) < 0)
+                        change = err;
+        }
+        snd_i2c_unlock(tea->bus);
+        return change;
+}
+
+#define TEA6330T_MASTER_SWITCH(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_tea6330t_info_master_switch, \
+  .get = snd_tea6330t_get_master_switch, .put = snd_tea6330t_put_master_switch }
+
+static int snd_tea6330t_info_master_switch(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 2;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int snd_tea6330t_get_master_switch(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        
+        snd_i2c_lock(tea->bus);
+        ucontrol->value.integer.value[0] = tea->regs[TEA6330T_SADDR_VOLUME_LEFT] == 0 ? 0 : 1;
+        ucontrol->value.integer.value[1] = tea->regs[TEA6330T_SADDR_VOLUME_RIGHT] == 0 ? 0 : 1;
+        snd_i2c_unlock(tea->bus);
+        return 0;
+}
+
+static int snd_tea6330t_put_master_switch(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        int change, err;
+        unsigned char bytes[3];
+        unsigned char oval1, oval2, val1, val2;
+        
+        val1 = ucontrol->value.integer.value[0] & 1;
+        val2 = ucontrol->value.integer.value[1] & 1;
+        snd_i2c_lock(tea->bus);
+        oval1 = tea->regs[TEA6330T_SADDR_VOLUME_LEFT] == 0 ? 0 : 1;
+        oval2 = tea->regs[TEA6330T_SADDR_VOLUME_RIGHT] == 0 ? 0 : 1;
+        change = val1 != oval1 || val2 != oval2;
+        tea->regs[TEA6330T_SADDR_VOLUME_LEFT] = val1 ? tea->mleft : 0;
+        tea->regs[TEA6330T_SADDR_VOLUME_RIGHT] = val2 ? tea->mright : 0;
+        bytes[0] = TEA6330T_SADDR_VOLUME_LEFT;
+        bytes[1] = tea->regs[TEA6330T_SADDR_VOLUME_LEFT];
+        bytes[2] = tea->regs[TEA6330T_SADDR_VOLUME_RIGHT];
+        if ((err = snd_i2c_sendbytes(tea->device, bytes, 3)) < 0)
+                change = err;
+        snd_i2c_unlock(tea->bus);
+        return change;
+}
+
+#define TEA6330T_BASS(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_tea6330t_info_bass, \
+  .get = snd_tea6330t_get_bass, .put = snd_tea6330t_put_bass }
+
+static int snd_tea6330t_info_bass(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = tea->max_bass;
+        return 0;
+}
+
+static int snd_tea6330t_get_bass(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        
+        ucontrol->value.integer.value[0] = tea->bass;
+        return 0;
+}
+
+static int snd_tea6330t_put_bass(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        int change, err;
+        unsigned char bytes[2];
+        unsigned char val1;
+        
+        val1 = ucontrol->value.integer.value[0] % (tea->max_bass + 1);
+        snd_i2c_lock(tea->bus);
+        tea->bass = val1;
+        val1 += tea->equalizer ? 7 : 3;
+        change = tea->regs[TEA6330T_SADDR_BASS] != val1;
+        bytes[0] = TEA6330T_SADDR_BASS;
+        bytes[1] = tea->regs[TEA6330T_SADDR_BASS] = val1;
+        if ((err = snd_i2c_sendbytes(tea->device, bytes, 2)) < 0)
+                change = err;
+        snd_i2c_unlock(tea->bus);
+        return change;
+}
+
+#define TEA6330T_TREBLE(xname, xindex) \
+{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
+  .info = snd_tea6330t_info_treble, \
+  .get = snd_tea6330t_get_treble, .put = snd_tea6330t_put_treble }
+
+static int snd_tea6330t_info_treble(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * uinfo)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = tea->max_treble;
+        return 0;
+}
+
+static int snd_tea6330t_get_treble(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        
+        ucontrol->value.integer.value[0] = tea->treble;
+        return 0;
+}
+
+static int snd_tea6330t_put_treble(snd_kcontrol_t * kcontrol, snd_ctl_elem_value_t * ucontrol)
+{
+        tea6330t_t *tea = snd_kcontrol_chip(kcontrol);
+        int change, err;
+        unsigned char bytes[2];
+        unsigned char val1;
+        
+        val1 = ucontrol->value.integer.value[0] % (tea->max_treble + 1);
+        snd_i2c_lock(tea->bus);
+        tea->treble = val1;
+        val1 += 3;
+        change = tea->regs[TEA6330T_SADDR_TREBLE] != val1;
+        bytes[0] = TEA6330T_SADDR_TREBLE;
+        bytes[1] = tea->regs[TEA6330T_SADDR_TREBLE] = val1;
+        if ((err = snd_i2c_sendbytes(tea->device, bytes, 2)) < 0)
+                change = err;
+        snd_i2c_unlock(tea->bus);
+        return change;
+}
+
+static snd_kcontrol_new_t snd_tea6330t_controls[] = {
+TEA6330T_MASTER_SWITCH("Master Playback Switch", 0),
+TEA6330T_MASTER_VOLUME("Master Playback Volume", 0),
+TEA6330T_BASS("Tone Control - Bass", 0),
+TEA6330T_TREBLE("Tone Control - Treble", 0)
+};
+
+static void snd_tea6330_free(snd_i2c_device_t *device)
+{
+        tea6330t_t *tea = device->private_data;
+        kfree(tea);
+}
+                                        
+int snd_tea6330t_update_mixer(snd_card_t * card,
+                              snd_i2c_bus_t *bus,
+                              int equalizer, int fader)
+{
+        snd_i2c_device_t *device;
+        tea6330t_t *tea;
+        snd_kcontrol_new_t *knew;
+        unsigned int idx;
+        int err = -ENOMEM;
+        u8 default_treble, default_bass;
+        unsigned char bytes[7];
+
+        tea = kcalloc(1, sizeof(*tea), GFP_KERNEL);
+        if (tea == NULL)
+                return -ENOMEM;
+        if ((err = snd_i2c_device_create(bus, "TEA6330T", TEA6330T_ADDR, &device)) < 0) {
+                kfree(tea);
+                return err;
+        }
+        tea->device = device;
+        tea->bus = bus;
+        tea->equalizer = equalizer;
+        tea->fader = fader;
+        device->private_data = tea;
+        device->private_free = snd_tea6330_free;
+
+        snd_i2c_lock(bus);
+
+        /* turn fader off and handle equalizer */
+        tea->regs[TEA6330T_SADDR_FADER] = 0x3f;
+        tea->regs[TEA6330T_SADDR_AUDIO_SWITCH] = equalizer ? 0 : TEA6330T_EQN;
+        /* initialize mixer */
+        if (!tea->equalizer) {
+                tea->max_bass = 9;
+                tea->max_treble = 8;
+                default_bass = 3 + 4;
+                tea->bass = 4;
+                default_treble = 3 + 4;
+                tea->treble = 4;
+        } else {
+                tea->max_bass = 5;
+                tea->max_treble = 0;
+                default_bass = 7 + 4;
+                tea->bass = 4;
+                default_treble = 3;
+                tea->treble = 0;
+        }
+        tea->mleft = tea->mright = 0x14;
+        tea->regs[TEA6330T_SADDR_BASS] = default_bass;
+        tea->regs[TEA6330T_SADDR_TREBLE] = default_treble;
+
+        /* compose I2C message and put the hardware to initial state */
+        bytes[0] = TEA6330T_SADDR_VOLUME_LEFT;
+        for (idx = 0; idx < 6; idx++)
+                bytes[idx+1] = tea->regs[idx];
+        if ((err = snd_i2c_sendbytes(device, bytes, 7)) < 0)
+                goto __error;
+
+        strcat(card->mixername, ",TEA6330T");
+        if ((err = snd_component_add(card, "TEA6330T")) < 0)
+                goto __error;
+
+        for (idx = 0; idx < ARRAY_SIZE(snd_tea6330t_controls); idx++) {
+                knew = &snd_tea6330t_controls[idx];
+                if (tea->treble == 0 && !strcmp(knew->name, "Tone Control - Treble"))
+                        continue;
+                if ((err = snd_ctl_add(card, snd_ctl_new1(knew, tea))) < 0)
+                        goto __error;
+        }
+
+        snd_i2c_unlock(bus);
+        return 0;
+        
+      __error:
+        snd_i2c_unlock(bus);
+        snd_i2c_device_free(device);
+        return err;
+}
+
+EXPORT_SYMBOL(snd_tea6330t_detect);
+EXPORT_SYMBOL(snd_tea6330t_update_mixer);
+
+/*
+ *  INIT part
+ */
+
+static int __init alsa_tea6330t_init(void)
+{
+        return 0;
+}
+
+static void __exit alsa_tea6330t_exit(void)
+{
+}
+
+module_init(alsa_tea6330t_init)
+module_exit(alsa_tea6330t_exit)