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

Commit 509768f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asoc-v3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound 

Pull ASoC sound updates from Mark Brown:
 "Takashi is travelling at the minute and it'd be good to get the
  MAINTAINERS update in here merged so sending directly.

  As well as the usual driver specifics we've got a couple of core fixes
  here, one fixing capabilities for unidirectional streams and the other
  fixing suspend while audio streams are active.

  The suspend fix is a little involved but mostly as a result of
  removing some special casing that was doing the wrong thing."

* tag 'asoc-v3.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound:
  ASoC: tlv320aic3x: Remove deadlock from snd_soc_dapm_put_volsw_aic3x()
  ASoC: dapm: Treat DAI widgets like AIF widgets for power
  ASoC: arizona: Correct AEC loopback enable
  ASoC: pcm: Require both CODEC and CPU support when declaring stream caps
  MAINTAINERS: Remove myself from Wolfson maintainers
  ASoC: wm8994: Ensure microphone detection state is reset on removal
  ASoC: wm8994: Avoid leaking pm_runtime reference on removed jack race
  ASoC: cs42l52: fix hp_gain_enum shift value.
  ASoC: cs42l52: use correct PCM mixer TLV dB scale to match datasheet.
parents 82ea4be6 902a75cd

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -9004,7 +9004,7 @@ S: Maintained 
F:	drivers/net/wireless/wl3501*



WM97XX TOUCHSCREEN DRIVERS

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

M:	Mark Brown <broonie@kernel.org>

M:	Liam Girdwood <lrg@slimlogic.co.uk>

L:	linux-input@vger.kernel.org

T:	git git://opensource.wolfsonmicro.com/linux-2.6-touch
@@ -9014,7 +9014,6 @@ F: drivers/input/touchscreen/*wm97* 
F:	include/linux/wm97xx.h



WOLFSON MICROELECTRONICS DRIVERS

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

L:	patches@opensource.wolfsonmicro.com

T:	git git://opensource.wolfsonmicro.com/linux-2.6-asoc

T:	git git://opensource.wolfsonmicro.com/linux-2.6-audioplus

include/sound/soc-dapm.h

+2 −1
Original line number Diff line number Diff line
@@ -450,7 +450,8 @@ enum snd_soc_dapm_type { 
	snd_soc_dapm_aif_in,		/* audio interface input */

	snd_soc_dapm_aif_out,		/* audio interface output */

	snd_soc_dapm_siggen,		/* signal generator */

	snd_soc_dapm_dai,		/* link to DAI structure */

	snd_soc_dapm_dai_in,		/* link to DAI structure */

	snd_soc_dapm_dai_out,

	snd_soc_dapm_dai_link,		/* link between two DAI structures */

};

sound/soc/codecs/cs42l52.c

+4 −2
Original line number Diff line number Diff line
@@ -193,6 +193,8 @@ static DECLARE_TLV_DB_SCALE(mic_tlv, 1600, 100, 0); 


static DECLARE_TLV_DB_SCALE(pga_tlv, -600, 50, 0);



static DECLARE_TLV_DB_SCALE(mix_tlv, -50, 50, 0);



static const unsigned int limiter_tlv[] = {

	TLV_DB_RANGE_HEAD(2),

	0, 2, TLV_DB_SCALE_ITEM(-3000, 600, 0),
@@ -260,7 +262,7 @@ static const char * const hp_gain_num_text[] = { 
};



static const struct soc_enum hp_gain_enum =

	SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 4,

	SOC_ENUM_SINGLE(CS42L52_PB_CTL1, 5,

		ARRAY_SIZE(hp_gain_num_text), hp_gain_num_text);



static const char * const beep_pitch_text[] = {
@@ -441,7 +443,7 @@ static const struct snd_kcontrol_new cs42l52_snd_controls[] = { 


	SOC_DOUBLE_R_SX_TLV("PCM Mixer Volume",

			    CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL,

				0, 0x7f, 0x19, hl_tlv),

				0, 0x7f, 0x19, mix_tlv),

	SOC_DOUBLE_R("PCM Mixer Switch",

		     CS42L52_PCMA_MIXER_VOL, CS42L52_PCMB_MIXER_VOL, 7, 1, 1),

sound/soc/codecs/tlv320aic3x.c

+5 −5
Original line number Diff line number Diff line
@@ -187,14 +187,14 @@ static int snd_soc_dapm_put_volsw_aic3x(struct snd_kcontrol *kcontrol, 


			break;

		}

	}



	mutex_unlock(&widget->codec->mutex);



	if (found)

		snd_soc_dapm_sync(widget->dapm);

	}



	ret = snd_soc_update_bits(widget->codec, reg, val_mask, val);



	mutex_unlock(&widget->codec->mutex);

	ret = snd_soc_update_bits_locked(widget->codec, reg, val_mask, val);

	return ret;

}

sound/soc/codecs/wm5102.c

+2 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,8 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 
ARIZONA_DSP_WIDGETS(DSP1, "DSP1"),



SND_SOC_DAPM_VALUE_MUX("AEC Loopback", ARIZONA_DAC_AEC_CONTROL_1,

		       ARIZONA_AEC_LOOPBACK_ENA, 0, &wm5102_aec_loopback_mux),

		       ARIZONA_AEC_LOOPBACK_ENA_SHIFT, 0,

		       &wm5102_aec_loopback_mux),



SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,