Patch "ASoC: rcar: adg: correct TIMSEL setting for SSI9" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    ASoC: rcar: adg: correct TIMSEL setting for SSI9

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     asoc-rcar-adg-correct-timsel-setting-for-ssi9.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 81788840e63e8f7ee05224fb806fc4dfeb7fdaa3
Author: Andreas Pape <Andreas.Pape4@xxxxxxxxx>
Date:   Fri Mar 1 09:50:03 2024 +0100

    ASoC: rcar: adg: correct TIMSEL setting for SSI9
    
    [ Upstream commit cbae1a350e3ceff38242a4905805c80ccbcfbba5 ]
    
    Timing select registers for SRC and CMD are by default
    referring to the corresponding SSI word select.
    The calculation rule from HW spec skips SSI8, which has
    no clock connection.
    
    >From section 43.2.18 CMD Output Timing Select Register (CMDOUT_TIMSEL),
    of R-Car Series, 3rd Generation Hardware User’s Manual Rev.2.20:
    
    CMD0_OUT_DIVCLK_        Output Timing
    SEL [4:0]               Signal Select
    B'0 0110:               ssi_ws0
    B'0 0111:               ssi_ws1
    B'0 1000:               ssi_ws2
    B'0 1001:               ssi_ws3
    B'0 1010:               ssi_ws4
    B'0 1011:               ssi_ws5
    B'0 1100:               ssi_ws6
    B'0 1101:               ssi_ws7
            <GAP>
    B'0 1110:               ssi_ws9
    B'0 1111:               Setting prohibited
    
    Fix the erroneous prohibited setting of timsel value 1111 (0xf) for SSI9
    by using timsel value 1110 (0xe) instead. This is possible because SSI8
    is not connected as shown by <GAP> in the table above.
    
    [21.695055] rcar_sound ec500000.sound: b adg[0]-CMDOUT_TIMSEL (32):00000f00/00000f1f
    
    Correct the timsel assignment.
    
    Fixes: 629509c5bc478c ("ASoC: rsnd: add Gen2 SRC and DMAEngine support")
    Suggested-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Signed-off-by: Andreas Pape <Andreas.Pape4@xxxxxxxxx>
    Signed-off-by: Yeswanth Rayapati <yeswanth.rayapati@xxxxxxxxxxxx>
    Tested-by: Yeswanth Rayapati <yeswanth.rayapati@xxxxxxxxxxxx>
    [erosca: massage commit description]
    Signed-off-by: Eugeniu Rosca <eugeniu.rosca@xxxxxxxxx>
    Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
    Link: https://msgid.link/r/20240301085003.3057-1-erosca@xxxxxxxxxxxxxx
    Signed-off-by: Mark Brown <broonie@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 5f1e72edfee04..d6f60951e722c 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -99,6 +99,13 @@ static u32 rsnd_adg_ssi_ws_timing_gen2(struct rsnd_dai_stream *io)
 			ws = 7;
 			break;
 		}
+	} else {
+		/*
+		 * SSI8 is not connected to ADG.
+		 * Thus SSI9 is using ws = 8
+		 */
+		if (id == 9)
+			ws = 8;
 	}
 
 	return (0x6 + ws) << 8;