Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
ASoC: add symmetric_ prefix for dai->rate/channels/sample_bits
snd_soc_dai has rate/channels/sample_bits parameter, but it is only valid
if symmetry is being enforced by symmetric_xxx flag on driver.
It is very difficult to know about it from current naming, and easy to
misunderstand it. add symmetric_ prefix for it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87zfmd8bnf.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
authored by
Kuninori Morimoto
and committed by
Mark Brown
1bd775da
725570f9
+26
-25
+3
-3
include/sound/soc-dai.h
+3
-3
include/sound/soc-dai.h
···
449
449
struct snd_soc_dai_stream stream[SNDRV_PCM_STREAM_LAST + 1];
450
450
451
451
/* Symmetry data - only valid if symmetry is being enforced */
452
-
unsigned int rate;
453
-
unsigned int channels;
454
-
unsigned int sample_bits;
452
+
unsigned int symmetric_rate;
453
+
unsigned int symmetric_channels;
454
+
unsigned int symmetric_sample_bits;
455
455
456
456
/* parent platform/codec */
457
457
struct snd_soc_component *component;
+1
-1
sound/soc/mediatek/mt8188/mt8188-dai-pcm.c
+1
-1
sound/soc/mediatek/mt8188/mt8188-dai-pcm.c
+1
-1
sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
+1
-1
sound/soc/mediatek/mt8195/mt8195-dai-pcm.c
+3
-3
sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
+3
-3
sound/soc/mediatek/mt8365/mt8365-dai-dmic.c
···
118
118
unsigned int clk_phase_sel_ch1 = dmic_data->clk_phase_sel_ch1;
119
119
unsigned int clk_phase_sel_ch2 = dmic_data->clk_phase_sel_ch2;
120
120
unsigned int val = 0;
121
-
unsigned int rate = dai->rate;
122
-
int reg = get_chan_reg(dai->channels);
121
+
unsigned int rate = dai->symmetric_rate;
122
+
int reg = get_chan_reg(dai->symmetric_channels);
123
123
124
124
if (reg < 0)
125
125
return -EINVAL;
126
126
127
-
dmic_data->dmic_channel = dai->channels;
127
+
dmic_data->dmic_channel = dai->symmetric_channels;
128
128
129
129
val |= DMIC_TOP_CON_SDM3_LEVEL_MODE;
130
130
+1
-1
sound/soc/mediatek/mt8365/mt8365-dai-pcm.c
+1
-1
sound/soc/mediatek/mt8365/mt8365-dai-pcm.c
+2
-2
sound/soc/soc-compress.c
+2
-2
sound/soc/soc-compress.c
···
69
69
snd_soc_dai_digital_mute(codec_dai, 1, stream);
70
70
71
71
if (!snd_soc_dai_active(cpu_dai))
72
-
cpu_dai->rate = 0;
72
+
cpu_dai->symmetric_rate = 0;
73
73
74
74
if (!snd_soc_dai_active(codec_dai))
75
-
codec_dai->rate = 0;
75
+
codec_dai->symmetric_rate = 0;
76
76
77
77
snd_soc_link_compr_shutdown(cstream, rollback);
78
78
+15
-14
sound/soc/soc-pcm.c
+15
-14
sound/soc/soc-pcm.c
···
447
447
struct snd_pcm_hw_params *params)
448
448
{
449
449
if (params) {
450
-
dai->rate = params_rate(params);
451
-
dai->channels = params_channels(params);
452
-
dai->sample_bits = snd_pcm_format_physical_width(params_format(params));
450
+
dai->symmetric_rate = params_rate(params);
451
+
dai->symmetric_channels = params_channels(params);
452
+
dai->symmetric_sample_bits = snd_pcm_format_physical_width(params_format(params));
453
453
} else {
454
-
dai->rate = 0;
455
-
dai->channels = 0;
456
-
dai->sample_bits = 0;
454
+
dai->symmetric_rate = 0;
455
+
dai->symmetric_channels = 0;
456
+
dai->symmetric_sample_bits = 0;
457
457
}
458
458
}
459
459
···
467
467
return 0;
468
468
469
469
#define __soc_pcm_apply_symmetry(name, NAME) \
470
-
if (soc_dai->name && (soc_dai->driver->symmetric_##name || \
471
-
rtd->dai_link->symmetric_##name)) { \
470
+
if (soc_dai->symmetric_##name && \
471
+
(soc_dai->driver->symmetric_##name || rtd->dai_link->symmetric_##name)) { \
472
472
dev_dbg(soc_dai->dev, "ASoC: Symmetry forces %s to %d\n",\
473
-
#name, soc_dai->name); \
473
+
#name, soc_dai->symmetric_##name); \
474
474
\
475
475
ret = snd_pcm_hw_constraint_single(substream->runtime, \
476
476
SNDRV_PCM_HW_PARAM_##NAME,\
477
-
soc_dai->name); \
477
+
soc_dai->symmetric_##name); \
478
478
if (ret < 0) { \
479
479
dev_err(soc_dai->dev, \
480
480
"ASoC: Unable to apply %s constraint: %d\n",\
···
510
510
if (symmetry) \
511
511
for_each_rtd_cpu_dais(rtd, i, cpu_dai) \
512
512
if (!snd_soc_dai_is_dummy(cpu_dai) && \
513
-
cpu_dai->xxx && cpu_dai->xxx != d.xxx) { \
513
+
cpu_dai->symmetric_##xxx && \
514
+
cpu_dai->symmetric_##xxx != d.symmetric_##xxx) { \
514
515
dev_err(rtd->dev, "ASoC: unmatched %s symmetry: %s:%d - %s:%d\n", \
515
-
#xxx, cpu_dai->name, cpu_dai->xxx, d.name, d.xxx); \
516
+
#xxx, cpu_dai->name, cpu_dai->symmetric_##xxx, \
517
+
d.name, d.symmetric_##xxx); \
516
518
return -EINVAL; \
517
519
}
518
520
···
785
783
786
784
/* Make sure DAI parameters cleared if the DAI becomes inactive */
787
785
for_each_rtd_dais(rtd, i, dai) {
788
-
if (snd_soc_dai_active(dai) == 0 &&
789
-
(dai->rate || dai->channels || dai->sample_bits))
786
+
if (snd_soc_dai_active(dai) == 0)
790
787
soc_pcm_set_dai_params(dai, NULL);
791
788
}
792
789
}