Merge branch 'topic/cs5535audio' into to-push

7 files changed, 252 insertions, 3 deletions

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index 9c309daf492b..251fc1cd5002 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -281,10 +281,12 @@
 /* specific - Analog Devices */
 #define AC97_AD_TEST            0x5a    /* test register */
 #define AC97_AD_TEST2           0x5c    /* undocumented test register 2 */
+#define AC97_AD_HPFD_SHIFT      12      /* High Pass Filter Disable */
 #define AC97_AD_CODEC_CFG       0x70    /* codec configuration */
 #define AC97_AD_JACK_SPDIF      0x72    /* Jack Sense & S/PDIF */
 #define AC97_AD_SERIAL_CFG      0x74    /* Serial Configuration */
 #define AC97_AD_MISC            0x76    /* Misc Control Bits */
+#define AC97_AD_VREFD_SHIFT     2       /* V_REFOUT Disable (AD1888) */
 
 /* specific - Cirrus Logic */
 #define AC97_CSR_ACMODE         0x5e    /* AC Mode Register */
diff --git a/sound/pci/ac97/ac97_patch.c b/sound/pci/ac97/ac97_patch.c
index 2c7cd97d2234..81bc93e5f1e3 100644
--- a/sound/pci/ac97/ac97_patch.c
+++ b/sound/pci/ac97/ac97_patch.c
@@ -2054,8 +2054,9 @@ static const struct snd_kcontrol_new snd_ac97_ad1888_controls[] = {
                 .get = snd_ac97_ad1888_lohpsel_get,
                 .put = snd_ac97_ad1888_lohpsel_put
         },
-        AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, 2, 1, 1),
-        AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2, 12, 1, 1),
+        AC97_SINGLE("V_REFOUT Enable", AC97_AD_MISC, AC97_AD_VREFD_SHIFT, 1, 1),
+        AC97_SINGLE("High Pass Filter Enable", AC97_AD_TEST2,
+                        AC97_AD_HPFD_SHIFT, 1, 1),
         AC97_SINGLE("Spread Front to Surround and Center/LFE", AC97_AD_MISC, 7, 1, 0),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
diff --git a/sound/pci/cs5535audio/Makefile b/sound/pci/cs5535audio/Makefile
index bb3d57e6a3cb..fda7a94c992f 100644
--- a/sound/pci/cs5535audio/Makefile
+++ b/sound/pci/cs5535audio/Makefile
@@ -4,6 +4,9 @@
 
 snd-cs5535audio-y := cs5535audio.o cs5535audio_pcm.o
 snd-cs5535audio-$(CONFIG_PM) += cs5535audio_pm.o
+ifdef CONFIG_MGEODE_LX
+snd-cs5535audio-$(CONFIG_OLPC) += cs5535audio_olpc.o
+endif
 
 # Toplevel Module Dependency
 obj-$(CONFIG_SND_CS5535AUDIO) += snd-cs5535audio.o
diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c
index 1d8b16052535..826e6dec2e97 100644
--- a/sound/pci/cs5535audio/cs5535audio.c
+++ b/sound/pci/cs5535audio/cs5535audio.c
@@ -159,10 +159,14 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
                 return err;
 
         memset(&ac97, 0, sizeof(ac97));
-        ac97.scaps = AC97_SCAP_AUDIO|AC97_SCAP_SKIP_MODEM;
+        ac97.scaps = AC97_SCAP_AUDIO | AC97_SCAP_SKIP_MODEM
+                        | AC97_SCAP_POWER_SAVE;
         ac97.private_data = cs5535au;
         ac97.pci = cs5535au->pci;
 
+        /* set any OLPC-specific scaps */
+        olpc_prequirks(card, &ac97);
+
         if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
                 snd_printk(KERN_ERR "mixer failed\n");
                 return err;
@@ -170,6 +174,12 @@ static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
 
         snd_ac97_tune_hardware(cs5535au->ac97, ac97_quirks, ac97_quirk);
 
+        err = olpc_quirks(card, cs5535au->ac97);
+        if (err < 0) {
+                snd_printk(KERN_ERR "olpc quirks failed\n");
+                return err;
+        }
+
         return 0;
 }
 
diff --git a/sound/pci/cs5535audio/cs5535audio.h b/sound/pci/cs5535audio/cs5535audio.h
index 66bae7664193..7a298ac662e3 100644
--- a/sound/pci/cs5535audio/cs5535audio.h
+++ b/sound/pci/cs5535audio/cs5535audio.h
@@ -78,6 +78,7 @@ struct cs5535audio_dma {
         unsigned int buf_addr, buf_bytes;
         unsigned int period_bytes, periods;
         u32 saved_prd;
+        int pcm_open_flag;
 };
 
 struct cs5535audio {
@@ -93,8 +94,46 @@ struct cs5535audio {
         struct cs5535audio_dma dmas[NUM_CS5535AUDIO_DMAS];
 };
 
+#ifdef CONFIG_PM
 int snd_cs5535audio_suspend(struct pci_dev *pci, pm_message_t state);
 int snd_cs5535audio_resume(struct pci_dev *pci);
+#endif
+
+#if defined(CONFIG_OLPC) && defined(CONFIG_MGEODE_LX)
+void __devinit olpc_prequirks(struct snd_card *card,
+                struct snd_ac97_template *ac97);
+int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97);
+void olpc_analog_input(struct snd_ac97 *ac97, int on);
+void olpc_mic_bias(struct snd_ac97 *ac97, int on);
+
+static inline void olpc_capture_open(struct snd_ac97 *ac97)
+{
+        /* default to Analog Input off */
+        olpc_analog_input(ac97, 0);
+        /* enable MIC Bias for recording */
+        olpc_mic_bias(ac97, 1);
+}
+
+static inline void olpc_capture_close(struct snd_ac97 *ac97)
+{
+        /* disable Analog Input */
+        olpc_analog_input(ac97, 0);
+        /* disable the MIC Bias (so the recording LED turns off) */
+        olpc_mic_bias(ac97, 0);
+}
+#else
+static inline void olpc_prequirks(struct snd_card *card,
+                struct snd_ac97_template *ac97) { }
+static inline int olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
+{
+        return 0;
+}
+static inline void olpc_analog_input(struct snd_ac97 *ac97, int on) { }
+static inline void olpc_mic_bias(struct snd_ac97 *ac97, int on) { }
+static inline void olpc_capture_open(struct snd_ac97 *ac97) { }
+static inline void olpc_capture_close(struct snd_ac97 *ac97) { }
+#endif
+
 int __devinit snd_cs5535audio_pcm(struct cs5535audio *cs5535audio);
 
 #endif /* __SOUND_CS5535AUDIO_H */
diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
new file mode 100644
index 000000000000..5c6814335cd7
--- /dev/null
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -0,0 +1,179 @@
+/*
+ * OLPC XO-1 additional sound features
+ *
+ * Copyright © 2006  Jaya Kumar <jayakumar.lkml@gmail.com>
+ * Copyright © 2007-2008  Andres Salomon <dilinger@debian.org>
+ *
+ * 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.
+ */
+#include <sound/core.h>
+#include <sound/info.h>
+#include <sound/control.h>
+#include <sound/ac97_codec.h>
+
+#include <asm/olpc.h>
+#include "cs5535audio.h"
+
+/*
+ * OLPC has an additional feature on top of the regular AD1888 codec features.
+ * It has an Analog Input mode that is switched into (after disabling the
+ * High Pass Filter) via GPIO.  It is supported on B2 and later models.
+ */
+void olpc_analog_input(struct snd_ac97 *ac97, int on)
+{
+        int err;
+
+        if (!machine_is_olpc())
+                return;
+
+        /* update the High Pass Filter (via AC97_AD_TEST2) */
+        err = snd_ac97_update_bits(ac97, AC97_AD_TEST2,
+                        1 << AC97_AD_HPFD_SHIFT, on << AC97_AD_HPFD_SHIFT);
+        if (err < 0) {
+                snd_printk(KERN_ERR "setting High Pass Filter - %d\n", err);
+                return;
+        }
+
+        /* set Analog Input through GPIO */
+        if (on)
+                geode_gpio_set(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
+        else
+                geode_gpio_clear(OLPC_GPIO_MIC_AC, GPIO_OUTPUT_VAL);
+}
+
+/*
+ * OLPC XO-1's V_REFOUT is a mic bias enable.
+ */
+void olpc_mic_bias(struct snd_ac97 *ac97, int on)
+{
+        int err;
+
+        if (!machine_is_olpc())
+                return;
+
+        on = on ? 0 : 1;
+        err = snd_ac97_update_bits(ac97, AC97_AD_MISC,
+                        1 << AC97_AD_VREFD_SHIFT, on << AC97_AD_VREFD_SHIFT);
+        if (err < 0)
+                snd_printk(KERN_ERR "setting MIC Bias - %d\n", err);
+}
+
+static int olpc_dc_info(struct snd_kcontrol *kctl,
+                struct snd_ctl_elem_info *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 olpc_dc_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
+{
+        v->value.integer.value[0] = geode_gpio_isset(OLPC_GPIO_MIC_AC,
+                        GPIO_OUTPUT_VAL);
+        return 0;
+}
+
+static int olpc_dc_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
+{
+        struct cs5535audio *cs5535au = snd_kcontrol_chip(kctl);
+
+        olpc_analog_input(cs5535au->ac97, v->value.integer.value[0]);
+        return 1;
+}
+
+static int olpc_mic_info(struct snd_kcontrol *kctl,
+                struct snd_ctl_elem_info *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 olpc_mic_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
+{
+        struct cs5535audio *cs5535au = snd_kcontrol_chip(kctl);
+        struct snd_ac97 *ac97 = cs5535au->ac97;
+        int i;
+
+        i = (snd_ac97_read(ac97, AC97_AD_MISC) >> AC97_AD_VREFD_SHIFT) & 0x1;
+        v->value.integer.value[0] = i ? 0 : 1;
+        return 0;
+}
+
+static int olpc_mic_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *v)
+{
+        struct cs5535audio *cs5535au = snd_kcontrol_chip(kctl);
+
+        olpc_mic_bias(cs5535au->ac97, v->value.integer.value[0]);
+        return 1;
+}
+
+static struct snd_kcontrol_new olpc_cs5535audio_ctls[] __devinitdata = {
+{
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "DC Mode Enable",
+        .info = olpc_dc_info,
+        .get = olpc_dc_get,
+        .put = olpc_dc_put,
+        .private_value = 0,
+},
+{
+        .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
+        .name = "MIC Bias Enable",
+        .info = olpc_mic_info,
+        .get = olpc_mic_get,
+        .put = olpc_mic_put,
+        .private_value = 0,
+},
+};
+
+void __devinit olpc_prequirks(struct snd_card *card,
+                struct snd_ac97_template *ac97)
+{
+        if (!machine_is_olpc())
+                return;
+
+        /* invert EAPD if on an OLPC B3 or higher */
+        if (olpc_board_at_least(olpc_board_pre(0xb3)))
+                ac97->scaps |= AC97_SCAP_INV_EAPD;
+}
+
+int __devinit olpc_quirks(struct snd_card *card, struct snd_ac97 *ac97)
+{
+        struct snd_ctl_elem_id elem;
+        int i, err;
+
+        if (!machine_is_olpc())
+                return 0;
+
+        /* drop the original AD1888 HPF control */
+        memset(&elem, 0, sizeof(elem));
+        elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        strncpy(elem.name, "High Pass Filter Enable", sizeof(elem.name));
+        snd_ctl_remove_id(card, &elem);
+
+        /* drop the original V_REFOUT control */
+        memset(&elem, 0, sizeof(elem));
+        elem.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
+        strncpy(elem.name, "V_REFOUT Enable", sizeof(elem.name));
+        snd_ctl_remove_id(card, &elem);
+
+        /* add the OLPC-specific controls */
+        for (i = 0; i < ARRAY_SIZE(olpc_cs5535audio_ctls); i++) {
+                err = snd_ctl_add(card, snd_ctl_new1(&olpc_cs5535audio_ctls[i],
+                                ac97->private_data));
+                if (err < 0)
+                        return err;
+        }
+
+        /* turn off the mic by default */
+        olpc_mic_bias(ac97, 0);
+        return 0;
+}
diff --git a/sound/pci/cs5535audio/cs5535audio_pcm.c b/sound/pci/cs5535audio/cs5535audio_pcm.c
index cdcda87116c3..0f48a871f17b 100644
--- a/sound/pci/cs5535audio/cs5535audio_pcm.c
+++ b/sound/pci/cs5535audio/cs5535audio_pcm.c
@@ -260,6 +260,9 @@ static int snd_cs5535audio_hw_params(struct snd_pcm_substream *substream,
         err = cs5535audio_build_dma_packets(cs5535au, dma, substream,
                                             params_periods(hw_params),
                                             params_period_bytes(hw_params));
+        if (!err)
+                dma->pcm_open_flag = 1;
+
         return err;
 }
 
@@ -268,6 +271,15 @@ static int snd_cs5535audio_hw_free(struct snd_pcm_substream *substream)
         struct cs5535audio *cs5535au = snd_pcm_substream_chip(substream);
         struct cs5535audio_dma *dma = substream->runtime->private_data;
 
+        if (dma->pcm_open_flag) {
+                if (substream == cs5535au->playback_substream)
+                        snd_ac97_update_power(cs5535au->ac97,
+                                        AC97_PCM_FRONT_DAC_RATE, 0);
+                else
+                        snd_ac97_update_power(cs5535au->ac97,
+                                        AC97_PCM_LR_ADC_RATE, 0);
+                dma->pcm_open_flag = 0;
+        }
         cs5535audio_clear_dma_packets(cs5535au, dma, substream);
         return snd_pcm_lib_free_pages(substream);
 }
@@ -351,11 +363,14 @@ static int snd_cs5535audio_capture_open(struct snd_pcm_substream *substream)
         if ((err = snd_pcm_hw_constraint_integer(runtime,
                                          SNDRV_PCM_HW_PARAM_PERIODS)) < 0)
                 return err;
+        olpc_capture_open(cs5535au->ac97);
         return 0;
 }
 
 static int snd_cs5535audio_capture_close(struct snd_pcm_substream *substream)
 {
+        struct cs5535audio *cs5535au = snd_pcm_substream_chip(substream);
+        olpc_capture_close(cs5535au->ac97);
         return 0;
 }