]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: rsnd: SSI PIO adjust to 24bit mode
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 24 May 2017 01:17:10 +0000 (01:17 +0000)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:25 +0000 (21:36 -0400)
[ Upstream commit 7819a942de7b993771bd9377babc80485fe7606b ]

commit 90431eb49bff ("ASoC: rsnd: don't use PDTA bit for 24bit on SSI")
fixups 24bit mode data alignment, but PIO was not cared.
This patch fixes PIO mode 24bit data alignment

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@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

index 4599983cfc8a26261af4899982a423c84cdce3a8..c3b9d01d4e91bf8029bf0427e1880cec60b1c7f5 100644 (file)
@@ -396,6 +396,13 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
                struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
                u32 *buf = (u32 *)(runtime->dma_area +
                                   rsnd_dai_pointer_offset(io, 0));
+               int shift = 0;
+
+               switch (runtime->sample_bits) {
+               case 32:
+                       shift = 8;
+                       break;
+               }
 
                /*
                 * 8/16/32 data can be assesse to TDR/RDR register
@@ -403,9 +410,9 @@ static irqreturn_t rsnd_ssi_interrupt(int irq, void *data)
                 * see rsnd_ssi_init()
                 */
                if (rsnd_io_is_play(io))
-                       rsnd_mod_write(mod, SSITDR, *buf);
+                       rsnd_mod_write(mod, SSITDR, (*buf) << shift);
                else
-                       *buf = rsnd_mod_read(mod, SSIRDR);
+                       *buf = (rsnd_mod_read(mod, SSIRDR) >> shift);
 
                rsnd_dai_pointer_update(io, sizeof(*buf));
        }