On Mon 01 Apr 2024 at 00:31, Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx> wrote:
> soc_get_playback_capture() is now handling DPCM and normal comprehensively
> for playback/capture stream. We can use playback/capture_only flag
> instead of using dpcm_playback/capture. This patch replace these.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Looks OK
Reviewed-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx>
> ---
> sound/soc/meson/axg-card.c | 8 ++++----
> sound/soc/meson/meson-card-utils.c | 4 ++--
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/sound/soc/meson/axg-card.c b/sound/soc/meson/axg-card.c
> index 3180aa4d3a15..21bf1453af43 100644
> --- a/sound/soc/meson/axg-card.c
> +++ b/sound/soc/meson/axg-card.c
> @@ -132,7 +132,7 @@ static int axg_card_add_tdm_loopback(struct snd_soc_card *card,
> lb->stream_name = lb->name;
> lb->cpus->of_node = pad->cpus->of_node;
> lb->cpus->dai_name = "TDM Loopback";
> - lb->dpcm_capture = 1;
> + lb->capture_only = 1;
> lb->no_pcm = 1;
> lb->ops = &axg_card_tdm_be_ops;
> lb->init = axg_card_tdm_dai_lb_init;
> @@ -176,7 +176,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card,
>
> /* Disable playback is the interface has no tx slots */
> if (!tx)
> - link->dpcm_playback = 0;
> + link->capture_only = 1;
>
> for (i = 0, rx = 0; i < AXG_TDM_NUM_LANES; i++) {
> snprintf(propname, 32, "dai-tdm-slot-rx-mask-%d", i);
> @@ -186,7 +186,7 @@ static int axg_card_parse_cpu_tdm_slots(struct snd_soc_card *card,
>
> /* Disable capture is the interface has no rx slots */
> if (!rx)
> - link->dpcm_capture = 0;
> + link->playback_only = 1;
>
> /* ... but the interface should at least have one of them */
> if (!tx && !rx) {
> @@ -275,7 +275,7 @@ static int axg_card_parse_tdm(struct snd_soc_card *card,
> return ret;
>
> /* Add loopback if the pad dai has playback */
> - if (link->dpcm_playback) {
> + if (!link->capture_only) {
> ret = axg_card_add_tdm_loopback(card, index);
> if (ret)
> return ret;
> diff --git a/sound/soc/meson/meson-card-utils.c b/sound/soc/meson/meson-card-utils.c
> index ed6c7e2f609c..1a4ef124e4e2 100644
> --- a/sound/soc/meson/meson-card-utils.c
> +++ b/sound/soc/meson/meson-card-utils.c
> @@ -186,9 +186,9 @@ int meson_card_set_fe_link(struct snd_soc_card *card,
> link->dpcm_merged_rate = 1;
>
> if (is_playback)
> - link->dpcm_playback = 1;
> + link->playback_only = 1;
> else
> - link->dpcm_capture = 1;
> + link->capture_only = 1;
>
> return meson_card_set_link_name(card, link, node, "fe");
> }
--
Jerome
