Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (264 commits)
  [ALSA] version 1.0.15
  [ALSA] Fix thinko in cs4231 mce down check
  [ALSA] sun-cs4231: improved waiting after MCE down
  [ALSA] sun-cs4231: use cs4231-regs.h
  [ALSA] This simplifies and fixes waiting loops of the mce_down()
  [ALSA] This patch adds support for a wavetable chip on
  [ALSA] This patch removes open_mutex from the ad1848-lib as
  [ALSA] fix bootup crash in snd_gus_interrupt()
  [ALSA] hda-codec - Fix SKU ID function for realtek codecs
  [ALSA] Support  ASUS P701 eeepc [0x1043 0x82a1] support
  [ALSA] hda-codec - Add array terminator for dmic in STAC codec
  [ALSA] hdsp - Fix zero division
  [ALSA] usb-audio - Fix double comment
  [ALSA] hda-codec - Fix STAC922x volume knob control
  [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
  [ALSA] hda-codec - Fix for Fujitsu Lifebook C1410
  [ALSA] mpu-401: remove MPU401_INFO_UART_ONLY flag
  [ALSA] mpu-401: do not require an ACK byte for the ENTER_UART command
  [ALSA] via82xx - Add DXS quirk for Shuttle AK31v2
  [ALSA] hda-codec - Fix input_mux numbers for vaio stac92xx
  ...

1 files changed, 48 insertions, 108 deletions

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index 4d8e8af5c819..080e3001d9c5 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -311,23 +311,6 @@ static void conexant_free(struct hda_codec *codec)
         kfree(codec->spec);
 }
 
-#ifdef CONFIG_PM
-static int conexant_resume(struct hda_codec *codec)
-{
-        struct conexant_spec *spec = codec->spec;
-        int i;
-
-        codec->patch_ops.init(codec);
-        for (i = 0; i < spec->num_mixers; i++)
-                snd_hda_resume_ctls(codec, spec->mixers[i]);
-        if (spec->multiout.dig_out_nid)
-                snd_hda_resume_spdif_out(codec);
-        if (spec->dig_in_nid)
-                snd_hda_resume_spdif_in(codec);
-        return 0;
-}
-#endif
-
 static int conexant_build_controls(struct hda_codec *codec)
 {
         struct conexant_spec *spec = codec->spec;
@@ -358,9 +341,6 @@ static struct hda_codec_ops conexant_patch_ops = {
         .build_pcms = conexant_build_pcms,
         .init = conexant_init,
         .free = conexant_free,
-#ifdef CONFIG_PM
-        .resume = conexant_resume,
-#endif
 };
 
 /*
@@ -368,15 +348,7 @@ static struct hda_codec_ops conexant_patch_ops = {
  * the private value = nid | (invert << 8)
  */
 
-static int cxt_eapd_info(struct snd_kcontrol *kcontrol,
-                              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;
-}
+#define cxt_eapd_info           snd_ctl_boolean_mono_info
 
 static int cxt_eapd_get(struct snd_kcontrol *kcontrol,
                              struct snd_ctl_elem_value *ucontrol)
@@ -404,13 +376,13 @@ static int cxt_eapd_put(struct snd_kcontrol *kcontrol,
         eapd = ucontrol->value.integer.value[0];
         if (invert)
                 eapd = !eapd;
-        if (eapd == spec->cur_eapd && !codec->in_resume)
+        if (eapd == spec->cur_eapd)
                 return 0;
         
         spec->cur_eapd = eapd;
-        snd_hda_codec_write(codec, nid,
-                            0, AC_VERB_SET_EAPD_BTLENABLE,
-                            eapd ? 0x02 : 0x00);
+        snd_hda_codec_write_cache(codec, nid,
+                                  0, AC_VERB_SET_EAPD_BTLENABLE,
+                                  eapd ? 0x02 : 0x00);
         return 1;
 }
 
@@ -500,34 +472,25 @@ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         /* toggle internal speakers mute depending of presence of
          * the headphone jack
          */
-        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 
-        bits = spec->cur_eapd ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x11, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         return 1;
 }
 
 /* bind volumes of both NID 0x10 and 0x11 */
-static int cxt5045_hp_master_vol_put(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x11, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x11, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls cxt5045_hp_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x11, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* toggle input of built-in and mic jack appropriately */
 static void cxt5045_hp_automic(struct hda_codec *codec)
@@ -562,9 +525,9 @@ static void cxt5045_hp_automute(struct hda_codec *codec)
         spec->hp_present = snd_hda_codec_read(codec, 0x11, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
-        bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0; 
-        snd_hda_codec_amp_update(codec, 0x10, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x10, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0; 
+        snd_hda_codec_amp_stereo(codec, 0x10, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* unsolicited event for HP jack sensing */
@@ -595,14 +558,7 @@ static struct snd_kcontrol_new cxt5045_mixers[] = {
         HDA_CODEC_MUTE("Int Mic Switch", 0x1a, 0x01, HDA_INPUT),
         HDA_CODEC_VOLUME("Ext Mic Volume", 0x1a, 0x02, HDA_INPUT),
         HDA_CODEC_MUTE("Ext Mic Switch", 0x1a, 0x02, HDA_INPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = cxt5045_hp_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x10, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",
@@ -915,33 +871,24 @@ static int cxt5047_hp_master_sw_put(struct snd_kcontrol *kcontrol,
         /* toggle internal speakers mute depending of presence of
          * the headphone jack
          */
-        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
-        bits = spec->cur_eapd ? 0 : 0x80;
-        snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (!spec->hp_present && spec->cur_eapd) ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
+        bits = spec->cur_eapd ? 0 : HDA_AMP_MUTE;
+        snd_hda_codec_amp_stereo(codec, 0x13, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         return 1;
 }
 
 /* bind volumes of both NID 0x13 (Headphones) and 0x1d (Speakers) */
-static int cxt5047_hp_master_vol_put(struct snd_kcontrol *kcontrol,
-                                     struct snd_ctl_elem_value *ucontrol)
-{
-        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
-        long *valp = ucontrol->value.integer.value;
-        int change;
-
-        change = snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0,
-                                          0x7f, valp[0] & 0x7f);
-        change |= snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0,
-                                           0x7f, valp[1] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x13, 0, HDA_OUTPUT, 0,
-                                 0x7f, valp[0] & 0x7f);
-        snd_hda_codec_amp_update(codec, 0x13, 1, HDA_OUTPUT, 0,
-                                 0x7f, valp[1] & 0x7f);
-        return change;
-}
+static struct hda_bind_ctls cxt5047_bind_master_vol = {
+        .ops = &snd_hda_bind_vol,
+        .values = {
+                HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
+                HDA_COMPOSE_AMP_VAL(0x1d, 3, 0, HDA_OUTPUT),
+                0
+        },
+};
 
 /* mute internal speaker if HP is plugged */
 static void cxt5047_hp_automute(struct hda_codec *codec)
@@ -952,12 +899,12 @@ static void cxt5047_hp_automute(struct hda_codec *codec)
         spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
-        bits = (spec->hp_present || !spec->cur_eapd) ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = (spec->hp_present || !spec->cur_eapd) ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         /* Mute/Unmute PCM 2 for good measure - some systems need this */
-        snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits);
+        snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* mute internal speaker if HP is plugged */
@@ -969,12 +916,12 @@ static void cxt5047_hp2_automute(struct hda_codec *codec)
         spec->hp_present = snd_hda_codec_read(codec, 0x13, 0,
                                      AC_VERB_GET_PIN_SENSE, 0) & 0x80000000;
 
-        bits = spec->hp_present ? 0x80 : 0;
-        snd_hda_codec_amp_update(codec, 0x1d, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1d, 1, HDA_OUTPUT, 0, 0x80, bits);
+        bits = spec->hp_present ? HDA_AMP_MUTE : 0;
+        snd_hda_codec_amp_stereo(codec, 0x1d, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
         /* Mute/Unmute PCM 2 for good measure - some systems need this */
-        snd_hda_codec_amp_update(codec, 0x1c, 0, HDA_OUTPUT, 0, 0x80, bits);
-        snd_hda_codec_amp_update(codec, 0x1c, 1, HDA_OUTPUT, 0, 0x80, bits);
+        snd_hda_codec_amp_stereo(codec, 0x1c, HDA_OUTPUT, 0,
+                                 HDA_AMP_MUTE, bits);
 }
 
 /* toggle input of built-in and mic jack appropriately */
@@ -1063,14 +1010,7 @@ static struct snd_kcontrol_new cxt5047_toshiba_mixers[] = {
         HDA_CODEC_MUTE("Capture Switch", 0x12, 0x03, HDA_INPUT),
         HDA_CODEC_VOLUME("PCM Volume", 0x10, 0x00, HDA_OUTPUT),
         HDA_CODEC_MUTE("PCM Switch", 0x10, 0x00, HDA_OUTPUT),
-        {
-                .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
-                .name = "Master Playback Volume",
-                .info = snd_hda_mixer_amp_volume_info,
-                .get = snd_hda_mixer_amp_volume_get,
-                .put = cxt5047_hp_master_vol_put,
-                .private_value = HDA_COMPOSE_AMP_VAL(0x13, 3, 0, HDA_OUTPUT),
-        },
+        HDA_BIND_VOL("Master Playback Volume", &cxt5047_bind_master_vol),
         {
                 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
                 .name = "Master Playback Switch",