lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 424/671] ASoC: ti: davinci-mcasp: Fix slot mask settings when using multiple AXRs
    Date
    From: Peter Ujfalusi <peter.ujfalusi@ti.com>

    [ Upstream commit fd14f4436fd47d5418023c90e933e66d3645552e ]

    If multiple serializers are connected in the system and the number of
    channels will need to use more than one serializer the mask to enable the
    serializers were left to 0 if tdm_mask is provided

    Fixes: dd55ff8346a97 ("ASoC: davinci-mcasp: Add set_tdm_slots() support")

    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/davinci/davinci-mcasp.c | 13 ++++++-------
    1 file changed, 6 insertions(+), 7 deletions(-)

    diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
    index 6a8c279a4b20..14ab16e1369f 100644
    --- a/sound/soc/davinci/davinci-mcasp.c
    +++ b/sound/soc/davinci/davinci-mcasp.c
    @@ -874,14 +874,13 @@ static int mcasp_i2s_hw_param(struct davinci_mcasp *mcasp, int stream,
    active_slots = hweight32(mcasp->tdm_mask[stream]);
    active_serializers = (channels + active_slots - 1) /
    active_slots;
    - if (active_serializers == 1) {
    + if (active_serializers == 1)
    active_slots = channels;
    - for (i = 0; i < total_slots; i++) {
    - if ((1 << i) & mcasp->tdm_mask[stream]) {
    - mask |= (1 << i);
    - if (--active_slots <= 0)
    - break;
    - }
    + for (i = 0; i < total_slots; i++) {
    + if ((1 << i) & mcasp->tdm_mask[stream]) {
    + mask |= (1 << i);
    + if (--active_slots <= 0)
    + break;
    }
    }
    } else {
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-01-16 19:51    [W:2.987 / U:0.832 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site