Commit a7a0dcdf authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 



Back-merge of 6.3 devel branch for further changes of PCM and
documentation.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parents 2c759890 fa4e7a6f

sound/core/pcm_lib.c

+2 −0
Original line number Diff line number Diff line
@@ -2155,6 +2155,8 @@ int pcm_lib_apply_appl_ptr(struct snd_pcm_substream *substream, 
		ret = substream->ops->ack(substream);

		if (ret < 0) {

			runtime->control->appl_ptr = old_appl_ptr;

			if (ret == -EPIPE)

				__snd_pcm_xrun(substream);

			return ret;

		}

	}

sound/hda/intel-dsp-config.c

+9 −0
Original line number Diff line number Diff line
@@ -472,6 +472,15 @@ static const struct config_entry config_table[] = { 
	},

#endif



/* Meteor Lake */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_METEORLAKE)

	/* Meteorlake-P */

	{

		.flags = FLAG_SOF | FLAG_SOF_ONLY_IF_DMIC_OR_SOUNDWIRE,

		.device = 0x7e28,

	},

#endif



};



static const struct config_entry *snd_intel_dsp_find_config

sound/pci/asihpi/hpi6205.c

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr) 
		pao = hpi_find_adapter(phm->adapter_index);

	} else {

		/* subsys messages don't address an adapter */

		_HPI_6205(NULL, phm, phr);

		phr->error = HPI_ERROR_INVALID_OBJ_INDEX;

		return;

	}

sound/pci/hda/hda_intel.c

+3 −2
Original line number Diff line number Diff line
@@ -328,14 +328,15 @@ enum { 
#define needs_eld_notify_link(chip)	false

#endif



#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \

#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) &&         \

				       (((pci)->device == 0x0a0c) || \

					((pci)->device == 0x0c0c) || \

					((pci)->device == 0x0d0c) || \

					((pci)->device == 0x160c) || \

					((pci)->device == 0x490d) || \

					((pci)->device == 0x4f90) || \

					((pci)->device == 0x4f91) || \

					((pci)->device == 0x4f92))

					((pci)->device == 0x4f92)))



#define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98)

sound/pci/hda/patch_ca0132.c

+3 −1
Original line number Diff line number Diff line
@@ -4228,8 +4228,10 @@ static int tuning_ctl_set(struct hda_codec *codec, hda_nid_t nid, 


	for (i = 0; i < TUNING_CTLS_COUNT; i++)

		if (nid == ca0132_tuning_ctls[i].nid)

			break;

			goto found;



	return -EINVAL;

found:

	snd_hda_power_up(codec);

	dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20,

			ca0132_tuning_ctls[i].req,