aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2017-08-08 21:46:23 -0400
committerMark Brown <broonie@kernel.org>2017-08-09 12:56:14 -0400
commit29d03ff5c752e02918e8319fdcc86faa374d36ec (patch)
tree7b3f16d6b6c05fb33ae3b34bef36d9f072d67fe5
parent597b046f0d99b0b0123a715f8c8b1ea881d2bec6 (diff)
ASoC: rsnd: remove 16ch support for now
R-Car Gen3 sound device can use TDM 16ch, but its usage is very limited. It is not yet supported. Let's remove unexpected/unsupported channel settings for now. This patch makes xx_ADINR register settings sanity without runtime check. R-Car Gen3 datasheet 40.4.7 Note on Usage of the SSIU Module When an SSIU module is used in "TDM-16ch mode", only the transfer with the external memory is available. Reported-by: Nguyen Viet Dung <dung.nguyen.aj@renesas.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sh/rcar/core.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index 3f2ced26ed37..7fa40fcad59e 100644
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -726,7 +726,6 @@ static int rsnd_soc_set_dai_tdm_slot(struct snd_soc_dai *dai,
726 case 2: 726 case 2:
727 case 6: 727 case 6:
728 case 8: 728 case 8:
729 case 16:
730 /* TDM Extend Mode */ 729 /* TDM Extend Mode */
731 rsnd_rdai_channels_set(rdai, slots); 730 rsnd_rdai_channels_set(rdai, slots);
732 rsnd_rdai_ssi_lane_set(rdai, 1); 731 rsnd_rdai_ssi_lane_set(rdai, 1);
@@ -740,7 +739,7 @@ static int rsnd_soc_set_dai_tdm_slot(struct snd_soc_dai *dai,
740} 739}
741 740
742static unsigned int rsnd_soc_hw_channels_list[] = { 741static unsigned int rsnd_soc_hw_channels_list[] = {
743 2, 6, 8, 16, 742 2, 6, 8,
744}; 743};
745 744
746static unsigned int rsnd_soc_hw_rate_list[] = { 745static unsigned int rsnd_soc_hw_rate_list[] = {
@@ -1017,7 +1016,7 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv,
1017 drv->playback.rates = RSND_RATES; 1016 drv->playback.rates = RSND_RATES;
1018 drv->playback.formats = RSND_FMTS; 1017 drv->playback.formats = RSND_FMTS;
1019 drv->playback.channels_min = 2; 1018 drv->playback.channels_min = 2;
1020 drv->playback.channels_max = 16; 1019 drv->playback.channels_max = 8;
1021 drv->playback.stream_name = rdai->playback.name; 1020 drv->playback.stream_name = rdai->playback.name;
1022 1021
1023 snprintf(rdai->capture.name, RSND_DAI_NAME_SIZE, 1022 snprintf(rdai->capture.name, RSND_DAI_NAME_SIZE,
@@ -1025,7 +1024,7 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv,
1025 drv->capture.rates = RSND_RATES; 1024 drv->capture.rates = RSND_RATES;
1026 drv->capture.formats = RSND_FMTS; 1025 drv->capture.formats = RSND_FMTS;
1027 drv->capture.channels_min = 2; 1026 drv->capture.channels_min = 2;
1028 drv->capture.channels_max = 16; 1027 drv->capture.channels_max = 8;
1029 drv->capture.stream_name = rdai->capture.name; 1028 drv->capture.stream_name = rdai->capture.name;
1030 1029
1031 rdai->playback.rdai = rdai; 1030 rdai->playback.rdai = rdai;