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 296/757] ASoC: tlv320aic32x4: Fix bdiv clock rate derivation
    Date
    From: Miquel Raynal <miquel.raynal@bootlin.com>

    [ Upstream commit 40b37136287ba6b34aa2f1f6123f3d6d205dc2f0 ]

    Current code expects a single channel to be always used. Fix this
    situation by forwarding the number of channels used. Then fix the
    derivation of the bdiv clock rate.

    Fixes: 96c3bb00239d ("ASoC: tlv320aic32x4: Dynamically Determine Clocking")
    Suggested-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/r/20200911173140.29984-3-miquel.raynal@bootlin.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/codecs/tlv320aic32x4.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
    index 467802875c133..2e2d8e463655a 100644
    --- a/sound/soc/codecs/tlv320aic32x4.c
    +++ b/sound/soc/codecs/tlv320aic32x4.c
    @@ -665,7 +665,7 @@ static int aic32x4_set_processing_blocks(struct snd_soc_component *component,
    }

    static int aic32x4_setup_clocks(struct snd_soc_component *component,
    - unsigned int sample_rate)
    + unsigned int sample_rate, unsigned int channels)
    {
    u8 aosr;
    u16 dosr;
    @@ -753,7 +753,9 @@ static int aic32x4_setup_clocks(struct snd_soc_component *component,
    dosr);

    clk_set_rate(clocks[5].clk,
    - sample_rate * 32);
    + sample_rate * 32 *
    + channels);
    +
    return 0;
    }
    }
    @@ -775,7 +777,8 @@ static int aic32x4_hw_params(struct snd_pcm_substream *substream,
    u8 iface1_reg = 0;
    u8 dacsetup_reg = 0;

    - aic32x4_setup_clocks(component, params_rate(params));
    + aic32x4_setup_clocks(component, params_rate(params),
    + params_channels(params));

    switch (params_width(params)) {
    case 16:
    --
    2.25.1


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