Unverified Commit 09be5b1c authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Intel: avs: Adjust platform names 

Merge series from Cezary Rojewski <cezary.rojewski@intel.com>:

This series is a direct follow up to the recent
machine-board-registration changes [1]. Initially, a number of smaller
patchsets were part of a bigger block of changes. My attempt to split
them up to make the review easier was unfortunately not successful [2].

The goal of this series is the same one as with [1] - allow for multiple
cards of the same type without workarounds or code duplications.
With the machine-board names being unique - thanks to
PLATFORM_DEVID_AUTO - platform component names shall be adjusted too so
that no misbindings happen.

In essence, majority of the changes can be summarized as: simplifying
card and dai_link initialization. Actions:

- drop mach->mach_params.platform usage
- drop snd_soc_fixup_dai_links_platform_name() usage
- for the probe-board mach-context is dropped entirely. The panic [2] is
  gone

[1]: https://lore.kernel.org/linux-sound/20250827142229.869139-1-cezary.rojewski@intel.com/
[2]: https://lore.kernel.org/linux-sound/20250829225532.GA400117@ax162/
parents ce1a46b2 ce57b718

sound/soc/intel/avs/boards/da7219.c

+4 −11
Original line number Diff line number Diff line
@@ -165,8 +165,8 @@ avs_da7219_be_fixup(struct snd_soc_pcm_runtime *runrime, struct snd_pcm_hw_param 
	return 0;

}



static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,

			       int tdm_slot, struct snd_soc_dai_link **dai_link)

static int avs_create_dai_link(struct device *dev, int ssp_port, int tdm_slot,

			       struct snd_soc_dai_link **dai_link)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;
@@ -176,8 +176,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl || !platform)

		return -ENOMEM;



	platform->name = platform_name;



	dl->name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-Codec", ssp_port);

	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));
@@ -193,6 +191,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)

		return -ENOMEM;



	platform->name = dev_name(dev);

	dl->num_cpus = 1;

	dl->num_codecs = 1;

	dl->platforms = platform;
@@ -218,18 +217,16 @@ static int avs_da7219_probe(struct platform_device *pdev) 
	struct snd_soc_card *card;

	struct snd_soc_jack *jack;

	struct device *dev = &pdev->dev;

	const char *pname;

	int ssp_port, tdm_slot, ret;



	mach = dev_get_platdata(dev);

	pname = mach->mach_params.platform;

	pdata = mach->pdata;



	ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);

	if (ret)

		return ret;



	ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);

	ret = avs_create_dai_link(dev, ssp_port, tdm_slot, &dai_link);

	if (ret) {

		dev_err(dev, "Failed to create dai link: %d", ret);

		return ret;
@@ -259,10 +256,6 @@ static int avs_da7219_probe(struct platform_device *pdev) 
	card->fully_routed = true;

	snd_soc_card_set_drvdata(card, jack);



	ret = snd_soc_fixup_dai_links_platform_name(card, pname);

	if (ret)

		return ret;



	return devm_snd_soc_register_deferrable_card(dev, card);

}

sound/soc/intel/avs/boards/dmic.c

+49 −31
Original line number Diff line number Diff line
@@ -14,30 +14,6 @@ 


SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC Pin")));

SND_SOC_DAILINK_DEF(dmic_wov_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC WoV Pin")));

SND_SOC_DAILINK_DEF(dmic_codec, DAILINK_COMP_ARRAY(COMP_CODEC("dmic-codec", "dmic-hifi")));

/* Name overridden on probe */

SND_SOC_DAILINK_DEF(platform, DAILINK_COMP_ARRAY(COMP_PLATFORM("")));



static struct snd_soc_dai_link card_dai_links[] = {

	/* Back ends */

	{

		.name = "DMIC",

		.id = 0,

		.capture_only = 1,

		.nonatomic = 1,

		.no_pcm = 1,

		SND_SOC_DAILINK_REG(dmic_pin, dmic_codec, platform),

	},

	{

		.name = "DMIC WoV",

		.id = 1,

		.capture_only = 1,

		.nonatomic = 1,

		.no_pcm = 1,

		.ignore_suspend = 1,

		SND_SOC_DAILINK_REG(dmic_wov_pin, dmic_codec, platform),

	},

};



static const struct snd_soc_dapm_widget card_widgets[] = {

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),
@@ -47,12 +23,56 @@ static const struct snd_soc_dapm_route card_routes[] = { 
	{"DMic", NULL, "SoC DMIC"},

};



static int avs_create_dai_links(struct device *dev, const char *codec_name,

				struct snd_soc_dai_link **links, int *num_links)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;

	const int num_dl = 2;



	dl = devm_kcalloc(dev, num_dl, sizeof(*dl), GFP_KERNEL);

	platform = devm_kzalloc(dev, sizeof(*platform), GFP_KERNEL);

	if (!dl || !platform)

		return -ENOMEM;



	dl->codecs = devm_kzalloc(dev, sizeof(*dl->codecs), GFP_KERNEL);

	if (!dl->codecs)

		return -ENOMEM;



	dl->codecs->name = devm_kstrdup(dev, codec_name, GFP_KERNEL);

	dl->codecs->dai_name = devm_kasprintf(dev, GFP_KERNEL, "dmic-hifi");

	if (!dl->codecs->name || !dl->codecs->dai_name)

		return -ENOMEM;



	platform->name = dev_name(dev);

	dl[0].num_cpus = 1;

	dl[0].num_codecs = 1;

	dl[0].platforms = platform;

	dl[0].num_platforms = 1;

	dl[0].nonatomic = 1;

	dl[0].no_pcm = 1;

	dl[0].capture_only = 1;

	memcpy(&dl[1], &dl[0], sizeof(*dl));



	dl[0].name = "DMIC";

	dl[0].cpus = dmic_pin;

	dl[0].id = 0;

	dl[1].name = "DMIC WoV";

	dl[1].cpus = dmic_wov_pin;

	dl[1].id = 1;

	dl[1].ignore_suspend = 1;



	*links = dl;

	*num_links = num_dl;

	return 0;

}



static int avs_dmic_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct snd_soc_acpi_mach *mach;

	struct avs_mach_pdata *pdata;

	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	int ret;



	mach = dev_get_platdata(dev);
@@ -62,6 +82,10 @@ static int avs_dmic_probe(struct platform_device *pdev) 
	if (!card)

		return -ENOMEM;



	ret = avs_create_dai_links(dev, pdata->codec_name, &card->dai_link, &card->num_links);

	if (ret)

		return ret;



	if (pdata->obsolete_card_names) {

		card->name = "avs_dmic";

	} else {
@@ -70,18 +94,12 @@ static int avs_dmic_probe(struct platform_device *pdev) 
	}

	card->dev = dev;

	card->owner = THIS_MODULE;

	card->dai_link = card_dai_links;

	card->num_links = ARRAY_SIZE(card_dai_links);

	card->dapm_widgets = card_widgets;

	card->num_dapm_widgets = ARRAY_SIZE(card_widgets);

	card->dapm_routes = card_routes;

	card->num_dapm_routes = ARRAY_SIZE(card_routes);

	card->fully_routed = true;



	ret = snd_soc_fixup_dai_links_platform_name(card, mach->mach_params.platform);

	if (ret)

		return ret;



	return devm_snd_soc_register_deferrable_card(dev, card);

}

sound/soc/intel/avs/boards/es8336.c

+5 −11
Original line number Diff line number Diff line
@@ -195,8 +195,9 @@ static int avs_es8336_be_fixup(struct snd_soc_pcm_runtime *runtime, 


	return 0;

}

static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,

			       int tdm_slot, struct snd_soc_dai_link **dai_link)



static int avs_create_dai_link(struct device *dev, int ssp_port, int tdm_slot,

			       struct snd_soc_dai_link **dai_link)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;
@@ -206,8 +207,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl || !platform)

		return -ENOMEM;



	platform->name = platform_name;



	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);
@@ -222,6 +221,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)

		return -ENOMEM;



	platform->name = dev_name(dev);

	dl->num_cpus = 1;

	dl->num_codecs = 1;

	dl->platforms = platform;
@@ -263,18 +263,16 @@ static int avs_es8336_probe(struct platform_device *pdev) 
	struct avs_card_drvdata *data;

	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	const char *pname;

	int ssp_port, tdm_slot, ret;



	mach = dev_get_platdata(dev);

	pname = mach->mach_params.platform;

	pdata = mach->pdata;



	ret = avs_mach_get_ssp_tdm(dev, mach, &ssp_port, &tdm_slot);

	if (ret)

		return ret;



	ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);

	ret = avs_create_dai_link(dev, ssp_port, tdm_slot, &dai_link);

	if (ret) {

		dev_err(dev, "Failed to create dai link: %d", ret);

		return ret;
@@ -306,10 +304,6 @@ static int avs_es8336_probe(struct platform_device *pdev) 
	card->fully_routed = true;

	snd_soc_card_set_drvdata(card, data);



	ret = snd_soc_fixup_dai_links_platform_name(card, pname);

	if (ret)

		return ret;



	return devm_snd_soc_register_deferrable_card(dev, card);

}

sound/soc/intel/avs/boards/hdaudio.c

+8 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "../utils.h"



static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int pcm_count,

				const char *platform_name, struct snd_soc_dai_link **links)

				struct snd_soc_dai_link **links)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;
@@ -29,7 +29,7 @@ static int avs_create_dai_links(struct device *dev, struct hda_codec *codec, int 
	if (!dl || !platform)

		return -ENOMEM;



	platform->name = platform_name;

	platform->name = dev_name(dev);

	pcm = list_first_entry(&codec->pcm_list_head, struct hda_pcm, list);



	for (i = 0; i < pcm_count; i++, pcm = list_next_entry(pcm, list)) {
@@ -142,7 +142,7 @@ static int avs_probing_link_init(struct snd_soc_pcm_runtime *rtm) 
	list_for_each_entry(pcm, &codec->pcm_list_head, list)

		pcm_count++;



	ret = avs_create_dai_links(card->dev, codec, pcm_count, mach->mach_params.platform, &links);

	ret = avs_create_dai_links(card->dev, codec, pcm_count, &links);

	if (ret < 0) {

		dev_err(card->dev, "create links failed: %d\n", ret);

		return ret;
@@ -197,7 +197,7 @@ static int avs_hdaudio_probe(struct platform_device *pdev) 
	if (!binder->codecs->name)

		return -ENOMEM;



	binder->platforms->name = mach->mach_params.platform;

	binder->platforms->name = dev_name(dev);

	binder->num_platforms = 1;

	binder->codecs->dai_name = "codec-probing-DAI";

	binder->num_codecs = 1;
@@ -207,7 +207,10 @@ static int avs_hdaudio_probe(struct platform_device *pdev) 
		return -ENOMEM;



	if (pdata->obsolete_card_names) {

		card->name = binder->codecs->name;

		card->name = devm_kasprintf(dev, GFP_KERNEL, "hdaudioB%dD%d", codec->bus->core.idx,

					    codec->core.addr);

		if (!card->name)

			return -ENOMEM;

	} else {

		card->driver_name = "avs_hdaudio";

		if (hda_codec_is_display(codec))

sound/soc/intel/avs/boards/i2s_test.c

+4 −11
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <sound/soc-dapm.h>

#include "../utils.h"



static int avs_create_dai_link(struct device *dev, const char *platform_name, int ssp_port,

			       int tdm_slot, struct snd_soc_dai_link **dai_link)

static int avs_create_dai_link(struct device *dev, int ssp_port, int tdm_slot,

			       struct snd_soc_dai_link **dai_link)

{

	struct snd_soc_dai_link_component *platform;

	struct snd_soc_dai_link *dl;
@@ -25,8 +25,6 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl || !platform)

		return -ENOMEM;



	platform->name = platform_name;



	dl->name = devm_kasprintf(dev, GFP_KERNEL,

				  AVS_STRING_FMT("SSP", "-Codec", ssp_port, tdm_slot));

	dl->cpus = devm_kzalloc(dev, sizeof(*dl->cpus), GFP_KERNEL);
@@ -39,6 +37,7 @@ static int avs_create_dai_link(struct device *dev, const char *platform_name, in 
	if (!dl->cpus->dai_name || !dl->codecs->name || !dl->codecs->dai_name)

		return -ENOMEM;



	platform->name = dev_name(dev);

	dl->num_cpus = 1;

	dl->num_codecs = 1;

	dl->platforms = platform;
@@ -59,11 +58,9 @@ static int avs_i2s_test_probe(struct platform_device *pdev) 
	struct avs_mach_pdata *pdata;

	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	const char *pname;

	int ssp_port, tdm_slot, ret;



	mach = dev_get_platdata(dev);

	pname = mach->mach_params.platform;

	pdata = mach->pdata;



	if (!avs_mach_singular_ssp(mach)) {
@@ -94,7 +91,7 @@ static int avs_i2s_test_probe(struct platform_device *pdev) 
	if (!card->name)

		return -ENOMEM;



	ret = avs_create_dai_link(dev, pname, ssp_port, tdm_slot, &dai_link);

	ret = avs_create_dai_link(dev, ssp_port, tdm_slot, &dai_link);

	if (ret) {

		dev_err(dev, "Failed to create dai link: %d\n", ret);

		return ret;
@@ -106,10 +103,6 @@ static int avs_i2s_test_probe(struct platform_device *pdev) 
	card->num_links = 1;

	card->fully_routed = true;



	ret = snd_soc_fixup_dai_links_platform_name(card, pname);

	if (ret)

		return ret;



	return devm_snd_soc_register_deferrable_card(dev, card);

}