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

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

Pull sound fixes from Takashi Iwai:
 "This became a bit bigger collection of patches, but almost all are
  about device-specific fixes, and should be safe for 6.9:

   - Lots of ASoC Intel SOF-related fixes/updates

   - Locking fixes in SoundWire drivers

   - ASoC AMD ACP/SOF updates

   - ASoC ES8326 codec fixes

   - HD-audio codec fixes and quirks

   - A regression fix in emu10k1 synth code"

* tag 'sound-6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (49 commits)
  ASoC: SOF: Core: Add remove_late() to sof_init_environment failure path
  ASoC: SOF: amd: fix for false dsp interrupts
  ASoC: SOF: Intel: lnl: Disable DMIC/SSP offload on remove
  ASoC: Intel: avs: boards: Add modules description
  ASoC: codecs: ES8326: Removing the control of ADC_SCALE
  ASoC: codecs: ES8326: Solve a headphone detection issue after suspend and resume
  ASoC: codecs: ES8326: modify clock table
  ASoC: codecs: ES8326: Solve error interruption issue
  ALSA: line6: Zero-initialize message buffers
  ALSA: hda/realtek: cs35l41: Support ASUS ROG G634JYR
  ALSA: hda/realtek: Update Panasonic CF-SZ6 quirk to support headset with microphone
  ALSA: hda/realtek: Add sound quirks for Lenovo Legion slim 7 16ARHA7 models
  Revert "ALSA: emu10k1: fix synthesizer sample playback position and caching"
  OSS: dmasound/paula: Mark driver struct with __refdata to prevent section mismatch
  ALSA: hda/realtek: Add quirks for ASUS Laptops using CS35L56
  ASoC: amd: acp: fix for acp_init function error handling
  ASoC: tas2781: mark dvc_tlv with __maybe_unused
  ASoC: ops: Fix wraparound for mask in snd_soc_get_volsw
  ASoC: rt-sdw*: add __func__ to all error logs
  ASoC: rt722-sdca-sdw: fix locking sequence
  ...
parents 89103a16 100c8542

include/sound/hdaudio_ext.h

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ struct hdac_ext_stream { 
	u32 pphcldpl;

	u32 pphcldpu;



	u32 pplcllpl;

	u32 pplcllpu;



	bool decoupled:1;

	bool link_locked:1;

	bool link_prepared;

include/sound/tas2781-tlv.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#ifndef __TAS2781_TLV_H__

#define __TAS2781_TLV_H__



static const DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);

static const __maybe_unused DECLARE_TLV_DB_SCALE(dvc_tlv, -10000, 100, 0);

static const DECLARE_TLV_DB_SCALE(amp_vol_tlv, 1100, 50, 0);



#endif

sound/oss/dmasound/dmasound_paula.c

+7 −1
Original line number Diff line number Diff line
@@ -725,7 +725,13 @@ static void __exit amiga_audio_remove(struct platform_device *pdev) 
	dmasound_deinit();

}



static struct platform_driver amiga_audio_driver = {

/*

 * amiga_audio_remove() lives in .exit.text. For drivers registered via

 * module_platform_driver_probe() this is ok because they cannot get unbound at

 * runtime. So mark the driver struct with __refdata to prevent modpost

 * triggering a section mismatch warning.

 */

static struct platform_driver amiga_audio_driver __refdata = {

	.remove_new = __exit_p(amiga_audio_remove),

	.driver = {

		.name	= "amiga-audio",

sound/pci/emu10k1/emu10k1_callback.c

+2 −5
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ lookup_voices(struct snd_emux *emu, struct snd_emu10k1 *hw, 
		/* check if sample is finished playing (non-looping only) */

		if (bp != best + V_OFF && bp != best + V_FREE &&

		    (vp->reg.sample_mode & SNDRV_SFNT_SAMPLE_SINGLESHOT)) {

			val = snd_emu10k1_ptr_read(hw, CCCA_CURRADDR, vp->ch) - 64;

			val = snd_emu10k1_ptr_read(hw, CCCA_CURRADDR, vp->ch);

			if (val >= vp->reg.loopstart)

				bp = best + V_OFF;

		}
@@ -362,7 +362,7 @@ start_voice(struct snd_emux_voice *vp) 


	map = (hw->silent_page.addr << hw->address_mode) | (hw->address_mode ? MAP_PTI_MASK1 : MAP_PTI_MASK0);



	addr = vp->reg.start + 64;

	addr = vp->reg.start;

	temp = vp->reg.parm.filterQ;

	ccca = (temp << 28) | addr;

	if (vp->apitch < 0xe400)
@@ -430,9 +430,6 @@ start_voice(struct snd_emux_voice *vp) 
		/* Q & current address (Q 4bit value, MSB) */

		CCCA, ccca,



		/* cache */

		CCR, REG_VAL_PUT(CCR_CACHEINVALIDSIZE, 64),



		/* reset volume */

		VTFT, vtarget | vp->ftarget,

		CVCF, vtarget | CVCF_CURRENTFILTER_MASK,

sound/pci/hda/cs35l41_hda_property.c

+6 −0
Original line number Diff line number Diff line
@@ -108,7 +108,10 @@ static const struct cs35l41_config cs35l41_config_table[] = { 
	{ "10431F12", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 },

	{ "10431F1F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 0, 0, 0 },

	{ "10431F62", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 },

	{ "10433A60", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 },

	{ "17AA386F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 },

	{ "17AA3877", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },

	{ "17AA3878", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },

	{ "17AA38A9", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 },

	{ "17AA38AB", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 },

	{ "17AA38B4", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 0, 0, 0 },
@@ -496,7 +499,10 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = { 
	{ "CSC3551", "10431F12", generic_dsd_config },

	{ "CSC3551", "10431F1F", generic_dsd_config },

	{ "CSC3551", "10431F62", generic_dsd_config },

	{ "CSC3551", "10433A60", generic_dsd_config },

	{ "CSC3551", "17AA386F", generic_dsd_config },

	{ "CSC3551", "17AA3877", generic_dsd_config },

	{ "CSC3551", "17AA3878", generic_dsd_config },

	{ "CSC3551", "17AA38A9", generic_dsd_config },

	{ "CSC3551", "17AA38AB", generic_dsd_config },

	{ "CSC3551", "17AA38B4", generic_dsd_config },