| From 4432f39584367123bd0643e0f09d13f0c6653d01 Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Wed, 24 May 2017 01:17:10 +0000 |
| Subject: [PATCH 104/286] ASoC: rsnd: SSI PIO adjust to 24bit mode |
| |
| 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> |
| (cherry picked from commit 7819a942de7b993771bd9377babc80485fe7606b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| sound/soc/sh/rcar/ssi.c | 11 +++++++++-- |
| 1 file changed, 9 insertions(+), 2 deletions(-) |
| |
| --- a/sound/soc/sh/rcar/ssi.c |
| +++ b/sound/soc/sh/rcar/ssi.c |
| @@ -555,6 +555,13 @@ static void __rsnd_ssi_interrupt(struct |
| 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 |
| @@ -562,9 +569,9 @@ static void __rsnd_ssi_interrupt(struct |
| * 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); |
| |
| elapsed = rsnd_dai_pointer_update(io, sizeof(*buf)); |
| } |
