Skip to content

Commit fe07123

Browse files
AngeloGioacchino Del Regnobroonie
authored andcommitted
ASoC: mediatek: Add common snd_soc_ops .startup() callback
MediaTek platforms are typically setting PCM rate and channels constraints for playback, capture and HDMI/DisplayPort playback: commonize the startup callback by adding the PCM constraints data to the mtk_platform_card_data structure and by reusing the common mtk_soundcard_startup() function for all of them by getting back the parameters from the aforementioned struct. Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20240416071410.75620-8-angelogioacchino.delregno@collabora.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 44a53c8 commit fe07123

2 files changed

Lines changed: 75 additions & 0 deletions

File tree

sound/soc/mediatek/common/mtk-soundcard-driver.c

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,57 @@ void clean_card_reference(struct snd_soc_card *card)
139139
}
140140
EXPORT_SYMBOL_GPL(clean_card_reference);
141141

142+
int mtk_soundcard_startup(struct snd_pcm_substream *substream,
143+
enum mtk_pcm_constraint_type ctype)
144+
{
145+
struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
146+
struct mtk_soc_card_data *soc_card = snd_soc_card_get_drvdata(rtd->card);
147+
const struct mtk_pcm_constraints_data *mpc = &soc_card->card_data->pcm_constraints[ctype];
148+
int ret;
149+
150+
if (unlikely(!mpc))
151+
return -EINVAL;
152+
153+
ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
154+
SNDRV_PCM_HW_PARAM_RATE,
155+
mpc->rates);
156+
if (ret < 0) {
157+
dev_err(rtd->dev, "hw_constraint_list rate failed\n");
158+
return ret;
159+
}
160+
161+
ret = snd_pcm_hw_constraint_list(substream->runtime, 0,
162+
SNDRV_PCM_HW_PARAM_CHANNELS,
163+
mpc->channels);
164+
if (ret < 0) {
165+
dev_err(rtd->dev, "hw_constraint_list channel failed\n");
166+
return ret;
167+
}
168+
169+
return 0;
170+
}
171+
EXPORT_SYMBOL_GPL(mtk_soundcard_startup);
172+
173+
static int mtk_soundcard_playback_startup(struct snd_pcm_substream *substream)
174+
{
175+
return mtk_soundcard_startup(substream, MTK_CONSTRAINT_PLAYBACK);
176+
}
177+
178+
const struct snd_soc_ops mtk_soundcard_common_playback_ops = {
179+
.startup = mtk_soundcard_playback_startup,
180+
};
181+
EXPORT_SYMBOL_GPL(mtk_soundcard_common_playback_ops);
182+
183+
static int mtk_soundcard_capture_startup(struct snd_pcm_substream *substream)
184+
{
185+
return mtk_soundcard_startup(substream, MTK_CONSTRAINT_CAPTURE);
186+
}
187+
188+
const struct snd_soc_ops mtk_soundcard_common_capture_ops = {
189+
.startup = mtk_soundcard_capture_startup,
190+
};
191+
EXPORT_SYMBOL_GPL(mtk_soundcard_common_capture_ops);
192+
142193
int mtk_soundcard_common_probe(struct platform_device *pdev)
143194
{
144195
struct device_node *platform_node, *adsp_node;

sound/soc/mediatek/common/mtk-soundcard-driver.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,45 @@
1111

1212
struct mtk_sof_priv;
1313
struct mtk_soc_card_data;
14+
struct snd_pcm_hw_constraint_list;
15+
16+
enum mtk_pcm_constraint_type {
17+
MTK_CONSTRAINT_PLAYBACK,
18+
MTK_CONSTRAINT_CAPTURE,
19+
MTK_CONSTRAINT_HDMIDP,
20+
MTK_CONSTRAINT_MAX
21+
};
22+
23+
struct mtk_pcm_constraints_data {
24+
const struct snd_pcm_hw_constraint_list *channels;
25+
const struct snd_pcm_hw_constraint_list *rates;
26+
};
1427

1528
struct mtk_platform_card_data {
1629
struct snd_soc_card *card;
1730
struct snd_soc_jack *jacks;
31+
const struct mtk_pcm_constraints_data *pcm_constraints;
1832
u8 num_jacks;
33+
u8 num_pcm_constraints;
1934
u8 flags;
2035
};
2136

2237
struct mtk_soundcard_pdata {
2338
const char *card_name;
2439
struct mtk_platform_card_data *card_data;
2540
const struct mtk_sof_priv *sof_priv;
41+
2642
int (*soc_probe)(struct mtk_soc_card_data *card_data, bool legacy);
2743
};
2844

45+
/* Common playback/capture card startup ops */
46+
extern const struct snd_soc_ops mtk_soundcard_common_playback_ops;
47+
extern const struct snd_soc_ops mtk_soundcard_common_capture_ops;
48+
49+
/* Exported for custom/extended soundcard startup ops */
50+
int mtk_soundcard_startup(struct snd_pcm_substream *substream,
51+
enum mtk_pcm_constraint_type ctype);
52+
2953
int parse_dai_link_info(struct snd_soc_card *card);
3054
void clean_card_reference(struct snd_soc_card *card);
3155
int mtk_soundcard_common_probe(struct platform_device *pdev);

0 commit comments

Comments
 (0)