Unverified Commit e3dc0351 authored by Amadeusz Sławiński's avatar Amadeusz Sławiński Committed by Mark Brown
Browse files

ASoC: Intel: avs: Use topology information for endpoint numbers 



Use DAI PCM ID from topology as Front End device endpoint number. This
allows devices to be more naturally enumerated starting from 0, like
most cards, instead of values like 1 or 2.

Signed-off-by: default avatarAmadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Acked-by: default avatarJaroslav Kysela <perex@perex.cz>
Link: https://patch.msgid.link/20250407124154.1713039-3-amadeuszx.slawinski@linux.intel.com


Reviewed-by: default avatarCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1581d5c6

sound/soc/intel/avs/avs.h

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ struct avs_soc_component { 
extern const struct snd_soc_dai_ops avs_dai_fe_ops;



int avs_soc_component_register(struct device *dev, const char *name,

			       const struct snd_soc_component_driver *drv,

			       struct snd_soc_component_driver *drv,

			       struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais);

int avs_dmic_platform_register(struct avs_dev *adev, const char *name);

int avs_i2s_platform_register(struct avs_dev *adev, const char *name, unsigned long port_mask,

sound/soc/intel/avs/board_selection.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ static bool i2s_test; 
module_param(i2s_test, bool, 0444);

MODULE_PARM_DESC(i2s_test, "Probe I2S test-board and skip all other I2S boards");



static bool obsolete_card_names = IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE);

bool obsolete_card_names = IS_ENABLED(CONFIG_SND_SOC_INTEL_AVS_CARDNAME_OBSOLETE);

module_param_named(obsolete_card_names, obsolete_card_names, bool, 0444);

MODULE_PARM_DESC(obsolete_card_names, "Use obsolete card names 0=no, 1=yes");

sound/soc/intel/avs/pcm.c

+5 −3
Original line number Diff line number Diff line
@@ -1267,7 +1267,7 @@ static int avs_component_construct(struct snd_soc_component *component, 
	return 0;

}



static const struct snd_soc_component_driver avs_component_driver = {

static struct snd_soc_component_driver avs_component_driver = {

	.name			= "avs-pcm",

	.probe			= avs_component_probe,

	.remove			= avs_component_remove,
@@ -1282,7 +1282,7 @@ static const struct snd_soc_component_driver avs_component_driver = { 
};



int avs_soc_component_register(struct device *dev, const char *name,

			       const struct snd_soc_component_driver *drv,

			       struct snd_soc_component_driver *drv,

			       struct snd_soc_dai_driver *cpu_dais, int num_cpu_dais)

{

	struct avs_soc_component *acomp;
@@ -1300,6 +1300,8 @@ int avs_soc_component_register(struct device *dev, const char *name, 
	acomp->base.name = name;

	INIT_LIST_HEAD(&acomp->node);



	drv->use_dai_pcm_id = !obsolete_card_names;



	return snd_soc_add_component(&acomp->base, cpu_dais, num_cpu_dais);

}
@@ -1626,7 +1628,7 @@ static int avs_component_hda_open(struct snd_soc_component *component, 
	return 0;

}



static const struct snd_soc_component_driver avs_hda_component_driver = {

static struct snd_soc_component_driver avs_hda_component_driver = {

	.name			= "avs-hda-pcm",

	.probe			= avs_component_hda_probe,

	.remove			= avs_component_hda_remove,

sound/soc/intel/avs/probes.c

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static struct snd_soc_dai_driver probe_cpu_dais[] = { 
},

};



static const struct snd_soc_component_driver avs_probe_component_driver = {

static struct snd_soc_component_driver avs_probe_component_driver = {

	.name			= "avs-probe-compr",

	.compress_ops		= &avs_probe_compress_ops,

	.module_get_upon_open	= 1, /* increment refcount when a stream is opened */

sound/soc/intel/avs/utils.h

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ 


#include <sound/soc-acpi.h>



extern bool obsolete_card_names;



struct avs_mach_pdata {

	struct hda_codec *codec;

	unsigned long *tdms;