]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: ak4613: cares Simple-Audio-Card case for TDM
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 8 Jun 2022 02:09:16 +0000 (02:09 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 24 Jun 2022 15:21:36 +0000 (16:21 +0100)
Renesas is the only user of ak4613 on upstream for now, and
commit 1a0c74e5e05745 ("ASoC: ak4613: add TDM256 support")
added TDM256 support. Renesas tested part of it, because of
board connection.

It was assuming ak4613 is probed via Audio-Graph-Card, but it
might be probed via Simple-Audio-Card either.
It will indicates WARNING in such case. This patch fixup it.

Reported-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/87h74v29f7.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/ak4613.c

index 55e773f92122846781b1b0e287fa4d151926fb3e..93606e5afd8f1424b8a8f4af6d6efd7d2fd6d7cf 100644 (file)
@@ -868,10 +868,12 @@ static void ak4613_parse_of(struct ak4613_priv *priv,
 
        /*
         * connected STDI
+        * TDM support is assuming it is probed via Audio-Graph-Card style here.
+        * Default is SDTIx1 if it was probed via Simple-Audio-Card for now.
         */
        sdti_num = of_graph_get_endpoint_count(np);
-       if (WARN_ON((sdti_num > 3) || (sdti_num < 1)))
-               return;
+       if ((sdti_num >= SDTx_MAX) || (sdti_num < 1))
+               sdti_num = 1;
 
        AK4613_CONFIG_SDTI_set(priv, sdti_num);
 }