Unverified Commit f792733e authored by Bard Liao's avatar Bard Liao Committed by Mark Brown
Browse files

ASoC: sdw_utils: add component_name string to dai_info 



Currently the sdw machine driver uses different way to get the
component name from the DAI name for different codecs in the rtd_init
callback. It means that we need to rely on the rtd_init callback to get
the component name. Add an optional component string to the
asoc_sdw_dai_info struct allows the machine driver to get the component
name directly.
The commit adds the component names for the AMP dais for the preparation
to set card->components string for combined speaker configs.

Signed-off-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarShuming Fan <shumingf@realtek.com>
Link: https://patch.msgid.link/20250625140430.311865-2-yung-chuan.liao@linux.intel.com


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

include/sound/soc_sdw_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ struct asoc_sdw_codec_info; 
struct asoc_sdw_dai_info {

	const bool direction[2]; /* playback & capture support */

	const char *dai_name;

	const char *component_name;

	const int dai_type;

	const int dailink[2]; /* dailink id for each direction */

	const struct snd_kcontrol_new *controls;

sound/soc/sdw_utils/soc_sdw_utils.c

+7 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "rt712-sdca-aif2",

				.component_name = "rt712",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = asoc_sdw_rt_amp_init,
@@ -275,6 +276,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "rt1320-aif1",

				.component_name = "rt1320",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = asoc_sdw_rt_amp_init,
@@ -409,6 +411,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "rt722-sdca-aif2",

				.component_name = "rt722",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				/* No feedback capability is provided by rt722-sdca codec driver*/

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
@@ -438,6 +441,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, true},

				.dai_name = "max98373-aif1",

				.component_name = "mx8373",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},

				.init = asoc_sdw_maxim_init,
@@ -456,6 +460,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "max98363-aif1",

				.component_name = "mx8363",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = asoc_sdw_maxim_init,
@@ -491,6 +496,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "cs35l56-sdw1",

				.component_name = "cs35l56",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = asoc_sdw_cs_amp_init,
@@ -516,6 +522,7 @@ struct asoc_sdw_codec_info codec_info_list[] = { 
			{

				.direction = {true, false},

				.dai_name = "cs35l56-sdw1",

				.component_name = "cs35l56",

				.dai_type = SOC_SDW_DAI_TYPE_AMP,

				.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},

				.init = asoc_sdw_cs_amp_init,