Skip to content

L
linux
Commit bd5838c8 authored by Vijendar Mukunda's avatar Vijendar Mukunda Committed by Mark Brown
Browse files
Options

ASoC: intel: rename soundwire codec helper functions 

Rename SoundWire codec helper functions with "asoc_sdw" tag.

Link: https://github.com/thesofproject/linux/pull/5068Signed-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/20240801091446.10457-5-Vijendar.Mukunda@amd.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 96990cfe
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 188 deletions
sound/soc/intel/boards/bridge_cs35l56.c
View file @ bd5838c8
...@@ -95,8 +95,8 @@ static const struct snd_soc_dai_link bridge_dai_template = { ...@@ -95,8 +95,8 @@ static const struct snd_soc_dai_link bridge_dai_template = {
SND_SOC_DAILINK_REG(bridge_dai), SND_SOC_DAILINK_REG(bridge_dai),
}; };
int bridge_cs35l56_count_sidecar(struct snd_soc_card *card, int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
int *num_dais, int *num_devs) int *num_dais, int *num_devs)
{ {
if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) { if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {
(*num_dais)++; (*num_dais)++;
...@@ -106,9 +106,9 @@ int bridge_cs35l56_count_sidecar(struct snd_soc_card *card, ...@@ -106,9 +106,9 @@ int bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
return 0; return 0;
} }
int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
struct snd_soc_dai_link **dai_links, struct snd_soc_dai_link **dai_links,
struct snd_soc_codec_conf **codec_conf) struct snd_soc_codec_conf **codec_conf)
{ {
if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) { if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) {
**dai_links = bridge_dai_template; **dai_links = bridge_dai_template;
...@@ -125,10 +125,10 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, ...@@ -125,10 +125,10 @@ int bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
return 0; return 0;
} }
int bridge_cs35l56_spk_init(struct snd_soc_card *card, int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS) if (sof_sdw_quirk & SOC_SDW_SIDECAR_AMPS)
info->amp_num += ARRAY_SIZE(bridge_cs35l56_name_prefixes); info->amp_num += ARRAY_SIZE(bridge_cs35l56_name_prefixes);
......
sound/soc/intel/boards/sof_sdw.c
View file @ bd5838c8
...@@ -740,7 +740,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -740,7 +740,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt700-aif1", .dai_name = "rt700-aif1",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.rtd_init = rt700_rtd_init, .rtd_init = asoc_sdw_rt700_rtd_init,
.controls = rt700_controls, .controls = rt700_controls,
.num_controls = ARRAY_SIZE(rt700_controls), .num_controls = ARRAY_SIZE(rt700_controls),
.widgets = rt700_widgets, .widgets = rt700_widgets,
...@@ -758,9 +758,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -758,9 +758,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt711-sdca-aif1", .dai_name = "rt711-sdca-aif1",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.init = sof_sdw_rt_sdca_jack_init, .init = asoc_sdw_rt_sdca_jack_init,
.exit = sof_sdw_rt_sdca_jack_exit, .exit = asoc_sdw_rt_sdca_jack_exit,
.rtd_init = rt_sdca_jack_rtd_init, .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -778,9 +778,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -778,9 +778,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt711-aif1", .dai_name = "rt711-aif1",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.init = sof_sdw_rt711_init, .init = asoc_sdw_rt711_init,
.exit = sof_sdw_rt711_exit, .exit = asoc_sdw_rt711_exit,
.rtd_init = rt711_rtd_init, .rtd_init = asoc_sdw_rt711_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -798,9 +798,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -798,9 +798,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt712-sdca-aif1", .dai_name = "rt712-sdca-aif1",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.init = sof_sdw_rt_sdca_jack_init, .init = asoc_sdw_rt_sdca_jack_init,
.exit = sof_sdw_rt_sdca_jack_exit, .exit = asoc_sdw_rt_sdca_jack_exit,
.rtd_init = rt_sdca_jack_rtd_init, .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -811,9 +811,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -811,9 +811,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt712-sdca-aif2", .dai_name = "rt712-sdca-aif2",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = sof_sdw_rt_amp_init, .init = asoc_sdw_rt_amp_init,
.exit = sof_sdw_rt_amp_exit, .exit = asoc_sdw_rt_amp_exit,
.rtd_init = rt712_spk_rtd_init, .rtd_init = asoc_sdw_rt712_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -831,7 +831,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -831,7 +831,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt712-sdca-dmic-aif1", .dai_name = "rt712-sdca-dmic-aif1",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 1, .dai_num = 1,
...@@ -845,9 +845,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -845,9 +845,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt712-sdca-aif1", .dai_name = "rt712-sdca-aif1",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.init = sof_sdw_rt_sdca_jack_init, .init = asoc_sdw_rt_sdca_jack_init,
.exit = sof_sdw_rt_sdca_jack_exit, .exit = asoc_sdw_rt_sdca_jack_exit,
.rtd_init = rt_sdca_jack_rtd_init, .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -865,7 +865,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -865,7 +865,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt712-sdca-dmic-aif1", .dai_name = "rt712-sdca-dmic-aif1",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 1, .dai_num = 1,
...@@ -879,9 +879,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -879,9 +879,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt1308-aif", .dai_name = "rt1308-aif",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = sof_sdw_rt_amp_init, .init = asoc_sdw_rt_amp_init,
.exit = sof_sdw_rt_amp_exit, .exit = asoc_sdw_rt_amp_exit,
.rtd_init = rt_amp_spk_rtd_init, .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -889,7 +889,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -889,7 +889,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
}, },
}, },
.dai_num = 1, .dai_num = 1,
.ops = &sof_sdw_rt1308_i2s_ops, .ops = &soc_sdw_rt1308_i2s_ops,
}, },
{ {
.part_id = 0x1316, .part_id = 0x1316,
...@@ -899,9 +899,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -899,9 +899,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt1316-aif", .dai_name = "rt1316-aif",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
.init = sof_sdw_rt_amp_init, .init = asoc_sdw_rt_amp_init,
.exit = sof_sdw_rt_amp_exit, .exit = asoc_sdw_rt_amp_exit,
.rtd_init = rt_amp_spk_rtd_init, .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -918,9 +918,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -918,9 +918,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt1318-aif", .dai_name = "rt1318-aif",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
.init = sof_sdw_rt_amp_init, .init = asoc_sdw_rt_amp_init,
.exit = sof_sdw_rt_amp_exit, .exit = asoc_sdw_rt_amp_exit,
.rtd_init = rt_amp_spk_rtd_init, .rtd_init = asoc_sdw_rt_amp_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -939,7 +939,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -939,7 +939,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt715-sdca-aif2", .dai_name = "rt715-sdca-aif2",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 1, .dai_num = 1,
...@@ -954,7 +954,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -954,7 +954,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt715-sdca-aif2", .dai_name = "rt715-sdca-aif2",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 1, .dai_num = 1,
...@@ -969,7 +969,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -969,7 +969,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt715-aif2", .dai_name = "rt715-aif2",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 1, .dai_num = 1,
...@@ -984,7 +984,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -984,7 +984,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt715-aif2", .dai_name = "rt715-aif2",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 1, .dai_num = 1,
...@@ -998,9 +998,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -998,9 +998,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt722-sdca-aif1", .dai_name = "rt722-sdca-aif1",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.init = sof_sdw_rt_sdca_jack_init, .init = asoc_sdw_rt_sdca_jack_init,
.exit = sof_sdw_rt_sdca_jack_exit, .exit = asoc_sdw_rt_sdca_jack_exit,
.rtd_init = rt_sdca_jack_rtd_init, .rtd_init = asoc_sdw_rt_sdca_jack_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -1012,9 +1012,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1012,9 +1012,9 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
/* No feedback capability is provided by rt722-sdca codec driver*/ /* No feedback capability is provided by rt722-sdca codec driver*/
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = sof_sdw_rt_amp_init, .init = asoc_sdw_rt_amp_init,
.exit = sof_sdw_rt_amp_exit, .exit = asoc_sdw_rt_amp_exit,
.rtd_init = rt722_spk_rtd_init, .rtd_init = asoc_sdw_rt722_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -1025,7 +1025,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1025,7 +1025,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt722-sdca-aif3", .dai_name = "rt722-sdca-aif3",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = rt_dmic_rtd_init, .rtd_init = asoc_sdw_rt_dmic_rtd_init,
}, },
}, },
.dai_num = 3, .dai_num = 3,
...@@ -1038,8 +1038,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1038,8 +1038,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "max98373-aif1", .dai_name = "max98373-aif1",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
.init = sof_sdw_maxim_init, .init = asoc_sdw_maxim_init,
.rtd_init = maxim_spk_rtd_init, .rtd_init = asoc_sdw_maxim_spk_rtd_init,
.controls = maxim_controls, .controls = maxim_controls,
.num_controls = ARRAY_SIZE(maxim_controls), .num_controls = ARRAY_SIZE(maxim_controls),
.widgets = maxim_widgets, .widgets = maxim_widgets,
...@@ -1056,8 +1056,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1056,8 +1056,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "max98363-aif1", .dai_name = "max98363-aif1",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = sof_sdw_maxim_init, .init = asoc_sdw_maxim_init,
.rtd_init = maxim_spk_rtd_init, .rtd_init = asoc_sdw_maxim_spk_rtd_init,
.controls = maxim_controls, .controls = maxim_controls,
.num_controls = ARRAY_SIZE(maxim_controls), .num_controls = ARRAY_SIZE(maxim_controls),
.widgets = maxim_widgets, .widgets = maxim_widgets,
...@@ -1074,7 +1074,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1074,7 +1074,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "rt5682-sdw", .dai_name = "rt5682-sdw",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.rtd_init = rt5682_rtd_init, .rtd_init = asoc_sdw_rt5682_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -1091,8 +1091,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1091,8 +1091,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "cs35l56-sdw1", .dai_name = "cs35l56-sdw1",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_AMP_IN_DAI_ID},
.init = sof_sdw_cs_amp_init, .init = asoc_sdw_cs_amp_init,
.rtd_init = cs_spk_rtd_init, .rtd_init = asoc_sdw_cs_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -1109,7 +1109,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1109,7 +1109,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "cs42l42-sdw", .dai_name = "cs42l42-sdw",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_JACK_IN_DAI_ID},
.rtd_init = cs42l42_rtd_init, .rtd_init = asoc_sdw_cs42l42_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -1121,15 +1121,15 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1121,15 +1121,15 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
{ {
.part_id = 0x4243, .part_id = 0x4243,
.codec_name = "cs42l43-codec", .codec_name = "cs42l43-codec",
.count_sidecar = bridge_cs35l56_count_sidecar, .count_sidecar = asoc_sdw_bridge_cs35l56_count_sidecar,
.add_sidecar = bridge_cs35l56_add_sidecar, .add_sidecar = asoc_sdw_bridge_cs35l56_add_sidecar,
.dais = { .dais = {
{ {
.direction = {true, false}, .direction = {true, false},
.dai_name = "cs42l43-dp5", .dai_name = "cs42l43-dp5",
.dai_type = SOC_SDW_DAI_TYPE_JACK, .dai_type = SOC_SDW_DAI_TYPE_JACK,
.dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .dailink = {SOC_SDW_JACK_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.rtd_init = cs42l43_hs_rtd_init, .rtd_init = asoc_sdw_cs42l43_hs_rtd_init,
.controls = generic_jack_controls, .controls = generic_jack_controls,
.num_controls = ARRAY_SIZE(generic_jack_controls), .num_controls = ARRAY_SIZE(generic_jack_controls),
.widgets = generic_jack_widgets, .widgets = generic_jack_widgets,
...@@ -1140,7 +1140,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1140,7 +1140,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "cs42l43-dp1", .dai_name = "cs42l43-dp1",
.dai_type = SOC_SDW_DAI_TYPE_MIC, .dai_type = SOC_SDW_DAI_TYPE_MIC,
.dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID}, .dailink = {SOC_SDW_UNUSED_DAI_ID, SOC_SDW_DMIC_DAI_ID},
.rtd_init = cs42l43_dmic_rtd_init, .rtd_init = asoc_sdw_cs42l43_dmic_rtd_init,
.widgets = generic_dmic_widgets, .widgets = generic_dmic_widgets,
.num_widgets = ARRAY_SIZE(generic_dmic_widgets), .num_widgets = ARRAY_SIZE(generic_dmic_widgets),
}, },
...@@ -1155,8 +1155,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1155,8 +1155,8 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
.dai_name = "cs42l43-dp6", .dai_name = "cs42l43-dp6",
.dai_type = SOC_SDW_DAI_TYPE_AMP, .dai_type = SOC_SDW_DAI_TYPE_AMP,
.dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID}, .dailink = {SOC_SDW_AMP_OUT_DAI_ID, SOC_SDW_UNUSED_DAI_ID},
.init = sof_sdw_cs42l43_spk_init, .init = asoc_sdw_cs42l43_spk_init,
.rtd_init = cs42l43_spk_rtd_init, .rtd_init = asoc_sdw_cs42l43_spk_rtd_init,
.controls = generic_spk_controls, .controls = generic_spk_controls,
.num_controls = ARRAY_SIZE(generic_spk_controls), .num_controls = ARRAY_SIZE(generic_spk_controls),
.widgets = generic_spk_widgets, .widgets = generic_spk_widgets,
...@@ -1220,7 +1220,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = { ...@@ -1220,7 +1220,7 @@ static struct asoc_sdw_codec_info codec_info_list[] = {
}, },
}; };
static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr) static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_part(const u64 adr)
{ {
unsigned int part_id, sdw_version; unsigned int part_id, sdw_version;
int i; int i;
...@@ -1241,7 +1241,7 @@ static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr) ...@@ -1241,7 +1241,7 @@ static struct asoc_sdw_codec_info *find_codec_info_part(const u64 adr)
} }
static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id) static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_acpi(const u8 *acpi_id)
{ {
int i; int i;
...@@ -1255,8 +1255,8 @@ static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id) ...@@ -1255,8 +1255,8 @@ static struct asoc_sdw_codec_info *find_codec_info_acpi(const u8 *acpi_id)
return NULL; return NULL;
} }
static struct asoc_sdw_codec_info *find_codec_info_dai(const char *dai_name, static struct asoc_sdw_codec_info *asoc_sdw_find_codec_info_dai(const char *dai_name,
int *dai_index) int *dai_index)
{ {
int i, j; int i, j;
...@@ -1320,12 +1320,12 @@ static int init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai ...@@ -1320,12 +1320,12 @@ static int init_simple_dai_link(struct device *dev, struct snd_soc_dai_link *dai
return 0; return 0;
} }
static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link, static bool asoc_sdw_is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
unsigned int sdw_version, unsigned int sdw_version,
unsigned int mfg_id, unsigned int mfg_id,
unsigned int part_id, unsigned int part_id,
unsigned int class_id, unsigned int class_id,
int index_in_link) int index_in_link)
{ {
int i; int i;
...@@ -1354,10 +1354,10 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link, ...@@ -1354,10 +1354,10 @@ static bool is_unique_device(const struct snd_soc_acpi_link_adr *adr_link,
return true; return true;
} }
static const char *get_codec_name(struct device *dev, static const char *asoc_sdw_get_codec_name(struct device *dev,
const struct asoc_sdw_codec_info *codec_info, const struct asoc_sdw_codec_info *codec_info,
const struct snd_soc_acpi_link_adr *adr_link, const struct snd_soc_acpi_link_adr *adr_link,
int adr_index) int adr_index)
{ {
u64 adr = adr_link->adr_d[adr_index].adr; u64 adr = adr_link->adr_d[adr_index].adr;
unsigned int sdw_version = SDW_VERSION(adr); unsigned int sdw_version = SDW_VERSION(adr);
...@@ -1369,8 +1369,8 @@ static const char *get_codec_name(struct device *dev, ...@@ -1369,8 +1369,8 @@ static const char *get_codec_name(struct device *dev,
if (codec_info->codec_name) if (codec_info->codec_name)
return devm_kstrdup(dev, codec_info->codec_name, GFP_KERNEL); return devm_kstrdup(dev, codec_info->codec_name, GFP_KERNEL);
else if (is_unique_device(adr_link, sdw_version, mfg_id, part_id, else if (asoc_sdw_is_unique_device(adr_link, sdw_version, mfg_id, part_id,
class_id, adr_index)) class_id, adr_index))
return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x", return devm_kasprintf(dev, GFP_KERNEL, "sdw:0:%01x:%04x:%04x:%02x",
link_id, mfg_id, part_id, class_id); link_id, mfg_id, part_id, class_id);
else else
...@@ -1380,7 +1380,7 @@ static const char *get_codec_name(struct device *dev, ...@@ -1380,7 +1380,7 @@ static const char *get_codec_name(struct device *dev,
return NULL; return NULL;
} }
static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd) static int asoc_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct asoc_sdw_codec_info *codec_info; struct asoc_sdw_codec_info *codec_info;
...@@ -1390,7 +1390,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd) ...@@ -1390,7 +1390,7 @@ static int sof_sdw_rtd_init(struct snd_soc_pcm_runtime *rtd)
int i; int i;
for_each_rtd_codec_dais(rtd, i, dai) { for_each_rtd_codec_dais(rtd, i, dai) {
codec_info = find_codec_info_dai(dai->name, &dai_index); codec_info = asoc_sdw_find_codec_info_dai(dai->name, &dai_index);
if (!codec_info) if (!codec_info)
return -EINVAL; return -EINVAL;
...@@ -1538,13 +1538,13 @@ static int parse_sdw_endpoints(struct snd_soc_card *card, ...@@ -1538,13 +1538,13 @@ static int parse_sdw_endpoints(struct snd_soc_card *card,
return -EINVAL; return -EINVAL;
} }
codec_info = find_codec_info_part(adr_dev->adr); codec_info = asoc_sdw_find_codec_info_part(adr_dev->adr);
if (!codec_info) if (!codec_info)
return -EINVAL; return -EINVAL;
ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic; ctx->ignore_pch_dmic |= codec_info->ignore_pch_dmic;
codec_name = get_codec_name(dev, codec_info, adr_link, i); codec_name = asoc_sdw_get_codec_name(dev, codec_info, adr_link, i);
if (!codec_name) if (!codec_name)
return -ENOMEM; return -ENOMEM;
...@@ -1736,7 +1736,7 @@ static int create_sdw_dailink(struct snd_soc_card *card, ...@@ -1736,7 +1736,7 @@ static int create_sdw_dailink(struct snd_soc_card *card,
init_dai_link(dev, *dai_links, be_id, name, playback, capture, init_dai_link(dev, *dai_links, be_id, name, playback, capture,
cpus, num_cpus, codecs, num_codecs, cpus, num_cpus, codecs, num_codecs,
sof_sdw_rtd_init, &sdw_ops); asoc_sdw_rtd_init, &sdw_ops);
/* /*
* SoundWire DAILINKs use 'stream' functions and Bank Switch operations * SoundWire DAILINKs use 'stream' functions and Bank Switch operations
...@@ -1831,7 +1831,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card, ...@@ -1831,7 +1831,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card,
ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic01", ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic01",
0, 1, // DMIC only supports capture 0, 1, // DMIC only supports capture
"DMIC01 Pin", "dmic-codec", "dmic-hifi", "DMIC01 Pin", "dmic-codec", "dmic-hifi",
sof_sdw_dmic_init, NULL); asoc_sdw_dmic_init, NULL);
if (ret) if (ret)
return ret; return ret;
...@@ -1840,7 +1840,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card, ...@@ -1840,7 +1840,7 @@ static int create_dmic_dailinks(struct snd_soc_card *card,
ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic16k", ret = init_simple_dai_link(dev, *dai_links, be_id, "dmic16k",
0, 1, // DMIC only supports capture 0, 1, // DMIC only supports capture
"DMIC16k Pin", "dmic-codec", "dmic-hifi", "DMIC16k Pin", "dmic-codec", "dmic-hifi",
/* don't call sof_sdw_dmic_init() twice */ /* don't call asoc_sdw_dmic_init() twice */
NULL, NULL); NULL, NULL);
if (ret) if (ret)
return ret; return ret;
...@@ -1956,7 +1956,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card) ...@@ -1956,7 +1956,7 @@ static int sof_card_dai_links_create(struct snd_soc_card *card)
* system only when I2S mode is supported, not sdw mode. * system only when I2S mode is supported, not sdw mode.
* Here check ACPI ID to confirm I2S is supported. * Here check ACPI ID to confirm I2S is supported.
*/ */
ssp_info = find_codec_info_acpi(mach->id); ssp_info = asoc_sdw_find_codec_info_acpi(mach->id);
if (ssp_info) { if (ssp_info) {
ssp_mask = SOF_SSP_GET_PORT(sof_sdw_quirk); ssp_mask = SOF_SSP_GET_PORT(sof_sdw_quirk);
ssp_num = hweight_long(ssp_mask); ssp_num = hweight_long(ssp_mask);
......
sound/soc/intel/boards/sof_sdw_common.h
View file @ bd5838c8
...@@ -148,75 +148,75 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd); ...@@ -148,75 +148,75 @@ int sof_sdw_hdmi_init(struct snd_soc_pcm_runtime *rtd);
int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card); int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card);
/* DMIC support */ /* DMIC support */
int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd); int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd);
/* RT711 support */ /* RT711 support */
int sof_sdw_rt711_init(struct snd_soc_card *card, int asoc_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* RT711-SDCA support */ /* RT711-SDCA support */
int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card, int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link); int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* RT1308 I2S support */ /* RT1308 I2S support */
extern const struct snd_soc_ops sof_sdw_rt1308_i2s_ops; extern const struct snd_soc_ops soc_sdw_rt1308_i2s_ops;
/* generic amp support */ /* generic amp support */
int sof_sdw_rt_amp_init(struct snd_soc_card *card, int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info,
bool playback);
int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* MAXIM codec support */
int asoc_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link);
/* MAXIM codec support */
int sof_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info,
bool playback);
/* CS42L43 support */ /* CS42L43 support */
int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
/* CS AMP support */ /* CS AMP support */
int bridge_cs35l56_count_sidecar(struct snd_soc_card *card, int asoc_sdw_bridge_cs35l56_count_sidecar(struct snd_soc_card *card,
int *num_dais, int *num_devs); int *num_dais, int *num_devs);
int bridge_cs35l56_add_sidecar(struct snd_soc_card *card, int asoc_sdw_bridge_cs35l56_add_sidecar(struct snd_soc_card *card,
struct snd_soc_dai_link **dai_links, struct snd_soc_dai_link **dai_links,
struct snd_soc_codec_conf **codec_conf); struct snd_soc_codec_conf **codec_conf);
int bridge_cs35l56_spk_init(struct snd_soc_card *card, int asoc_sdw_bridge_cs35l56_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
int sof_sdw_cs_amp_init(struct snd_soc_card *card, int asoc_sdw_cs_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback); bool playback);
/* dai_link init callbacks */ /* dai_link init callbacks */
int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai); int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
#endif #endif
sound/soc/intel/boards/sof_sdw_cs42l42.c
View file @ bd5838c8
...@@ -36,7 +36,7 @@ static struct snd_soc_jack_pin cs42l42_jack_pins[] = { ...@@ -36,7 +36,7 @@ static struct snd_soc_jack_pin cs42l42_jack_pins[] = {
}, },
}; };
int cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_cs42l42_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
......
sound/soc/intel/boards/sof_sdw_cs42l43.c
View file @ bd5838c8
...@@ -48,7 +48,7 @@ static struct snd_soc_jack_pin sof_jack_pins[] = { ...@@ -48,7 +48,7 @@ static struct snd_soc_jack_pin sof_jack_pins[] = {
}, },
}; };
int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component;
struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card); struct mc_private *ctx = snd_soc_card_get_drvdata(rtd->card);
...@@ -99,7 +99,7 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai ...@@ -99,7 +99,7 @@ int cs42l43_hs_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai
return ret; return ret;
} }
int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
int ret; int ret;
...@@ -121,10 +121,10 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da ...@@ -121,10 +121,10 @@ int cs42l43_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *da
return ret; return ret;
} }
int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, int asoc_sdw_cs42l43_spk_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
/* Do init on playback link only. */ /* Do init on playback link only. */
if (!playback) if (!playback)
...@@ -132,10 +132,10 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card, ...@@ -132,10 +132,10 @@ int sof_sdw_cs42l43_spk_init(struct snd_soc_card *card,
info->amp_num++; info->amp_num++;
return bridge_cs35l56_spk_init(card, dai_links, info, playback); return asoc_sdw_bridge_cs35l56_spk_init(card, dai_links, info, playback);
} }
int cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_cs42l43_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
int ret; int ret;
......
sound/soc/intel/boards/sof_sdw_cs_amp.c
View file @ bd5838c8
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#define CODEC_NAME_SIZE 8 #define CODEC_NAME_SIZE 8
int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
const char *dai_name = rtd->dai_link->codecs->dai_name; const char *dai_name = rtd->dai_link->codecs->dai_name;
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
...@@ -45,10 +45,10 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) ...@@ -45,10 +45,10 @@ int cs_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
return 0; return 0;
} }
int sof_sdw_cs_amp_init(struct snd_soc_card *card, int asoc_sdw_cs_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
/* Do init on playback link only. */ /* Do init on playback link only. */
if (!playback) if (!playback)
......
sound/soc/intel/boards/sof_sdw_dmic.c
View file @ bd5838c8
...@@ -19,7 +19,7 @@ static const struct snd_soc_dapm_route dmic_map[] = { ...@@ -19,7 +19,7 @@ static const struct snd_soc_dapm_route dmic_map[] = {
{"DMic", NULL, "SoC DMIC"}, {"DMic", NULL, "SoC DMIC"},
}; };
int sof_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd) int asoc_sdw_dmic_init(struct snd_soc_pcm_runtime *rtd)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
int ret; int ret;
......
sound/soc/intel/boards/sof_sdw_maxim.c
View file @ bd5838c8
...@@ -21,7 +21,7 @@ static const struct snd_soc_dapm_route max_98373_dapm_routes[] = { ...@@ -21,7 +21,7 @@ static const struct snd_soc_dapm_route max_98373_dapm_routes[] = {
{ "Right Spk", NULL, "Right BE_OUT" }, { "Right Spk", NULL, "Right BE_OUT" },
}; };
int maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_maxim_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
int ret; int ret;
...@@ -75,7 +75,7 @@ static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enabl ...@@ -75,7 +75,7 @@ static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enabl
return 0; return 0;
} }
static int mx8373_sdw_prepare(struct snd_pcm_substream *substream) static int asoc_sdw_mx8373_prepare(struct snd_pcm_substream *substream)
{ {
int ret; int ret;
...@@ -87,7 +87,7 @@ static int mx8373_sdw_prepare(struct snd_pcm_substream *substream) ...@@ -87,7 +87,7 @@ static int mx8373_sdw_prepare(struct snd_pcm_substream *substream)
return mx8373_enable_spk_pin(substream, true); return mx8373_enable_spk_pin(substream, true);
} }
static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream) static int asoc_sdw_mx8373_hw_free(struct snd_pcm_substream *substream)
{ {
int ret; int ret;
...@@ -101,14 +101,14 @@ static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream) ...@@ -101,14 +101,14 @@ static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream)
static const struct snd_soc_ops max_98373_sdw_ops = { static const struct snd_soc_ops max_98373_sdw_ops = {
.startup = asoc_sdw_startup, .startup = asoc_sdw_startup,
.prepare = mx8373_sdw_prepare, .prepare = asoc_sdw_mx8373_prepare,
.trigger = asoc_sdw_trigger, .trigger = asoc_sdw_trigger,
.hw_params = asoc_sdw_hw_params, .hw_params = asoc_sdw_hw_params,
.hw_free = mx8373_sdw_hw_free, .hw_free = asoc_sdw_mx8373_hw_free,
.shutdown = asoc_sdw_shutdown, .shutdown = asoc_sdw_shutdown,
}; };
static int mx8373_sdw_late_probe(struct snd_soc_card *card) static int asoc_sdw_mx8373_sdw_late_probe(struct snd_soc_card *card)
{ {
struct snd_soc_dapm_context *dapm = &card->dapm; struct snd_soc_dapm_context *dapm = &card->dapm;
...@@ -118,10 +118,10 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card) ...@@ -118,10 +118,10 @@ static int mx8373_sdw_late_probe(struct snd_soc_card *card)
return snd_soc_dapm_sync(dapm); return snd_soc_dapm_sync(dapm);
} }
int sof_sdw_maxim_init(struct snd_soc_card *card, int asoc_sdw_maxim_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
info->amp_num++; info->amp_num++;
...@@ -133,7 +133,7 @@ int sof_sdw_maxim_init(struct snd_soc_card *card, ...@@ -133,7 +133,7 @@ int sof_sdw_maxim_init(struct snd_soc_card *card,
*/ */
break; break;
case SOF_SDW_PART_ID_MAX98373: case SOF_SDW_PART_ID_MAX98373:
info->codec_card_late_probe = mx8373_sdw_late_probe; info->codec_card_late_probe = asoc_sdw_mx8373_sdw_late_probe;
dai_links->ops = &max_98373_sdw_ops; dai_links->ops = &max_98373_sdw_ops;
break; break;
default: default:
......
sound/soc/intel/boards/sof_sdw_rt5682.c
View file @ bd5838c8
...@@ -35,7 +35,7 @@ static struct snd_soc_jack_pin rt5682_jack_pins[] = { ...@@ -35,7 +35,7 @@ static struct snd_soc_jack_pin rt5682_jack_pins[] = {
}, },
}; };
int rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt5682_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
......
sound/soc/intel/boards/sof_sdw_rt700.c
View file @ bd5838c8
...@@ -33,7 +33,7 @@ static struct snd_soc_jack_pin rt700_jack_pins[] = { ...@@ -33,7 +33,7 @@ static struct snd_soc_jack_pin rt700_jack_pins[] = {
}, },
}; };
int rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt700_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
......
sound/soc/intel/boards/sof_sdw_rt711.c
View file @ bd5838c8
...@@ -59,7 +59,7 @@ static struct snd_soc_jack_pin rt711_jack_pins[] = { ...@@ -59,7 +59,7 @@ static struct snd_soc_jack_pin rt711_jack_pins[] = {
}, },
}; };
int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
...@@ -111,7 +111,7 @@ int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) ...@@ -111,7 +111,7 @@ int rt711_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
return ret; return ret;
} }
int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) int asoc_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
...@@ -124,10 +124,10 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l ...@@ -124,10 +124,10 @@ int sof_sdw_rt711_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_l
return 0; return 0;
} }
int sof_sdw_rt711_init(struct snd_soc_card *card, int asoc_sdw_rt711_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct device *sdw_dev; struct device *sdw_dev;
......
sound/soc/intel/boards/sof_sdw_rt712_sdca.c
View file @ bd5838c8
...@@ -26,7 +26,7 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = { ...@@ -26,7 +26,7 @@ static const struct snd_soc_dapm_route rt712_spk_map[] = {
{ "Speaker", NULL, "rt712 SPOR" }, { "Speaker", NULL, "rt712 SPOR" },
}; };
int rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt712_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
int ret; int ret;
......
sound/soc/intel/boards/sof_sdw_rt722_sdca.c
View file @ bd5838c8
...@@ -19,7 +19,7 @@ static const struct snd_soc_dapm_route rt722_spk_map[] = { ...@@ -19,7 +19,7 @@ static const struct snd_soc_dapm_route rt722_spk_map[] = {
{ "Speaker", NULL, "rt722 SPK" }, { "Speaker", NULL, "rt722 SPK" },
}; };
int rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt722_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
int ret; int ret;
......
sound/soc/intel/boards/sof_sdw_rt_amp.c
View file @ bd5838c8
...@@ -173,7 +173,7 @@ static const struct snd_soc_dapm_route *get_codec_name_and_route(struct snd_soc_ ...@@ -173,7 +173,7 @@ static const struct snd_soc_dapm_route *get_codec_name_and_route(struct snd_soc_
return rt1318_map; return rt1318_map;
} }
int rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt_amp_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
const struct snd_soc_dapm_route *rt_amp_map; const struct snd_soc_dapm_route *rt_amp_map;
...@@ -233,11 +233,11 @@ static int rt1308_i2s_hw_params(struct snd_pcm_substream *substream, ...@@ -233,11 +233,11 @@ static int rt1308_i2s_hw_params(struct snd_pcm_substream *substream,
} }
/* machine stream operations */ /* machine stream operations */
const struct snd_soc_ops sof_sdw_rt1308_i2s_ops = { const struct snd_soc_ops soc_sdw_rt1308_i2s_ops = {
.hw_params = rt1308_i2s_hw_params, .hw_params = rt1308_i2s_hw_params,
}; };
int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) int asoc_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
...@@ -254,10 +254,10 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_ ...@@ -254,10 +254,10 @@ int sof_sdw_rt_amp_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_
return 0; return 0;
} }
int sof_sdw_rt_amp_init(struct snd_soc_card *card, int asoc_sdw_rt_amp_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct device *sdw_dev1, *sdw_dev2; struct device *sdw_dev1, *sdw_dev2;
......
sound/soc/intel/boards/sof_sdw_rt_dmic.c
View file @ bd5838c8
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "sof_board_helpers.h" #include "sof_board_helpers.h"
#include "sof_sdw_common.h" #include "sof_sdw_common.h"
int rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt_dmic_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct snd_soc_component *component; struct snd_soc_component *component;
......
sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c
View file @ bd5838c8
...@@ -83,7 +83,7 @@ static const char * const need_sdca_suffix[] = { ...@@ -83,7 +83,7 @@ static const char * const need_sdca_suffix[] = {
"rt711", "rt713" "rt711", "rt713"
}; };
int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai) int asoc_sdw_rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai)
{ {
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
...@@ -161,7 +161,7 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *d ...@@ -161,7 +161,7 @@ int rt_sdca_jack_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *d
return ret; return ret;
} }
int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link) int asoc_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
...@@ -178,10 +178,10 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link ...@@ -178,10 +178,10 @@ int sof_sdw_rt_sdca_jack_exit(struct snd_soc_card *card, struct snd_soc_dai_link
return 0; return 0;
} }
int sof_sdw_rt_sdca_jack_init(struct snd_soc_card *card, int asoc_sdw_rt_sdca_jack_init(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_links, struct snd_soc_dai_link *dai_links,
struct asoc_sdw_codec_info *info, struct asoc_sdw_codec_info *info,
bool playback) bool playback)
{ {
struct mc_private *ctx = snd_soc_card_get_drvdata(card); struct mc_private *ctx = snd_soc_card_get_drvdata(card);
struct device *sdw_dev; struct device *sdw_dev;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7