lkml.org 
[lkml]   [2018]   [Mar]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 064/219] ASoC: rcar: ssi: don't set SSICR.CKDV = 000 with SSIWSR.CONT
    Date
    From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

    [ Upstream commit 6b8530cc056efd4a11b034ca5b1e9f7e9563f553 ]

    R-Car Datasheet is indicating "SSICR.CKDV = 000 is invalid when
    SSIWSR.WS_MODE = 1 or SSIWSR.CONT = 1".
    Current driver will set CONT, thus, we shouldn't use CKDV = 000.
    This patch fixup it.

    Reported-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
    Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
    Tested-by: Hiroyuki Yokoyama <hiroyuki.yokoyama.vx@renesas.com>
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    sound/soc/sh/rcar/ssi.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
    index a9a43acce30e..fefa6ad5de8b 100644
    --- a/sound/soc/sh/rcar/ssi.c
    +++ b/sound/soc/sh/rcar/ssi.c
    @@ -232,6 +232,15 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod,
    */
    for (j = 0; j < ARRAY_SIZE(ssi_clk_mul_table); j++) {

    + /*
    + * It will set SSIWSR.CONT here, but SSICR.CKDV = 000
    + * with it is not allowed. (SSIWSR.WS_MODE with
    + * SSICR.CKDV = 000 is not allowed either).
    + * Skip it. See SSICR.CKDV
    + */
    + if (j == 0)
    + continue;
    +
    /*
    * this driver is assuming that
    * system word is 32bit x chan
    --
    2.14.1
    \
     
     \ /
      Last update: 2018-03-04 00:56    [W:4.788 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site