Commit 120fbdb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Here is a collection of sound fixes targeted for 5.11-rc5. Most
  notably, USB-audio still got a few intensive changes for covering the
  regressions while the rest are all small fixes.

   - A trivial fix for sequencer OSS emulation error path

   - HD-audio runtime PM regression fix, a few quirks and new IDs

   - USB-audio regression fixes for Pioneer device, Logitech webcams,
     etc

   - ASoC SOF Intel coverage

   - MAINTAINERS file update

   - A fix in the jack handling in ASoC HDMI codec"

* tag 'sound-5.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: usb-audio: Fix hw constraints dependencies
  ALSA: hda: Balance runtime/system PM if direct-complete is disabled
  ALSA: usb-audio: Avoid implicit feedback on Pioneer devices
  ALSA: usb-audio: Set sample rate for all sharing EPs on UAC1
  ALSA: usb-audio: Fix UAC1 rate setup for secondary endpoints
  MAINTAINERS: update qcom ASoC drivers list
  MAINTAINERS: update maintainers of qcom audio
  ALSA: hda: Add Cometlake-R PCI ID
  ALSA: seq: oss: Fix missing error check in snd_seq_oss_synth_make_info()
  ALSA: hda/via: Add minimum mute flag
  ALSA: hda/realtek - Limit int mic boost on Acer Aspire E5-575T
  ALSA: usb-audio: Always apply the hw constraints for implicit fb sync
  ASoC: SOF: Intel: fix page fault at probe if i915 init fails
  ALSA: hda: Add AlderLake-P PCI ID and HDMI codec vid
  ASoC: SOF: Intel: hda: Avoid checking jack on system suspend
  ASoC: SOF: Intel: hda: Modify existing helper to disable WAKEEN
  ASoC: SOF: Intel: hda: Resume codec to do jack detection
  MAINTAINERS: update references to stm32 audio bindings
  ASoC: hdmi-codec: Fix return value in hdmi_codec_set_jack()
parents d7631e43 506c203c

MAINTAINERS

+10 −2
Original line number Diff line number Diff line
@@ -14504,10 +14504,18 @@ S: Supported 
F:	drivers/crypto/qat/









QCOM AUDIO (ASoC) DRIVERS









M:	Patrick Lai <plai@codeaurora.org>









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









M:	Banajit Goswami <bgoswami@codeaurora.org>









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









S:	Supported









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









F:	sound/soc/codecs/lpass-wsa-macro.*









F:	sound/soc/codecs/msm8916-wcd-analog.c









F:	sound/soc/codecs/msm8916-wcd-digital.c









F:	sound/soc/codecs/wcd9335.*









F:	sound/soc/codecs/wcd934x.c









F:	sound/soc/codecs/wcd-clsh-v2.*









F:	sound/soc/codecs/wsa881x.c









F:	sound/soc/qcom/

















QCOM IPA DRIVER








@@ -16959,7 +16967,7 @@ M:	Olivier Moysan <olivier.moysan@st.com>







M:	Arnaud Pouliquen <arnaud.pouliquen@st.com>









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









S:	Maintained









F:	Documentation/devicetree/bindings/sound/st,stm32-*.txt









F:	Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml









F:	sound/soc/stm/

















STM32 TIMER/LPTIMER DRIVERS
































sound/core/seq/oss/seq_oss_synth.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -611,7 +611,8 @@ snd_seq_oss_synth_make_info(struct seq_oss_devinfo *dp, int dev, struct synth_in

















	if (info->is_midi) {









		struct midi_info minf;









		snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf);









		if (snd_seq_oss_midi_make_info(dp, info->midi_mapped, &minf))









			return -ENXIO;









		inf->synth_type = SYNTH_TYPE_MIDI;









		inf->synth_subtype = 0;









		inf->nr_voices = 16;
































sound/pci/hda/hda_codec.c



+7
−17






























Original line number
Diff line number
Diff line







@@ -2934,7 +2934,7 @@ static void hda_call_codec_resume(struct hda_codec *codec)







	snd_hdac_leave_pm(&codec->core);









}



















static int hda_codec_suspend(struct device *dev)









static int hda_codec_runtime_suspend(struct device *dev)









{









	struct hda_codec *codec = dev_to_hda_codec(dev);









	unsigned int state;








@@ -2953,7 +2953,7 @@ static int hda_codec_suspend(struct device *dev)







	return 0;









}



















static int hda_codec_resume(struct device *dev)









static int hda_codec_runtime_resume(struct device *dev)









{









	struct hda_codec *codec = dev_to_hda_codec(dev);


















@@ -2968,16 +2968,6 @@ static int hda_codec_resume(struct device *dev)







	return 0;









}



















static int hda_codec_runtime_suspend(struct device *dev)









{









	return hda_codec_suspend(dev);









}



















static int hda_codec_runtime_resume(struct device *dev)









{









	return hda_codec_resume(dev);









}



















#endif /* CONFIG_PM */



















#ifdef CONFIG_PM_SLEEP








@@ -2998,31 +2988,31 @@ static void hda_codec_pm_complete(struct device *dev)







static int hda_codec_pm_suspend(struct device *dev)









{









	dev->power.power_state = PMSG_SUSPEND;









	return hda_codec_suspend(dev);









	return pm_runtime_force_suspend(dev);









}



















static int hda_codec_pm_resume(struct device *dev)









{









	dev->power.power_state = PMSG_RESUME;









	return hda_codec_resume(dev);









	return pm_runtime_force_resume(dev);









}



















static int hda_codec_pm_freeze(struct device *dev)









{









	dev->power.power_state = PMSG_FREEZE;









	return hda_codec_suspend(dev);









	return pm_runtime_force_suspend(dev);









}



















static int hda_codec_pm_thaw(struct device *dev)









{









	dev->power.power_state = PMSG_THAW;









	return hda_codec_resume(dev);









	return pm_runtime_force_resume(dev);









}



















static int hda_codec_pm_restore(struct device *dev)









{









	dev->power.power_state = PMSG_RESTORE;









	return hda_codec_resume(dev);









	return pm_runtime_force_resume(dev);









}









#endif /* CONFIG_PM_SLEEP */










































sound/pci/hda/hda_intel.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -2484,6 +2484,9 @@ static const struct pci_device_id azx_ids[] = {







	/* CometLake-S */









	{ PCI_DEVICE(0x8086, 0xa3f0),









	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},









	/* CometLake-R */









	{ PCI_DEVICE(0x8086, 0xf0c8),









	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},









	/* Icelake */









	{ PCI_DEVICE(0x8086, 0x34c8),









	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},








@@ -2507,6 +2510,9 @@ static const struct pci_device_id azx_ids[] = {







	/* Alderlake-S */









	{ PCI_DEVICE(0x8086, 0x7ad0),









	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},









	/* Alderlake-P */









	{ PCI_DEVICE(0x8086, 0x51c8),









	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},









	/* Elkhart Lake */









	{ PCI_DEVICE(0x8086, 0x4b55),









	  .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE},
































sound/pci/hda/patch_hdmi.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -4346,6 +4346,7 @@ HDA_CODEC_ENTRY(0x8086280f, "Icelake HDMI",	patch_i915_icl_hdmi),







HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI",	patch_i915_tgl_hdmi),









HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI",	patch_i915_tgl_hdmi),









HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI",	patch_i915_tgl_hdmi),









HDA_CODEC_ENTRY(0x8086281c, "Alderlake-P HDMI", patch_i915_tgl_hdmi),









HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI",	patch_i915_tgl_hdmi),









HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI",	patch_i915_icl_hdmi),









HDA_CODEC_ENTRY(0x8086281b, "Elkhartlake HDMI",	patch_i915_icl_hdmi),