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

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

Pull sound fixes from Takashi Iwai:
 "This became largish as it includes the pending ASoC fixes.

  Almost all changes are device-specific small fixes, while many of them
  are coverage for mixer issues that were detected by selftest. In
  addition, usual suspects for HD/USB-audio are there"

* tag 'sound-5.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (43 commits)
  ALSA: cs46xx: Fix missing snd_card_free() call at probe error
  ALSA: usb-audio: Add quirk for Fiero SC-01 (fw v1.0.0)
  ALSA: usb-audio: Add quirk for Fiero SC-01
  ALSA: hda/realtek: Add quirk for Clevo L140PU
  ALSA: usb-audio: Add quirks for MacroSilicon MS2100/MS2106 devices
  ASoC: madera: Fix event generation for rate controls
  ASoC: madera: Fix event generation for OUT1 demux
  ASoC: cs47l15: Fix event generation for low power mux control
  ASoC: cs35l41: Add ASP TX3/4 source to register patch
  ASoC: dapm: Initialise kcontrol data for mux/demux controls
  ASoC: rt711-sdca: fix kernel NULL pointer dereference when IO error
  ASoC: cs35l41: Correct some control names
  ASoC: wm5110: Fix DRE control
  ASoC: wm_adsp: Fix event for preloader
  MAINTAINERS: update ASoC Qualcomm maintainer email-id
  ASoC: rockchip: i2s: switch BCLK to GPIO
  ASoC: SOF: Intel: disable IMR boot when resuming from ACPI S4 and S5 states
  ASoC: SOF: pm: add definitions for S4 and S5 states
  ASoC: SOF: pm: add explicit behavior for ACPI S1 and S2
  ASoC: SOF: Intel: hda: Fix compressed stream position tracking
  ...
parents e35e5b6f c5e58c45

MAINTAINERS

+8 −3
Original line number Diff line number Diff line
@@ -9837,7 +9837,10 @@ INTEL ASoC DRIVERS 
M:	Cezary Rojewski <cezary.rojewski@intel.com>

M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

M:	Liam Girdwood <liam.r.girdwood@linux.intel.com>

M:	Jie Yang <yang.jie@linux.intel.com>

M:	Peter Ujfalusi <peter.ujfalusi@linux.intel.com>

M:	Bard Liao <yung-chuan.liao@linux.intel.com>

M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

M:	Kai Vehmanen <kai.vehmanen@linux.intel.com>

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

S:	Supported

F:	sound/soc/intel/
@@ -16311,7 +16314,7 @@ F: drivers/crypto/qat/ 








QCOM AUDIO (ASoC) DRIVERS









M:	Srinivas Kandagatla <srinivas.kandagatla@linaro.org>









M:	Banajit Goswami <bgoswami@codeaurora.org>









M:	Banajit Goswami <bgoswami@quicinc.com>









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









S:	Supported









F:	sound/soc/codecs/lpass-va-macro.c








@@ -18738,8 +18741,10 @@ F:	sound/soc/







SOUND - SOUND OPEN FIRMWARE (SOF) DRIVERS









M:	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>









M:	Liam Girdwood <lgirdwood@gmail.com>









M:	Peter Ujfalusi <peter.ujfalusi@linux.intel.com>









M:	Bard Liao <yung-chuan.liao@linux.intel.com>









M:	Ranjani Sridharan <ranjani.sridharan@linux.intel.com>









M:	Kai Vehmanen <kai.vehmanen@linux.intel.com>









R:	Kai Vehmanen <kai.vehmanen@linux.intel.com>









M:	Daniel Baluta <daniel.baluta@nxp.com>









L:	sound-open-firmware@alsa-project.org (moderated for non-subscribers)









S:	Supported

























include/sound/soc.h



+0
−2






























Original line number
Diff line number
Diff line







@@ -408,8 +408,6 @@ struct snd_soc_jack_pin;

















struct snd_soc_jack_gpio;



















typedef int (*hw_write_t)(void *,const char* ,int);



















enum snd_soc_pcm_subclass {









	SND_SOC_PCM_CLASS_PCM	= 0,









	SND_SOC_PCM_CLASS_BE	= 1,
































sound/pci/cs46xx/cs46xx.c



+13
−9






























Original line number
Diff line number
Diff line







@@ -74,36 +74,36 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci,







	err = snd_cs46xx_create(card, pci,









				external_amp[dev], thinkpad[dev]);









	if (err < 0)









		return err;









		goto error;









	card->private_data = chip;









	chip->accept_valid = mmap_valid[dev];









	err = snd_cs46xx_pcm(chip, 0);









	if (err < 0)









		return err;









		goto error;









#ifdef CONFIG_SND_CS46XX_NEW_DSP









	err = snd_cs46xx_pcm_rear(chip, 1);









	if (err < 0)









		return err;









		goto error;









	err = snd_cs46xx_pcm_iec958(chip, 2);









	if (err < 0)









		return err;









		goto error;









#endif









	err = snd_cs46xx_mixer(chip, 2);









	if (err < 0)









		return err;









		goto error;









#ifdef CONFIG_SND_CS46XX_NEW_DSP









	if (chip->nr_ac97_codecs ==2) {









		err = snd_cs46xx_pcm_center_lfe(chip, 3);









		if (err < 0)









			return err;









			goto error;









	}









#endif









	err = snd_cs46xx_midi(chip, 0);









	if (err < 0)









		return err;









		goto error;









	err = snd_cs46xx_start_dsp(chip);









	if (err < 0)









		return err;









		goto error;



















	snd_cs46xx_gameport(chip);


















@@ -117,11 +117,15 @@ static int snd_card_cs46xx_probe(struct pci_dev *pci,

















	err = snd_card_register(card);









	if (err < 0)









		return err;









		goto error;



















	pci_set_drvdata(pci, card);









	dev++;









	return 0;



















 error:









	snd_card_free(card);









	return err;









}



















static struct pci_driver cs46xx_driver = {
































sound/pci/hda/patch_realtek.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -9212,6 +9212,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {







	SND_PCI_QUIRK(0x1558, 0x70f4, "Clevo NH77EPY", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),









	SND_PCI_QUIRK(0x1558, 0x70f6, "Clevo NH77DPQ-Y", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),









	SND_PCI_QUIRK(0x1558, 0x7716, "Clevo NS50PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),









	SND_PCI_QUIRK(0x1558, 0x7718, "Clevo L140PU", ALC256_FIXUP_SYSTEM76_MIC_NO_PRESENCE),









	SND_PCI_QUIRK(0x1558, 0x8228, "Clevo NR40BU", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),









	SND_PCI_QUIRK(0x1558, 0x8520, "Clevo NH50D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),









	SND_PCI_QUIRK(0x1558, 0x8521, "Clevo NH77D[CD]", ALC293_FIXUP_SYSTEM76_MIC_NO_PRESENCE),
































sound/soc/codecs/ak4613.c



+4
−2






























Original line number
Diff line number
Diff line







@@ -868,10 +868,12 @@ static void ak4613_parse_of(struct ak4613_priv *priv,

















	/*









	 * connected STDI









	 * TDM support is assuming it is probed via Audio-Graph-Card style here.









	 * Default is SDTIx1 if it was probed via Simple-Audio-Card for now.









	 */









	sdti_num = of_graph_get_endpoint_count(np);









	if (WARN_ON((sdti_num > 3) || (sdti_num < 1)))









		return;









	if ((sdti_num >= SDTx_MAX) || (sdti_num < 1))









		sdti_num = 1;



















	AK4613_CONFIG_SDTI_set(priv, sdti_num);









}