lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 330/757] ASoC: fsl_sai: Instantiate snd_soc_dai_driver
    Date
    From: Shengjiu Wang <shengjiu.wang@nxp.com>

    [ Upstream commit 22a16145af824f91014d07f8664114859900b9e6 ]

    Instantiate snd_soc_dai_driver for independent symmetric control.
    Otherwise the symmetric setting may be overwritten by other
    instance.

    Fixes: 08fdf65e37d5 ("ASoC: fsl_sai: Add asynchronous mode support")
    Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
    Link: https://lore.kernel.org/r/1600424760-32071-1-git-send-email-shengjiu.wang@nxp.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/fsl/fsl_sai.c | 19 +++++++++++--------
    sound/soc/fsl/fsl_sai.h | 1 +
    2 files changed, 12 insertions(+), 8 deletions(-)

    diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
    index cdff739924e2e..2ea354dd5434f 100644
    --- a/sound/soc/fsl/fsl_sai.c
    +++ b/sound/soc/fsl/fsl_sai.c
    @@ -694,7 +694,7 @@ static int fsl_sai_dai_probe(struct snd_soc_dai *cpu_dai)
    return 0;
    }

    -static struct snd_soc_dai_driver fsl_sai_dai = {
    +static struct snd_soc_dai_driver fsl_sai_dai_template = {
    .probe = fsl_sai_dai_probe,
    .playback = {
    .stream_name = "CPU-Playback",
    @@ -966,12 +966,15 @@ static int fsl_sai_probe(struct platform_device *pdev)
    return ret;
    }

    + memcpy(&sai->cpu_dai_drv, &fsl_sai_dai_template,
    + sizeof(fsl_sai_dai_template));
    +
    /* Sync Tx with Rx as default by following old DT binding */
    sai->synchronous[RX] = true;
    sai->synchronous[TX] = false;
    - fsl_sai_dai.symmetric_rates = 1;
    - fsl_sai_dai.symmetric_channels = 1;
    - fsl_sai_dai.symmetric_samplebits = 1;
    + sai->cpu_dai_drv.symmetric_rates = 1;
    + sai->cpu_dai_drv.symmetric_channels = 1;
    + sai->cpu_dai_drv.symmetric_samplebits = 1;

    if (of_find_property(np, "fsl,sai-synchronous-rx", NULL) &&
    of_find_property(np, "fsl,sai-asynchronous", NULL)) {
    @@ -988,9 +991,9 @@ static int fsl_sai_probe(struct platform_device *pdev)
    /* Discard all settings for asynchronous mode */
    sai->synchronous[RX] = false;
    sai->synchronous[TX] = false;
    - fsl_sai_dai.symmetric_rates = 0;
    - fsl_sai_dai.symmetric_channels = 0;
    - fsl_sai_dai.symmetric_samplebits = 0;
    + sai->cpu_dai_drv.symmetric_rates = 0;
    + sai->cpu_dai_drv.symmetric_channels = 0;
    + sai->cpu_dai_drv.symmetric_samplebits = 0;
    }

    if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
    @@ -1020,7 +1023,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
    regcache_cache_only(sai->regmap, true);

    ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component,
    - &fsl_sai_dai, 1);
    + &sai->cpu_dai_drv, 1);
    if (ret)
    goto err_pm_disable;

    diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h
    index 6aba7d28f5f34..677ecfc1ec68f 100644
    --- a/sound/soc/fsl/fsl_sai.h
    +++ b/sound/soc/fsl/fsl_sai.h
    @@ -180,6 +180,7 @@ struct fsl_sai {
    unsigned int bclk_ratio;

    const struct fsl_sai_soc_data *soc_data;
    + struct snd_soc_dai_driver cpu_dai_drv;
    struct snd_dmaengine_dai_dma_data dma_params_rx;
    struct snd_dmaengine_dai_dma_data dma_params_tx;
    };
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:11    [W:4.056 / U:0.228 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site