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

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

Pull sound fixes from Takashi Iwai:
 "A bunch of ASoC fixes with a few HD-audio fixes in this pull request.

  All fairly small, boring and device-specific fixes, in addition to
  MAINTAINERS update for better reviewing"

* tag 'sound-3.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/hdmi - apply Valleyview fix-ups to Cherryview display codec
  ALSA: hda/hdmi - set depop_delay for haswell plus
  ALSA: hda - restore the gpio led after resume
  ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co
  ASoC: pxa-ssp: drop SNDRV_PCM_FMTBIT_S24_LE
  ASoC: fsl-esai: Revert .xlate_tdm_slot_mask() support
  ASoC: mcasp: Fix implicit BLCK divider setting
  ASoC: arizona: Fix TDM slot length handling in arizona_hw_params
  ASoC: pcm512x: Correct Digital Playback control names
  ASoC: dapm: Fix uninitialized variable in snd_soc_dapm_get_enum_double()
  ASoC: Intel: Restore Baytrail ADSP streams only when ADSP was in reset
  ASoC: Intel: Wait Baytrail ADSP boot at resume_early stage
  ASoC: Intel: Merge Baytrail ADSP suspend_noirq into suspend_late
  MAINTAINERS: Add i.MX maintainers and paths to Freescale ASoC entry
  ASoC: Intel: Update Baytrail ADSP firmware name
parents 29fdd5ba ca2e7224

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -3843,10 +3843,13 @@ F: drivers/tty/serial/ucc_uart.c 


FREESCALE SOC SOUND DRIVERS

M:	Timur Tabi <timur@tabi.org>

M:	Nicolin Chen <nicoleotsuka@gmail.com>

M:	Xiubo Li <Li.Xiubo@freescale.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained

F:	sound/soc/fsl/fsl*

F:	sound/soc/fsl/imx*

F:	sound/soc/fsl/mpc8610_hpcd.c



FREEVXFS FILESYSTEM

sound/pci/hda/patch_hdmi.c

+7 −5
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info"); 
#define is_haswell_plus(codec) (is_haswell(codec) || is_broadwell(codec))



#define is_valleyview(codec) ((codec)->vendor_id == 0x80862882)

#define is_cherryview(codec) ((codec)->vendor_id == 0x80862883)

#define is_valleyview_plus(codec) (is_valleyview(codec) || is_cherryview(codec))



struct hdmi_spec_per_cvt {

	hda_nid_t cvt_nid;
@@ -1459,7 +1461,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, 
			    mux_idx);



	/* configure unused pins to choose other converters */

	if (is_haswell_plus(codec) || is_valleyview(codec))

	if (is_haswell_plus(codec) || is_valleyview_plus(codec))

		intel_not_share_assigned_cvt(codec, per_pin->pin_nid, mux_idx);



	snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid);
@@ -1598,7 +1600,8 @@ static bool hdmi_present_sense(struct hdmi_spec_per_pin *per_pin, int repoll) 
		 *   and this can make HW reset converter selection on a pin.

		 */

		if (eld->eld_valid && !old_eld_valid && per_pin->setup) {

			if (is_haswell_plus(codec) || is_valleyview(codec)) {

			if (is_haswell_plus(codec) ||

				is_valleyview_plus(codec)) {

				intel_verify_pin_cvt_connect(codec, per_pin);

				intel_not_share_assigned_cvt(codec, pin_nid,

							per_pin->mux_idx);
@@ -1779,7 +1782,7 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, 
	bool non_pcm;

	int pinctl;



	if (is_haswell_plus(codec) || is_valleyview(codec)) {

	if (is_haswell_plus(codec) || is_valleyview_plus(codec)) {

		/* Verify pin:cvt selections to avoid silent audio after S3.

		 * After S3, the audio driver restores pin:cvt selections

		 * but this can happen before gfx is ready and such selection
@@ -2330,9 +2333,8 @@ static int patch_generic_hdmi(struct hda_codec *codec) 
		intel_haswell_fixup_enable_dp12(codec);

	}



	if (is_haswell(codec) || is_valleyview(codec)) {

	if (is_haswell_plus(codec) || is_valleyview_plus(codec))

		codec->depop_delay = 0;

	}



	if (hdmi_parse_codec(codec) < 0) {

		codec->spec = NULL;

sound/pci/hda/patch_realtek.c

+21 −5
Original line number Diff line number Diff line
@@ -181,6 +181,8 @@ static void alc_fix_pll(struct hda_codec *codec) 
			    spec->pll_coef_idx);

	val = snd_hda_codec_read(codec, spec->pll_nid, 0,

				 AC_VERB_GET_PROC_COEF, 0);

	if (val == -1)

		return;

	snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_COEF_INDEX,

			    spec->pll_coef_idx);

	snd_hda_codec_write(codec, spec->pll_nid, 0, AC_VERB_SET_PROC_COEF,
@@ -2806,6 +2808,8 @@ static void alc286_shutup(struct hda_codec *codec) 
static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up)

{

	int val = alc_read_coef_idx(codec, 0x04);

	if (val == -1)

		return;

	if (power_up)

		val |= 1 << 11;

	else
@@ -3264,6 +3268,15 @@ static int alc269_resume(struct hda_codec *codec) 
	snd_hda_codec_resume_cache(codec);

	alc_inv_dmic_sync(codec, true);

	hda_call_check_power_status(codec, 0x01);



	/* on some machine, the BIOS will clear the codec gpio data when enter

	 * suspend, and won't restore the data after resume, so we restore it

	 * in the driver.

	 */

	if (spec->gpio_led)

		snd_hda_codec_write(codec, codec->afg, 0, AC_VERB_SET_GPIO_DATA,

			    spec->gpio_led);



	if (spec->has_alc5505_dsp)

		alc5505_dsp_resume(codec);
@@ -5311,26 +5324,29 @@ static void alc269_fill_coef(struct hda_codec *codec) 
	if ((alc_get_coef0(codec) & 0x00ff) == 0x017) {

		val = alc_read_coef_idx(codec, 0x04);

		/* Power up output pin */

		if (val != -1)

			alc_write_coef_idx(codec, 0x04, val | (1<<11));

	}



	if ((alc_get_coef0(codec) & 0x00ff) == 0x018) {

		val = alc_read_coef_idx(codec, 0xd);

		if ((val & 0x0c00) >> 10 != 0x1) {

		if (val != -1 && (val & 0x0c00) >> 10 != 0x1) {

			/* Capless ramp up clock control */

			alc_write_coef_idx(codec, 0xd, val | (1<<10));

		}

		val = alc_read_coef_idx(codec, 0x17);

		if ((val & 0x01c0) >> 6 != 0x4) {

		if (val != -1 && (val & 0x01c0) >> 6 != 0x4) {

			/* Class D power on reset */

			alc_write_coef_idx(codec, 0x17, val | (1<<7));

		}

	}



	val = alc_read_coef_idx(codec, 0xd); /* Class D */

	if (val != -1)

		alc_write_coef_idx(codec, 0xd, val | (1<<14));



	val = alc_read_coef_idx(codec, 0x4); /* HP */

	if (val != -1)

		alc_write_coef_idx(codec, 0x4, val | (1<<11));

}

sound/soc/codecs/arizona.c

+4 −2
Original line number Diff line number Diff line
@@ -1278,6 +1278,8 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	else

		rates = &arizona_48k_bclk_rates[0];



	wl = snd_pcm_format_width(params_format(params));



	if (tdm_slots) {

		arizona_aif_dbg(dai, "Configuring for %d %d bit TDM slots\n",

				tdm_slots, tdm_width);
@@ -1285,6 +1287,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
		channels = tdm_slots;

	} else {

		bclk_target = snd_soc_params_to_bclk(params);

		tdm_width = wl;

	}



	if (chan_limit && chan_limit < channels) {
@@ -1319,8 +1322,7 @@ static int arizona_hw_params(struct snd_pcm_substream *substream, 
	arizona_aif_dbg(dai, "BCLK %dHz LRCLK %dHz\n",

			rates[bclk], rates[bclk] / lrclk);



	wl = snd_pcm_format_width(params_format(params));

	frame = wl << ARIZONA_AIF1TX_WL_SHIFT | wl;

	frame = wl << ARIZONA_AIF1TX_WL_SHIFT | tdm_width;



	reconfig = arizona_aif_cfg_changed(codec, base, bclk, lrclk, frame);

sound/soc/codecs/pcm512x.c

+2 −2
Original line number Diff line number Diff line
@@ -259,13 +259,13 @@ static const struct soc_enum pcm512x_veds = 
			pcm512x_ramp_step_text);



static const struct snd_kcontrol_new pcm512x_controls[] = {

SOC_DOUBLE_R_TLV("Playback Digital Volume", PCM512x_DIGITAL_VOLUME_2,

SOC_DOUBLE_R_TLV("Digital Playback Volume", PCM512x_DIGITAL_VOLUME_2,

		 PCM512x_DIGITAL_VOLUME_3, 0, 255, 1, digital_tlv),

SOC_DOUBLE_TLV("Playback Volume", PCM512x_ANALOG_GAIN_CTRL,

	       PCM512x_LAGN_SHIFT, PCM512x_RAGN_SHIFT, 1, 1, analog_tlv),

SOC_DOUBLE_TLV("Playback Boost Volume", PCM512x_ANALOG_GAIN_BOOST,

	       PCM512x_AGBL_SHIFT, PCM512x_AGBR_SHIFT, 1, 0, boost_tlv),

SOC_DOUBLE("Playback Digital Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,

SOC_DOUBLE("Digital Playback Switch", PCM512x_MUTE, PCM512x_RQML_SHIFT,

	   PCM512x_RQMR_SHIFT, 1, 1),



SOC_SINGLE("Deemphasis Switch", PCM512x_DSP, PCM512x_DEMP_SHIFT, 1, 1),

CRA Git | Maintained and supported by SUSTech CRA and CCSE