Commit 042742a1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "Lots of small HD-audio quirks and fixes (mostly Realtek codec and
  Cirrus stuff).

  Also a small MIDI 2.0 fix and a fix for missing module description
  are included"

* tag 'sound-6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda: cs35l56: Select SERIAL_MULTI_INSTANTIATE
  ALSA: hda/realtek: Add more codec ID to no shutup pins list
  sound/oss/dmasound: add missing MODULE_DESCRIPTION() macro
  ALSA: hda/realtek: Add quirk for Lenovo Yoga Pro 7 14ARP8
  ALSA: hda/realtek: Enable headset mic on IdeaPad 330-17IKB 81DM
  ALSA: hda: tas2781: Component should be unbound before deconstruction
  ALSA: hda: cs35l41: Component should be unbound before deconstruction
  ALSA: hda: cs35l56: Component should be unbound before deconstruction
  ALSA/hda: intel-dsp-config: Document AVS as dsp_driver option
  ALSA: hda/realtek: Support Lenovo Thinkbook 13x Gen 4
  ALSA: hda/realtek: Support Lenovo Thinkbook 16P Gen 5
  ALSA: hda: cs35l41: Support Lenovo Thinkbook 13x Gen 4
  ALSA: hda: cs35l41: Support Lenovo Thinkbook 16P Gen 5
  ALSA: hda/realtek: Remove Framework Laptop 16 from quirks
  ALSA: hda/realtek: Limit mic boost on N14AP7
  ALSA: hda/realtek: fix mute/micmute LEDs don't work for ProBook 445/465 G11.
  ALSA: seq: ump: Fix missing System Reset message handling
  ALSA: hda: cs35l41: Possible null pointer dereference in cs35l41_hda_unbind()
  ALSA: hda: cs35l56: Fix lifecycle of codec pointer
parents 3a7b3836 9b1effff

sound/core/seq/seq_ump_convert.c

+2 −0
Original line number Diff line number Diff line
@@ -1075,6 +1075,8 @@ static const struct seq_ev_to_ump seq_ev_ump_encoders[] = { 
	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },

	{ SNDRV_SEQ_EVENT_SENSING, UMP_SYSTEM_STATUS_ACTIVE_SENSING,

	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },

	{ SNDRV_SEQ_EVENT_RESET, UMP_SYSTEM_STATUS_RESET,

	  system_ev_to_ump_midi1, system_ev_to_ump_midi2 },

};



static const struct seq_ev_to_ump *find_ump_encoder(int type)

sound/hda/intel-dsp-config.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
static int dsp_driver;



module_param(dsp_driver, int, 0444);

MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF)");

MODULE_PARM_DESC(dsp_driver, "Force the DSP driver for Intel DSP (0=auto, 1=legacy, 2=SST, 3=SOF, 4=AVS)");



#define FLAG_SST			BIT(0)

#define FLAG_SOF			BIT(1)

sound/oss/dmasound/dmasound_core.c

+1 −0
Original line number Diff line number Diff line
@@ -204,6 +204,7 @@ module_param(numWriteBufs, int, 0); 
static unsigned int writeBufSize = DEFAULT_BUFF_SIZE ;	/* in bytes */

module_param(writeBufSize, int, 0);



MODULE_DESCRIPTION("Atari/Amiga/Q40 core DMA sound driver");

MODULE_LICENSE("GPL");



static int sq_unit = -1;

sound/pci/hda/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ config SND_HDA_SCODEC_CS35L56_I2C 
	depends on ACPI || COMPILE_TEST

	depends on SND_SOC

	select FW_CS_DSP

	select SERIAL_MULTI_INSTANTIATE

	select SND_HDA_GENERIC

	select SND_SOC_CS35L56_SHARED

	select SND_HDA_SCODEC_CS35L56
@@ -178,6 +179,7 @@ config SND_HDA_SCODEC_CS35L56_SPI 
	depends on ACPI || COMPILE_TEST

	depends on SND_SOC

	select FW_CS_DSP

	select SERIAL_MULTI_INSTANTIATE

	select SND_HDA_GENERIC

	select SND_SOC_CS35L56_SHARED

	select SND_HDA_SCODEC_CS35L56

sound/pci/hda/cs35l41_hda.c

+3 −3
Original line number Diff line number Diff line
@@ -1495,7 +1495,7 @@ static void cs35l41_hda_unbind(struct device *dev, struct device *master, void * 
	if (comps[cs35l41->index].dev == dev) {

		memset(&comps[cs35l41->index], 0, sizeof(*comps));

		sleep_flags = lock_system_sleep();

		device_link_remove(&comps->codec->core.dev, cs35l41->dev);

		device_link_remove(&cs35l41->codec->core.dev, cs35l41->dev);

		unlock_system_sleep(sleep_flags);

	}

}
@@ -2019,6 +2019,8 @@ void cs35l41_hda_remove(struct device *dev) 
{

	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);



	component_del(cs35l41->dev, &cs35l41_hda_comp_ops);



	pm_runtime_get_sync(cs35l41->dev);

	pm_runtime_dont_use_autosuspend(cs35l41->dev);

	pm_runtime_disable(cs35l41->dev);
@@ -2026,8 +2028,6 @@ void cs35l41_hda_remove(struct device *dev) 
	if (cs35l41->halo_initialized)

		cs35l41_remove_dsp(cs35l41);



	component_del(cs35l41->dev, &cs35l41_hda_comp_ops);



	acpi_dev_put(cs35l41->dacpi);



	pm_runtime_put_noidle(cs35l41->dev);