aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2010-07-12 23:01:25 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-07-13 07:26:26 -0400
commit637727838a5e82bc9285ab078a793eaae590bacb (patch)
tree1bf99fb29bc161c4b74671019fdd73d368a813e1 /sound/soc
parentb427b44cc8793af521b0dc3a9fdd9fcc275c3bd7 (diff)
ASoC: fsi: fixup wrong value setting order of TDM
channel size should be set before setting register value Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/sh/fsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c
index 4fa75087c45b..ec4acac49ebd 100644
--- a/sound/soc/sh/fsi.c
+++ b/sound/soc/sh/fsi.c
@@ -721,15 +721,15 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
721 break; 721 break;
722 case SH_FSI_FMT_TDM: 722 case SH_FSI_FMT_TDM:
723 msg = "TDM"; 723 msg = "TDM";
724 data = CR_FMT(CR_TDM) | (fsi->chan - 1);
725 fsi->chan = is_play ? 724 fsi->chan = is_play ?
726 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags); 725 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
726 data = CR_FMT(CR_TDM) | (fsi->chan - 1);
727 break; 727 break;
728 case SH_FSI_FMT_TDM_DELAY: 728 case SH_FSI_FMT_TDM_DELAY:
729 msg = "TDM Delay"; 729 msg = "TDM Delay";
730 data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);
731 fsi->chan = is_play ? 730 fsi->chan = is_play ?
732 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags); 731 SH_FSI_GET_CH_O(flags) : SH_FSI_GET_CH_I(flags);
732 data = CR_FMT(CR_TDM_D) | (fsi->chan - 1);
733 break; 733 break;
734 default: 734 default:
735 dev_err(dai->dev, "unknown format.\n"); 735 dev_err(dai->dev, "unknown format.\n");