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, 283 insertions, 0 deletions

diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c
new file mode 100644
index 000000000000..f24a91693616
--- /dev/null
+++ b/sound/ppc/daca.c
@@ -0,0 +1,283 @@
+/*
+ * PMac DACA lowlevel functions
+ *
+ * Copyright (c) by Takashi Iwai <tiwai@suse.de>
+ *
+ *   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/i2c.h>
+#include <linux/i2c-dev.h>
+#include <linux/kmod.h>
+#include <linux/slab.h>
+#include <sound/core.h>
+#include "pmac.h"
+
+/* i2c address */
+#define DACA_I2C_ADDR   0x4d
+
+/* registers */
+#define DACA_REG_SR     0x01
+#define DACA_REG_AVOL   0x02
+#define DACA_REG_GCFG   0x03
+
+/* maximum volume value */
+#define DACA_VOL_MAX    0x38
+
+
+typedef struct pmac_daca_t {
+        pmac_keywest_t i2c;
+        int left_vol, right_vol;
+        unsigned int deemphasis : 1;
+        unsigned int amp_on : 1;
+} pmac_daca_t;
+
+
+/*
+ * initialize / detect DACA
+ */
+static int daca_init_client(pmac_keywest_t *i2c)
+{
+        unsigned short wdata = 0x00;
+        /* SR: no swap, 1bit delay, 32-48kHz */
+        /* GCFG: power amp inverted, DAC on */
+        if (i2c_smbus_write_byte_data(i2c->client, DACA_REG_SR, 0x08) < 0 ||
+            i2c_smbus_write_byte_data(i2c->client, DACA_REG_GCFG, 0x05) < 0)
+                return -EINVAL;
+        return i2c_smbus_write_block_data(i2c->client, DACA_REG_AVOL,
+                                          2, (unsigned char*)&wdata);
+}
+
+/*
+ * update volume
+ */
+static int daca_set_volume(pmac_daca_t *mix)
+{
+        unsigned char data[2];
+  
+        if (! mix->i2c.client)
+                return -ENODEV;
+  
+        if (mix->left_vol > DACA_VOL_MAX)
+                data[0] = DACA_VOL_MAX;
+        else
+                data[0] = mix->left_vol;
+        if (mix->right_vol > DACA_VOL_MAX)
+                data[1] = DACA_VOL_MAX;
+        else
+                data[1] = mix->right_vol;
+        data[1] |= mix->deemphasis ? 0x40 : 0;
+        if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL,
+                                       2, data) < 0) {
+                snd_printk("failed to set volume \n");
+                return -EINVAL;
+        }
+        return 0;
+}
+
+
+/* deemphasis switch */
+static int daca_info_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo)
+{
+        uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
+        uinfo->count = 1;
+        uinfo->value.integer.min = 0;
+        uinfo->value.integer.max = 1;
+        return 0;
+}
+
+static int daca_get_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        pmac_daca_t *mix;
+        if (! (mix = chip->mixer_data))
+                return -ENODEV;
+        ucontrol->value.integer.value[0] = mix->deemphasis ? 1 : 0;
+        return 0;
+}
+
+static int daca_put_deemphasis(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        pmac_daca_t *mix;
+        int change;
+
+        if (! (mix = chip->mixer_data))
+                return -ENODEV;
+        change = mix->deemphasis != ucontrol->value.integer.value[0];
+        if (change) {
+                mix->deemphasis = ucontrol->value.integer.value[0];
+                daca_set_volume(mix);
+        }
+        return change;
+}
+
+/* output volume */
+static int daca_info_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 = DACA_VOL_MAX;
+        return 0;
+}
+
+static int daca_get_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        pmac_daca_t *mix;
+        if (! (mix = chip->mixer_data))
+                return -ENODEV;
+        ucontrol->value.integer.value[0] = mix->left_vol;
+        ucontrol->value.integer.value[1] = mix->right_vol;
+        return 0;
+}
+
+static int daca_put_volume(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        pmac_daca_t *mix;
+        int change;
+
+        if (! (mix = chip->mixer_data))
+                return -ENODEV;
+        change = mix->left_vol != ucontrol->value.integer.value[0] ||
+                mix->right_vol != ucontrol->value.integer.value[1];
+        if (change) {
+                mix->left_vol = ucontrol->value.integer.value[0];
+                mix->right_vol = ucontrol->value.integer.value[1];
+                daca_set_volume(mix);
+        }
+        return change;
+}
+
+/* amplifier switch */
+#define daca_info_amp   daca_info_deemphasis
+
+static int daca_get_amp(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        pmac_daca_t *mix;
+        if (! (mix = chip->mixer_data))
+                return -ENODEV;
+        ucontrol->value.integer.value[0] = mix->amp_on ? 1 : 0;
+        return 0;
+}
+
+static int daca_put_amp(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol)
+{
+        pmac_t *chip = snd_kcontrol_chip(kcontrol);
+        pmac_daca_t *mix;
+        int change;
+
+        if (! (mix = chip->mixer_data))
+                return -ENODEV;
+        change = mix->amp_on != ucontrol->value.integer.value[0];
+        if (change) {
+                mix->amp_on = ucontrol->value.integer.value[0];
+                i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_GCFG,
+                                          mix->amp_on ? 0x05 : 0x04);
+        }
+        return change;
+}
+
+static snd_kcontrol_new_t daca_mixers[] = {
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+          .name = "Deemphasis Switch",
+          .info = daca_info_deemphasis,
+          .get = daca_get_deemphasis,
+          .put = daca_put_deemphasis
+        },
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+          .name = "Master Playback Volume",
+          .info = daca_info_volume,
+          .get = daca_get_volume,
+          .put = daca_put_volume
+        },
+        { .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+          .name = "Power Amplifier Switch",
+          .info = daca_info_amp,
+          .get = daca_get_amp,
+          .put = daca_put_amp
+        },
+};
+
+
+#ifdef CONFIG_PMAC_PBOOK
+static void daca_resume(pmac_t *chip)
+{
+        pmac_daca_t *mix = chip->mixer_data;
+        i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_SR, 0x08);
+        i2c_smbus_write_byte_data(mix->i2c.client, DACA_REG_GCFG,
+                                  mix->amp_on ? 0x05 : 0x04);
+        daca_set_volume(mix);
+}
+#endif /* CONFIG_PMAC_PBOOK */
+
+
+static void daca_cleanup(pmac_t *chip)
+{
+        pmac_daca_t *mix = chip->mixer_data;
+        if (! mix)
+                return;
+        snd_pmac_keywest_cleanup(&mix->i2c);
+        kfree(mix);
+        chip->mixer_data = NULL;
+}
+
+/* exported */
+int __init snd_pmac_daca_init(pmac_t *chip)
+{
+        int i, err;
+        pmac_daca_t *mix;
+
+#ifdef CONFIG_KMOD
+        if (current->fs->root)
+                request_module("i2c-keywest");
+#endif /* CONFIG_KMOD */        
+
+        mix = kmalloc(sizeof(*mix), GFP_KERNEL);
+        if (! mix)
+                return -ENOMEM;
+        memset(mix, 0, sizeof(*mix));
+        chip->mixer_data = mix;
+        chip->mixer_free = daca_cleanup;
+        mix->amp_on = 1; /* default on */
+
+        mix->i2c.addr = DACA_I2C_ADDR;
+        mix->i2c.init_client = daca_init_client;
+        mix->i2c.name = "DACA";
+        if ((err = snd_pmac_keywest_init(&mix->i2c)) < 0)
+                return err;
+
+        /*
+         * build mixers
+         */
+        strcpy(chip->card->mixername, "PowerMac DACA");
+
+        for (i = 0; i < ARRAY_SIZE(daca_mixers); i++) {
+                if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&daca_mixers[i], chip))) < 0)
+                        return err;
+        }
+
+#ifdef CONFIG_PMAC_PBOOK
+        chip->resume = daca_resume;
+#endif
+
+        return 0;
+}