Commit 676fc8de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "The regular "bump-in-the-middle" updates, containing mostly ASoC-
  related fixes at this time. All changes are reasonably small.

  A few entries are for ASoC and ALSA core parts (DAPM, PCM, topology)
  for followups of the recent changes and potential buffer overflow by
  snprintf(), while the rest are (both new and old) device-specific
  fixes for Intel, meson, tas2562, rt1015, as well as the usual HD-audio
  quirks"

* tag 'sound-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (25 commits)
  ALSA: sgio2audio: Remove usage of dropped hw_params/hw_free functions
  ALSA: hda/realtek - Enable the headset of ASUS B9450FA with ALC294
  ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master
  ALSA: hda/realtek - Add Headset Button supported for ThinkPad X1
  ALSA: hda/realtek - Add Headset Mic supported
  ASoC: wm8741: Fix typo in Kconfig prompt
  ASoC: stm32: sai: manage rebind issue
  ASoC: SOF: Fix snd_sof_ipc_stream_posn()
  ASoC: rt1015: modify pre-divider for sysclk
  ASoC: rt1015: add operation callback function for rt1015_dai[]
  ASoC: soc-component: tidyup snd_soc_pcm_component_sync_stop()
  ASoC: dapm: Correct DAPM handling of active widgets during shutdown
  ASoC: tas2562: Fix sample rate error message
  ASoC: Intel: Skylake: Fix available clock counter incrementation
  ASoC: soc-pcm/soc-compress: don't use snd_soc_dapm_stream_stop()
  ASoC: meson: g12a: add tohdmitx reset
  ASoC: pcm512x: Fix unbalanced regulator enable call in probe error path
  ASoC: soc-core: fix for_rtd_codec_dai_rollback() macro
  ASoC: topology: Fix memleak in soc_tplg_manifest_load()
  ASoC: topology: Fix memleak in soc_tplg_link_elems_load()
  ...
parents 63849c8f 5a56996b

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -1157,7 +1157,7 @@ struct snd_soc_pcm_runtime { 
	     ((i) < rtd->num_codecs) && ((dai) = rtd->codec_dais[i]); \

	     (i)++)

#define for_each_rtd_codec_dai_rollback(rtd, i, dai)		\

	for (; ((--i) >= 0) && ((dai) = rtd->codec_dais[i]);)

	for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);)



void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd);

sound/mips/sgio2audio.c

+0 −6
Original line number Diff line number Diff line
@@ -649,8 +649,6 @@ snd_sgio2audio_pcm_pointer(struct snd_pcm_substream *substream) 
static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = {

	.open =        snd_sgio2audio_playback1_open,

	.close =       snd_sgio2audio_pcm_close,

	.hw_params =   snd_sgio2audio_pcm_hw_params,

	.hw_free =     snd_sgio2audio_pcm_hw_free,

	.prepare =     snd_sgio2audio_pcm_prepare,

	.trigger =     snd_sgio2audio_pcm_trigger,

	.pointer =     snd_sgio2audio_pcm_pointer,
@@ -659,8 +657,6 @@ static const struct snd_pcm_ops snd_sgio2audio_playback1_ops = { 
static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = {

	.open =        snd_sgio2audio_playback2_open,

	.close =       snd_sgio2audio_pcm_close,

	.hw_params =   snd_sgio2audio_pcm_hw_params,

	.hw_free =     snd_sgio2audio_pcm_hw_free,

	.prepare =     snd_sgio2audio_pcm_prepare,

	.trigger =     snd_sgio2audio_pcm_trigger,

	.pointer =     snd_sgio2audio_pcm_pointer,
@@ -669,8 +665,6 @@ static const struct snd_pcm_ops snd_sgio2audio_playback2_ops = { 
static const struct snd_pcm_ops snd_sgio2audio_capture_ops = {

	.open =        snd_sgio2audio_capture_open,

	.close =       snd_sgio2audio_pcm_close,

	.hw_params =   snd_sgio2audio_pcm_hw_params,

	.hw_free =     snd_sgio2audio_pcm_hw_free,

	.prepare =     snd_sgio2audio_pcm_prepare,

	.trigger =     snd_sgio2audio_pcm_trigger,

	.pointer =     snd_sgio2audio_pcm_pointer,

sound/pci/hda/patch_realtek.c

+27 −4
Original line number Diff line number Diff line
@@ -2447,6 +2447,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1071, 0x8258, "Evesham Voyaeger", ALC882_FIXUP_EAPD),

	SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),

	SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),

	SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1462, 0x1276, "MSI-GL73", ALC1220_FIXUP_CLEVO_P950),

	SND_PCI_QUIRK(0x1462, 0x1293, "MSI-GP65", ALC1220_FIXUP_CLEVO_P950),
@@ -5920,7 +5921,8 @@ enum { 
	ALC289_FIXUP_DUAL_SPK,

	ALC294_FIXUP_SPK2_TO_DAC1,

	ALC294_FIXUP_ASUS_DUAL_SPK,



	ALC285_FIXUP_THINKPAD_HEADSET_JACK,

	ALC294_FIXUP_ASUS_HPE,

};



static const struct hda_fixup alc269_fixups[] = {
@@ -6684,6 +6686,8 @@ static const struct hda_fixup alc269_fixups[] = { 
	[ALC285_FIXUP_SPEAKER2_TO_DAC1] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_speaker2_to_dac1,

		.chained = true,

		.chain_id = ALC269_FIXUP_THINKPAD_ACPI

	},

	[ALC256_FIXUP_DELL_INSPIRON_7559_SUBWOOFER] = {

		.type = HDA_FIXUP_PINS,
@@ -7040,7 +7044,23 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC294_FIXUP_SPK2_TO_DAC1

	},



	[ALC285_FIXUP_THINKPAD_HEADSET_JACK] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc_fixup_headset_jack,

		.chained = true,

		.chain_id = ALC285_FIXUP_SPEAKER2_TO_DAC1

	},

	[ALC294_FIXUP_ASUS_HPE] = {

		.type = HDA_FIXUP_VERBS,

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

			/* Set EAPD high */

			{ 0x20, AC_VERB_SET_COEF_INDEX, 0x0f },

			{ 0x20, AC_VERB_SET_PROC_COEF, 0x7774 },

			{ }

		},

		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC

	},

};



static const struct snd_pci_quirk alc269_fixup_tbl[] = {
@@ -7115,6 +7135,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),

	SND_PCI_QUIRK(0x1028, 0x097e, "Dell Precision", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x097d, "Dell Precision", ALC289_FIXUP_DUAL_SPK),

	SND_PCI_QUIRK(0x1028, 0x098d, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x09bf, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),
@@ -7204,6 +7226,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC),

	SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK),

	SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x19ce, "ASUS B9450FA", ALC294_FIXUP_ASUS_HPE),

	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),

	SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC),
@@ -7274,8 +7297,8 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x17aa, 0x224c, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x224d, "Thinkpad", ALC298_FIXUP_TPT470_DOCK),

	SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),

	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),

	SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_SPEAKER2_TO_DAC1),

	SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),

	SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),

	SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),

	SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ config SND_SOC_WM8737 
	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8741

	tristate "Wolfson Microelectronics WM8737 DAC"

	tristate "Wolfson Microelectronics WM8741 DAC"

	depends on SND_SOC_I2C_AND_SPI



config SND_SOC_WM8750

sound/soc/codecs/pcm512x.c

+5 −3
Original line number Diff line number Diff line
@@ -1564,13 +1564,15 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) 
	}



	pcm512x->sclk = devm_clk_get(dev, NULL);

	if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER)

		return -EPROBE_DEFER;

	if (PTR_ERR(pcm512x->sclk) == -EPROBE_DEFER) {

		ret = -EPROBE_DEFER;

		goto err;

	}

	if (!IS_ERR(pcm512x->sclk)) {

		ret = clk_prepare_enable(pcm512x->sclk);

		if (ret != 0) {

			dev_err(dev, "Failed to enable SCLK: %d\n", ret);

			return ret;

			goto err;

		}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE