lkml.org 
[lkml]   [2023]   [Feb]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] ASoC: amd: vangogh: use for_each_rtd_components instead of for
    Date
    To iterate over components use for_each_rtd_components
    And compare to component name, so asoc_rtd_to_codec and the dai code can
    be removed

    Signed-off-by: Lucas Tanure <lucas.tanure@collabora.com>
    ---
    sound/soc/amd/vangogh/acp5x-mach.c | 40 +++++++++++++++---------------
    1 file changed, 20 insertions(+), 20 deletions(-)

    diff --git a/sound/soc/amd/vangogh/acp5x-mach.c b/sound/soc/amd/vangogh/acp5x-mach.c
    index 841b79fa6af5..e7a7558f70ae 100644
    --- a/sound/soc/amd/vangogh/acp5x-mach.c
    +++ b/sound/soc/amd/vangogh/acp5x-mach.c
    @@ -146,35 +146,35 @@ static int acp5x_cs35l41_startup(struct snd_pcm_substream *substream)
    static int acp5x_cs35l41_hw_params(struct snd_pcm_substream *sub, struct snd_pcm_hw_params *params)
    {
    struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(sub);
    - unsigned int num_codecs = rtd->dai_link->num_codecs;
    - struct snd_soc_card *card = rtd->card;
    - struct snd_soc_dai *dai;
    - unsigned int bclk_val;
    + unsigned int bclk, rate = params_rate(params);
    + struct snd_soc_component *comp;
    int ret, i;

    - ret = 0;
    - for (i = 0; i < num_codecs; i++) {
    - dai = asoc_rtd_to_codec(rtd, i);
    - if (strcmp(dai->name, "cs35l41-pcm") == 0) {
    - switch (params_rate(params)) {
    - case 48000:
    - bclk_val = 1536000;
    - break;
    - default:
    - dev_err(card->dev, "Invalid Samplerate:0x%x\n",
    - params_rate(params));
    + switch (rate) {
    + case 48000:
    + bclk = 1536000;
    + break;
    + default:
    + bclk = 0;
    + break;
    + }
    +
    + for_each_rtd_components(rtd, i, comp) {
    + if (!(strcmp(comp->name, "spi-VLV1776:00")) ||
    + !(strcmp(comp->name, "spi-VLV1776:01"))) {
    + if (!bclk) {
    + dev_err(comp->dev, "Invalid sample rate: 0x%x\n", rate);
    return -EINVAL;
    }
    - ret = snd_soc_component_set_sysclk(dai->component,
    - 0, 0, bclk_val, SND_SOC_CLOCK_IN);
    - if (ret < 0) {
    - dev_err(card->dev, "failed to set sysclk for CS35l41 dai\n");
    + ret = snd_soc_component_set_sysclk(comp, 0, 0, bclk, SND_SOC_CLOCK_IN);
    + if (ret) {
    + dev_err(comp->dev, "failed to set SYSCLK: %d\n", ret);
    return ret;
    }
    }
    }

    - return ret;
    + return 0;
    }

    static const struct snd_soc_ops acp5x_8821_ops = {
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-27 00:25    [W:3.339 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site