Unverified Commit 59f8b622 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files

ASoC: intel/sdw_utils: refactor init_dai_link() and init_simple_dai_link() 

To make it generic, refactor existing implementation for
init_dai_link() and init_simple_dai_link() as mentioned below.
- Move init_dai_link() and init_simple_dai_link() to common place holder
- Rename the functions with "asoc_sdw" as prefix.
- Pass the platform specific 'platform_component' structure and its size as
arguments for init_simple_dai_link() function and allocate one more
extra dlc for platform component.
- Pass the 'platform_component' and 'num_platforms' as arguments for
init_dai_link().

Link: https://github.com/thesofproject/linux/pull/5068


Signed-off-by: default avatarVijendar Mukunda <Vijendar.Mukunda@amd.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://patch.msgid.link/20240801111821.18076-6-Vijendar.Mukunda@amd.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5bd414c7

include/sound/soc_sdw_utils.h

+16 −0
Original line number Diff line number Diff line
@@ -124,6 +124,22 @@ void asoc_sdw_mc_dailink_exit_loop(struct snd_soc_card *card); 


int asoc_sdw_card_late_probe(struct snd_soc_card *card);



void asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,

			    int *be_id, char *name, int playback, int capture,

			    struct snd_soc_dai_link_component *cpus, int cpus_num,

			    struct snd_soc_dai_link_component *platform_component,

			    int num_platforms, struct snd_soc_dai_link_component *codecs,

			    int codecs_num, int (*init)(struct snd_soc_pcm_runtime *rtd),

			    const struct snd_soc_ops *ops);



int asoc_sdw_init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,

				  int *be_id, char *name, int playback, int capture,

				  const char *cpu_dai_name, const char *platform_comp_name,

				  int num_platforms, const char *codec_name,

				  const char *codec_dai_name,

				  int (*init)(struct snd_soc_pcm_runtime *rtd),

				  const struct snd_soc_ops *ops);



int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd);



/* DMIC support */

sound/soc/intel/boards/sof_sdw.c

+34 −71
Original line number Diff line number Diff line
@@ -557,54 +557,6 @@ static const struct snd_soc_ops sdw_ops = { 
	.shutdown = asoc_sdw_shutdown,

};



static void init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,

			  int *be_id, char *name, int playback, int capture,

			  struct snd_soc_dai_link_component *cpus, int cpus_num,

			  struct snd_soc_dai_link_component *codecs, int codecs_num,

			  int (*init)(struct snd_soc_pcm_runtime *rtd),

			  const struct snd_soc_ops *ops)

{

	dev_dbg(dev, "create dai link %s, id %d\n", name, *be_id);

	dai_links->id = (*be_id)++;

	dai_links->name = name;

	dai_links->platforms = platform_component;

	dai_links->num_platforms = ARRAY_SIZE(platform_component);

	dai_links->no_pcm = 1;

	dai_links->cpus = cpus;

	dai_links->num_cpus = cpus_num;

	dai_links->codecs = codecs;

	dai_links->num_codecs = codecs_num;

	dai_links->dpcm_playback = playback;

	dai_links->dpcm_capture = capture;

	dai_links->init = init;

	dai_links->ops = ops;

}



static int init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,

				int *be_id, char *name, int playback, int capture,

				const char *cpu_dai_name,

				const char *codec_name, const char *codec_dai_name,

				int (*init)(struct snd_soc_pcm_runtime *rtd),

				const struct snd_soc_ops *ops)

{

	struct snd_soc_dai_link_component *dlc;



	/* Allocate two DLCs one for the CPU, one for the CODEC */

	dlc = devm_kcalloc(dev, 2, sizeof(*dlc), GFP_KERNEL);

	if (!dlc || !name || !cpu_dai_name || !codec_name || !codec_dai_name)

		return -ENOMEM;



	dlc[0].dai_name = cpu_dai_name;



	dlc[1].name = codec_name;

	dlc[1].dai_name = codec_dai_name;



	init_dai_link(dev, dai_links, be_id, name, playback, capture,

		      &dlc[0], 1, &dlc[1], 1, init, ops);



	return 0;

}



struct sof_sdw_endpoint {

	struct list_head list;
@@ -897,8 +849,9 @@ static int create_sdw_dailink(struct snd_soc_card *card, 
		playback = (stream == SNDRV_PCM_STREAM_PLAYBACK);

		capture = (stream == SNDRV_PCM_STREAM_CAPTURE);



		init_dai_link(dev, *dai_links, be_id, name, playback, capture,

			      cpus, num_cpus, codecs, num_codecs,

		asoc_sdw_init_dai_link(dev, *dai_links, be_id, name, playback, capture,

				       cpus, num_cpus, platform_component,

				       ARRAY_SIZE(platform_component), codecs, num_codecs,

				       asoc_sdw_rtd_init, &sdw_ops);



		/*
@@ -969,10 +922,12 @@ static int create_ssp_dailinks(struct snd_soc_card *card, 
		int playback = ssp_info->dais[0].direction[SNDRV_PCM_STREAM_PLAYBACK];

		int capture = ssp_info->dais[0].direction[SNDRV_PCM_STREAM_CAPTURE];



		ret = init_simple_dai_link(dev, *dai_links, be_id, name,

		ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,

						    playback, capture, cpu_dai_name,

					   codec_name, ssp_info->dais[0].dai_name,

					   NULL, ssp_info->ops);

						    platform_component->name,

						    ARRAY_SIZE(platform_component), codec_name,

						    ssp_info->dais[0].dai_name, NULL,

						    ssp_info->ops);

		if (ret)

			return ret;
@@ -992,18 +947,22 @@ static int create_dmic_dailinks(struct snd_soc_card *card, 
	struct device *dev = card->dev;

	int ret;



	ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic01",

	ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, "dmic01",

					    0, 1, // DMIC only supports capture

				   "DMIC01 Pin", "dmic-codec", "dmic-hifi",

					    "DMIC01 Pin", platform_component->name,

					    ARRAY_SIZE(platform_component),

					    "dmic-codec", "dmic-hifi",

					    asoc_sdw_dmic_init, NULL);

	if (ret)

		return ret;



	(*dai_links)++;



	ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic16k",

	ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, "dmic16k",

					    0, 1, // DMIC only supports capture

				   "DMIC16k Pin", "dmic-codec", "dmic-hifi",

					    "DMIC16k Pin", platform_component->name,

					    ARRAY_SIZE(platform_component),

					    "dmic-codec", "dmic-hifi",

					    /* don't call asoc_sdw_dmic_init() twice */

					    NULL, NULL);

	if (ret)
@@ -1037,9 +996,11 @@ static int create_hdmi_dailinks(struct snd_soc_card *card, 
			codec_dai_name = "snd-soc-dummy-dai";

		}



		ret = init_simple_dai_link(dev, *dai_links, be_id, name,

		ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,

						    1, 0, // HDMI only supports playback

					   cpu_dai_name, codec_name, codec_dai_name,

						    cpu_dai_name, platform_component->name,

						    ARRAY_SIZE(platform_component),

						    codec_name, codec_dai_name,

						    i == 0 ? sof_sdw_hdmi_init : NULL, NULL);

		if (ret)

			return ret;
@@ -1060,9 +1021,11 @@ static int create_bt_dailinks(struct snd_soc_card *card, 
	char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port);

	int ret;



	ret = init_simple_dai_link(dev, *dai_links, be_id, name,

				   1, 1, cpu_dai_name, snd_soc_dummy_dlc.name,

				   snd_soc_dummy_dlc.dai_name, NULL, NULL);

	ret = asoc_sdw_init_simple_dai_link(dev, *dai_links, be_id, name,

					    1, 1, cpu_dai_name, platform_component->name,

					    ARRAY_SIZE(platform_component),

					    snd_soc_dummy_dlc.name, snd_soc_dummy_dlc.dai_name,

					    NULL, NULL);

	if (ret)

		return ret;

sound/soc/sdw_utils/soc_sdw_utils.c

+54 −0
Original line number Diff line number Diff line
@@ -932,5 +932,59 @@ int asoc_sdw_card_late_probe(struct snd_soc_card *card) 
}

EXPORT_SYMBOL_NS(asoc_sdw_card_late_probe, SND_SOC_SDW_UTILS);



void asoc_sdw_init_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,

			    int *be_id, char *name, int playback, int capture,

			    struct snd_soc_dai_link_component *cpus, int cpus_num,

			    struct snd_soc_dai_link_component *platform_component,

			    int num_platforms, struct snd_soc_dai_link_component *codecs,

			    int codecs_num, int (*init)(struct snd_soc_pcm_runtime *rtd),

			    const struct snd_soc_ops *ops)

{

	dev_dbg(dev, "create dai link %s, id %d\n", name, *be_id);

	dai_links->id = (*be_id)++;

	dai_links->name = name;

	dai_links->platforms = platform_component;

	dai_links->num_platforms = num_platforms;

	dai_links->no_pcm = 1;

	dai_links->cpus = cpus;

	dai_links->num_cpus = cpus_num;

	dai_links->codecs = codecs;

	dai_links->num_codecs = codecs_num;

	dai_links->dpcm_playback = playback;

	dai_links->dpcm_capture = capture;

	dai_links->init = init;

	dai_links->ops = ops;

}

EXPORT_SYMBOL_NS(asoc_sdw_init_dai_link, SND_SOC_SDW_UTILS);



int asoc_sdw_init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai_links,

				  int *be_id, char *name, int playback, int capture,

				  const char *cpu_dai_name, const char *platform_comp_name,

				  int num_platforms, const char *codec_name,

				  const char *codec_dai_name,

				  int (*init)(struct snd_soc_pcm_runtime *rtd),

				  const struct snd_soc_ops *ops)

{

	struct snd_soc_dai_link_component *dlc;



	/* Allocate three DLCs one for the CPU, one for platform and one for the CODEC */

	dlc = devm_kcalloc(dev, 3, sizeof(*dlc), GFP_KERNEL);

	if (!dlc || !name || !cpu_dai_name || !platform_comp_name || !codec_name || !codec_dai_name)

		return -ENOMEM;



	dlc[0].dai_name = cpu_dai_name;

	dlc[1].name = platform_comp_name;



	dlc[2].name = codec_name;

	dlc[2].dai_name = codec_dai_name;



	asoc_sdw_init_dai_link(dev, dai_links, be_id, name, playback, capture,

			       &dlc[0], 1, &dlc[1], num_platforms,

			       &dlc[2], 1, init, ops);



	return 0;

}

EXPORT_SYMBOL_NS(asoc_sdw_init_simple_dai_link, SND_SOC_SDW_UTILS);



MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("SoundWire ASoC helpers");