Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b724cc19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A few last-minute regression fixes for 3.4 final kernel.  All trivial,
  and Cc'ed to stable kernel."

* tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: wm8994: Fix AIF2ADC power down
  ALSA: hda/idt - Fix power-map for speaker-pins with some HP laptops
  ASoC: cs42l73: Sync digital mixer kcontrols to allow for 0dB
parents f8fc341b 21363cf0

sound/pci/hda/patch_sigmatel.c

+3 −3
Original line number Diff line number Diff line
@@ -4415,8 +4415,8 @@ static int stac92xx_init(struct hda_codec *codec) 
		def_conf = get_defcfg_connect(def_conf);

		/* skip any ports that don't have jacks since presence

 		 * detection is useless */

		if (def_conf != AC_JACK_PORT_COMPLEX) {

			if (def_conf != AC_JACK_PORT_NONE)

		if (def_conf != AC_JACK_PORT_NONE &&

		    !is_jack_detectable(codec, nid)) {

			stac_toggle_power_map(codec, nid, 1);

			continue;

		}

sound/soc/codecs/cs42l73.c

+8 −8
Original line number Diff line number Diff line
@@ -568,22 +568,22 @@ static const struct snd_kcontrol_new cs42l73_snd_controls[] = { 
			attn_tlv),



	SOC_SINGLE_TLV("SPK-IP Mono Volume",

			CS42L73_SPKMIPMA, 0, 0x3E, 1, attn_tlv),

			CS42L73_SPKMIPMA, 0, 0x3F, 1, attn_tlv),

	SOC_SINGLE_TLV("SPK-XSP Mono Volume",

			CS42L73_SPKMXSPA, 0, 0x3E, 1, attn_tlv),

			CS42L73_SPKMXSPA, 0, 0x3F, 1, attn_tlv),

	SOC_SINGLE_TLV("SPK-ASP Mono Volume",

			CS42L73_SPKMASPA, 0, 0x3E, 1, attn_tlv),

			CS42L73_SPKMASPA, 0, 0x3F, 1, attn_tlv),

	SOC_SINGLE_TLV("SPK-VSP Mono Volume",

			CS42L73_SPKMVSPMA, 0, 0x3E, 1, attn_tlv),

			CS42L73_SPKMVSPMA, 0, 0x3F, 1, attn_tlv),



	SOC_SINGLE_TLV("ESL-IP Mono Volume",

			CS42L73_ESLMIPMA, 0, 0x3E, 1, attn_tlv),

			CS42L73_ESLMIPMA, 0, 0x3F, 1, attn_tlv),

	SOC_SINGLE_TLV("ESL-XSP Mono Volume",

			CS42L73_ESLMXSPA, 0, 0x3E, 1, attn_tlv),

			CS42L73_ESLMXSPA, 0, 0x3F, 1, attn_tlv),

	SOC_SINGLE_TLV("ESL-ASP Mono Volume",

			CS42L73_ESLMASPA, 0, 0x3E, 1, attn_tlv),

			CS42L73_ESLMASPA, 0, 0x3F, 1, attn_tlv),

	SOC_SINGLE_TLV("ESL-VSP Mono Volume",

			CS42L73_ESLMVSPMA, 0, 0x3E, 1, attn_tlv),

			CS42L73_ESLMVSPMA, 0, 0x3F, 1, attn_tlv),



	SOC_ENUM("IP Digital Swap/Mono Select", ip_swap_enum),

sound/soc/codecs/wm8994.c

+1 −1
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w, 
		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

				    WM8994_AIF2DACL_ENA |

				    WM8994_AIF2DACR_ENA, 0);

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_5,

		snd_soc_update_bits(codec, WM8994_POWER_MANAGEMENT_4,

				    WM8994_AIF2ADCL_ENA |

				    WM8994_AIF2ADCR_ENA, 0);