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

Commit 22e978f1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Slightly a high amount of commits come from Adrian Knoth's HDSPM
  driver fixes.  Other than that, all small trival fixes or quirks that
  are pretty driver-specific."

* tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: wm8994: Only enable extra BCLK cycles when required
  ALSA: als3000: check for the kzalloc return value
  ALSA: sound/isa/opti9xx/miro.c: eliminate possible double free
  ALSA: hda - Fix silent headphone output from Toshiba P200
  ALSA: hdspm - Fix coding style in CTL_ELEM macros
  ALSA: hdspm - Fix typo in kcontrol element on RME MADI cards
  ALSA: hdspm - Fix sync_in detection on AES/AES32
  ALSA: hdspm - Fix sync_in reporting on RME MADI cards
  ALSA: hdspm - Also report autosync_sample_rate on MADI and MADIface
  ALSA: hdspm - Fix reported autosync_sample_rate
  ALSA: hdspm - Fix sync check reporting on all RME HDSPM cards
  ALSA: hdspm - Report external rate in slave mode on PCI MADI
  ALSA: hdspm - Allow DDS/Varispeed to be set from userspace
  ALSA: hda - add dock support for Thinkpad T430
  ASoC: ux500_msp_i2s: Fix devm_* and return code merge error
  ASoC: Ux500: Dispose of device nodes correctly
parents ef48bfd6 c64064ce

sound/isa/opti9xx/miro.c

+0 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,6 @@ static int __devinit snd_miro_probe(struct snd_card *card) 


	error = snd_card_miro_aci_detect(card, miro);

	if (error < 0) {

		snd_card_free(card);

		snd_printk(KERN_ERR "unable to detect aci chip\n");

		return -ENODEV;

	}

sound/pci/als300.c

+4 −0
Original line number Diff line number Diff line
@@ -394,6 +394,8 @@ static int snd_als300_playback_open(struct snd_pcm_substream *substream) 
	struct snd_als300_substream_data *data = kzalloc(sizeof(*data),

								GFP_KERNEL);



	if (!data)

		return -ENOMEM;

	snd_als300_dbgcallenter();

	chip->playback_substream = substream;

	runtime->hw = snd_als300_playback_hw;
@@ -425,6 +427,8 @@ static int snd_als300_capture_open(struct snd_pcm_substream *substream) 
	struct snd_als300_substream_data *data = kzalloc(sizeof(*data),

								GFP_KERNEL);



	if (!data)

		return -ENOMEM;

	snd_als300_dbgcallenter();

	chip->capture_substream = substream;

	runtime->hw = snd_als300_capture_hw;

sound/pci/hda/patch_realtek.c

+19 −1
Original line number Diff line number Diff line
@@ -5677,6 +5677,7 @@ static const struct hda_verb alc268_beep_init_verbs[] = { 


enum {

	ALC268_FIXUP_INV_DMIC,

	ALC268_FIXUP_HP_EAPD,

};



static const struct alc_fixup alc268_fixups[] = {
@@ -5684,10 +5685,26 @@ static const struct alc_fixup alc268_fixups[] = { 
		.type = ALC_FIXUP_FUNC,

		.v.func = alc_fixup_inv_dmic_0x12,

	},

	[ALC268_FIXUP_HP_EAPD] = {

		.type = ALC_FIXUP_VERBS,

		.v.verbs = (const struct hda_verb[]) {

			{0x15, AC_VERB_SET_EAPD_BTLENABLE, 0},

			{}

		}

	},

};



static const struct alc_model_fixup alc268_fixup_models[] = {

	{.id = ALC268_FIXUP_INV_DMIC, .name = "inv-dmic"},

	{.id = ALC268_FIXUP_HP_EAPD, .name = "hp-eapd"},

	{}

};



static const struct snd_pci_quirk alc268_fixup_tbl[] = {

	/* below is codec SSID since multiple Toshiba laptops have the

	 * same PCI SSID 1179:ff00

	 */

	SND_PCI_QUIRK(0x1179, 0xff06, "Toshiba P200", ALC268_FIXUP_HP_EAPD),

	{}

};
@@ -5722,7 +5739,7 @@ static int patch_alc268(struct hda_codec *codec) 


	spec = codec->spec;



	alc_pick_fixup(codec, alc268_fixup_models, NULL, alc268_fixups);

	alc_pick_fixup(codec, alc268_fixup_models, alc268_fixup_tbl, alc268_fixups);

	alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);



	/* automatic parse from the BIOS config */
@@ -6188,6 +6205,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x21e9, "Thinkpad Edge 15", ALC269_FIXUP_SKU_IGNORE),

	SND_PCI_QUIRK(0x17aa, 0x21f6, "Thinkpad T530", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x21fa, "Thinkpad X230", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x21f3, "Thinkpad T430", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x21fb, "Thinkpad T430s", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x2203, "Thinkpad X230 Tablet", ALC269_FIXUP_LENOVO_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x3bf8, "Quanta FL1", ALC269_FIXUP_PCM_44K),

sound/pci/rme9652/hdspm.c

+139 −95
Original line number Diff line number Diff line
@@ -971,6 +971,7 @@ static inline void snd_hdspm_initialize_midi_flush(struct hdspm *hdspm); 
static int hdspm_update_simple_mixer_controls(struct hdspm *hdspm);

static int hdspm_autosync_ref(struct hdspm *hdspm);

static int snd_hdspm_set_defaults(struct hdspm *hdspm);

static int hdspm_system_clock_mode(struct hdspm *hdspm);

static void hdspm_set_sgbuf(struct hdspm *hdspm,

			    struct snd_pcm_substream *substream,

			     unsigned int reg, int channels);
@@ -1989,10 +1990,14 @@ static int hdspm_get_system_sample_rate(struct hdspm *hdspm) 
	rate = hdspm_calc_dds_value(hdspm, period);



	if (rate > 207000) {

		/* Unreasonable high sample rate as seen on PCI MADI cards.

		 * Use the cached value instead.

		 */

		/* Unreasonable high sample rate as seen on PCI MADI cards. */

		if (0 == hdspm_system_clock_mode(hdspm)) {

			/* master mode, return internal sample rate */

			rate = hdspm->system_sample_rate;

		} else {

			/* slave mode, return external sample rate */

			rate = hdspm_external_sample_rate(hdspm);

		}

	}



	return rate;
@@ -2003,8 +2008,10 @@ static int hdspm_get_system_sample_rate(struct hdspm *hdspm) 
{	.iface = SNDRV_CTL_ELEM_IFACE_MIXER, \

	.name = xname, \

	.index = xindex, \

  .access = SNDRV_CTL_ELEM_ACCESS_READ, \

	.access = SNDRV_CTL_ELEM_ACCESS_READWRITE |\

		SNDRV_CTL_ELEM_ACCESS_VOLATILE, \

	.info = snd_hdspm_info_system_sample_rate, \

	.put = snd_hdspm_put_system_sample_rate, \

	.get = snd_hdspm_get_system_sample_rate \

}
@@ -2030,6 +2037,16 @@ static int snd_hdspm_get_system_sample_rate(struct snd_kcontrol *kcontrol, 
	return 0;

}



static int snd_hdspm_put_system_sample_rate(struct snd_kcontrol *kcontrol,

					    struct snd_ctl_elem_value *

					    ucontrol)

{

	struct hdspm *hdspm = snd_kcontrol_chip(kcontrol);



	hdspm_set_dds_value(hdspm, ucontrol->value.enumerated.item[0]);

	return 0;

}





/**

 * Returns the WordClock sample rate class for the given card.
@@ -2163,6 +2180,7 @@ static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol, 
				hdspm_get_s1_sample_rate(hdspm,

						kcontrol->private_value-1);

		}

		break;



	case AIO:

		switch (kcontrol->private_value) {
@@ -2183,6 +2201,7 @@ static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol, 
				hdspm_get_s1_sample_rate(hdspm,

						ucontrol->id.index-1);

		}

		break;



	case AES32:
@@ -2204,8 +2223,23 @@ static int snd_hdspm_get_autosync_sample_rate(struct snd_kcontrol *kcontrol, 
				hdspm_get_s1_sample_rate(hdspm,

						kcontrol->private_value-1);

			break;

		}

		break;



	case MADI:

	case MADIface:

		{

			int rate = hdspm_external_sample_rate(hdspm);

			int i, selected_rate = 0;

			for (i = 1; i < 10; i++)

				if (HDSPM_bit2freq(i) == rate) {

					selected_rate = i;

					break;

				}

			ucontrol->value.enumerated.item[0] = selected_rate;

		}

		break;



	default:

		break;

	}
@@ -3851,12 +3885,17 @@ static int hdspm_sync_in_sync_check(struct hdspm *hdspm) 
		break;



	case MADI:

	case AES32:

		status = hdspm_read(hdspm, HDSPM_statusRegister2);

		status = hdspm_read(hdspm, HDSPM_statusRegister);

		lock = (status & HDSPM_syncInLock) ? 1 : 0;

		sync = (status & HDSPM_syncInSync) ? 1 : 0;

		break;



	case AES32:

		status = hdspm_read(hdspm, HDSPM_statusRegister2);

		lock = (status & 0x100000) ? 1 : 0;

		sync = (status & 0x200000) ? 1 : 0;

		break;



	case MADIface:

		break;

	}
@@ -3942,6 +3981,7 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol, 
		default:

			val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1);

		}

		break;



	case AIO:

		switch (kcontrol->private_value) {
@@ -3954,6 +3994,7 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol, 
		default:

			val = hdspm_s1_sync_check(hdspm, ucontrol->id.index-1);

		}

		break;



	case MADI:

		switch (kcontrol->private_value) {
@@ -3966,6 +4007,7 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol, 
		case 3: /* SYNC_IN */

			val = hdspm_sync_in_sync_check(hdspm); break;

		}

		break;



	case MADIface:

		val = hdspm_madi_sync_check(hdspm); /* MADI */
@@ -3983,6 +4025,7 @@ static int snd_hdspm_get_sync_check(struct snd_kcontrol *kcontrol, 
			 val = hdspm_aes_sync_check(hdspm,

					 kcontrol->private_value-1);

		}

		break;



	}
@@ -4427,9 +4470,10 @@ static struct snd_kcontrol_new snd_hdspm_controls_madi[] = { 
	HDSPM_PREF_SYNC_REF("Preferred Sync Reference", 0),

	HDSPM_AUTOSYNC_REF("AutoSync Reference", 0),

	HDSPM_SYSTEM_SAMPLE_RATE("System Sample Rate", 0),

	HDSPM_AUTOSYNC_SAMPLE_RATE("External Rate", 0),

	HDSPM_SYNC_CHECK("WC SyncCheck", 0),

	HDSPM_SYNC_CHECK("MADI SyncCheck", 1),

	HDSPM_SYNC_CHECK("TCO SyncCHeck", 2),

	HDSPM_SYNC_CHECK("TCO SyncCheck", 2),

	HDSPM_SYNC_CHECK("SYNC IN SyncCheck", 3),

	HDSPM_LINE_OUT("Line Out", 0),

	HDSPM_TX_64("TX 64 channels mode", 0),

sound/soc/codecs/wm8994.c

+17 −1
Original line number Diff line number Diff line
@@ -1045,6 +1045,7 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w, 
		      struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = w->codec;

	struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec);

	struct wm8994 *control = codec->control_data;

	int mask = WM8994_AIF1DAC1L_ENA | WM8994_AIF1DAC1R_ENA;

	int i;
@@ -1063,6 +1064,10 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w, 


	switch (event) {

	case SND_SOC_DAPM_PRE_PMU:

		/* Don't enable timeslot 2 if not in use */

		if (wm8994->channels[0] <= 2)

			mask &= ~(WM8994_AIF1DAC2L_ENA | WM8994_AIF1DAC2R_ENA);



		val = snd_soc_read(codec, WM8994_AIF1_CONTROL_1);

		if ((val & WM8994_AIF1ADCL_SRC) &&

		    (val & WM8994_AIF1ADCR_SRC))
@@ -2687,7 +2692,7 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	bclk_rate = params_rate(params) * 4;

	bclk_rate = params_rate(params);

	switch (params_format(params)) {

	case SNDRV_PCM_FORMAT_S16_LE:

		bclk_rate *= 16;
@@ -2708,6 +2713,17 @@ static int wm8994_hw_params(struct snd_pcm_substream *substream, 
		return -EINVAL;

	}



	wm8994->channels[id] = params_channels(params);

	switch (params_channels(params)) {

	case 1:

	case 2:

		bclk_rate *= 2;

		break;

	default:

		bclk_rate *= 4;

		break;

	}



	/* Try to find an appropriate sample rate; look for an exact match. */

	for (i = 0; i < ARRAY_SIZE(srs); i++)

		if (srs[i].rate == params_rate(params))