diff mbox series

ASoC: ak4613: cares Simple-Audio-Card case for TDM

Message ID 87h74v29f7.wl-kuninori.morimoto.gx@renesas.com
State Accepted
Commit ed0073bd0fccec459b526918be70bf9dc551581a
Headers show
Series ASoC: ak4613: cares Simple-Audio-Card case for TDM | expand

Commit Message

Kuninori Morimoto June 8, 2022, 2:09 a.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Renesas is the only user of ak4613 on upstream for now, and
commit f28dbaa958fbd8 ("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>
---
 sound/soc/codecs/ak4613.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Wolfram Sang June 29, 2022, 6:35 a.m. UTC | #1 
> Applied to
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Can we have this as a bugfix, pretty please? The warning is really annoying on my Ebisu
board.

Tested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Wolfram Sang June 29, 2022, 11:31 a.m. UTC | #2 
Maybe a Fixes-tag helps to convince? :)

Fixes: f28dbaa958fb ("ASoC: ak4613: add TDM256 support")
Mark Brown June 30, 2022, 3:10 p.m. UTC | #3 
On Wed, 8 Jun 2022 02:09:16 +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Renesas is the only user of ak4613 on upstream for now, and
> commit f28dbaa958fbd8 ("ASoC: ak4613: add TDM256 support")
> added TDM256 support. Renesas tested part of it, because of
> board connection.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: ak4613: cares Simple-Audio-Card case for TDM
      commit: ed0073bd0fccec459b526918be70bf9dc551581a

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
Mark Brown June 30, 2022, 3:11 p.m. UTC | #4 
On Wed, Jun 29, 2022 at 08:35:15AM +0200, Wolfram Sang wrote:

> Can we have this as a bugfix, pretty please? The warning is really annoying on my Ebisu
> board.

It's already on the way to Linus.
Mark Brown June 30, 2022, 4:55 p.m. UTC | #5 
On Wed, 8 Jun 2022 02:09:16 +0000, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Renesas is the only user of ak4613 on upstream for now, and
> commit f28dbaa958fbd8 ("ASoC: ak4613: add TDM256 support")
> added TDM256 support. Renesas tested part of it, because of
> board connection.
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: ak4613: cares Simple-Audio-Card case for TDM
      commit: ed0073bd0fccec459b526918be70bf9dc551581a

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/codecs/ak4613.c b/sound/soc/codecs/ak4613.c
index 03b829930769..dbdd421f832e 100644
--- a/sound/soc/codecs/ak4613.c
+++ b/sound/soc/codecs/ak4613.c
@@ -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);
 }