summaryrefslogtreecommitdiff
path: root/sound/soc/sh/rcar/adg.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2024-03-08 10:53:36 +0300
committerTakashi Iwai <tiwai@suse.de>2024-03-08 10:53:36 +0300
commit21e59fe2f7221cdc77b2e5ef90a04c302b237053 (patch)
tree8a60d46aa60e30416582d64a0e85c9b7b07ff87b /sound/soc/sh/rcar/adg.c
parenta17bd44c0146b00fcaa692915789c16bd1fb2a81 (diff)
parent96e202f8c52ac49452f83317cf3b34cd1ad81e18 (diff)
downloadlinux-21e59fe2f7221cdc77b2e5ef90a04c302b237053.tar.xz
Merge tag 'asoc-fix-v6.8-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.8 Some more driver specific fixes for v6.8, plus one new x86 platform quirk. All good fixes to have if you have systems that use the relevant hardware.
Diffstat (limited to 'sound/soc/sh/rcar/adg.c')
-rw-r--r--sound/soc/sh/rcar/adg.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
index 230c48648af3..afd69c6eb654 100644
--- a/sound/soc/sh/rcar/adg.c
+++ b/sound/soc/sh/rcar/adg.c
@@ -111,6 +111,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;