summaryrefslogtreecommitdiff
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorViorel Suman <viorel.suman@nxp.com>2020-04-01 20:23:57 +0300
committerViorel Suman <viorel.suman@nxp.com>2020-04-02 11:35:18 +0300
commitca5fccb261bcd67f87562a622946d2c1f7448a12 (patch)
treed9ad69aab741cfa4268eff698200c1c3f03851a7 /sound/soc/fsl
parent5162671ac9dadb5cda34d12220b260c37d04c176 (diff)
MLK-23734: ASoC: fsl_xcvr: remove sample bits constraint
Sample bits constraint is meaningless given that the only supported format is SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE. Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/fsl_xcvr.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/sound/soc/fsl/fsl_xcvr.c b/sound/soc/fsl/fsl_xcvr.c
index 033baf8b7cd0..315f5b9a329e 100644
--- a/sound/soc/fsl/fsl_xcvr.c
+++ b/sound/soc/fsl/fsl_xcvr.c
@@ -38,12 +38,6 @@ static const struct snd_pcm_hw_constraint_list fsl_xcvr_earc_channels_constr = {
.list = fsl_xcvr_earc_channels,
};
-static const u32 fsl_xcvr_earc_bits[] = { 24, };
-static const struct snd_pcm_hw_constraint_list fsl_xcvr_earc_bits_constr = {
- .count = ARRAY_SIZE(fsl_xcvr_earc_bits),
- .list = fsl_xcvr_earc_bits,
-};
-
static const u32 fsl_xcvr_earc_rates[] = {
32000, 44100, 48000, 64000, 88200, 96000,
128000, 176400, 192000, 256000, 352800, 384000,
@@ -55,7 +49,6 @@ static const struct snd_pcm_hw_constraint_list fsl_xcvr_earc_rates_constr = {
};
static const u32 fsl_xcvr_spdif_channels[] = { 2, };
-static const u32 fsl_xcvr_spdif_bits[] = { 16, 20, 24, };
/*
* pll_phy: pll 0; phy 1;
@@ -140,18 +133,12 @@ static int fsl_xcvr_prepare(struct snd_pcm_substream *substream,
}
static int fsl_xcvr_constr(const struct snd_pcm_substream *substream,
- const struct snd_pcm_hw_constraint_list *bits,
const struct snd_pcm_hw_constraint_list *channels,
const struct snd_pcm_hw_constraint_list *rates)
{
struct snd_pcm_runtime *rt = substream->runtime;
int ret;
- ret = snd_pcm_hw_constraint_list(rt, 0, SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
- bits);
- if (ret < 0)
- return ret;
-
ret = snd_pcm_hw_constraint_list(rt, 0, SNDRV_PCM_HW_PARAM_CHANNELS,
channels);
if (ret < 0)
@@ -189,8 +176,7 @@ static int fsl_xcvr_startup(struct snd_pcm_substream *substream,
ret = 0; /* @todo */
break;
case FSL_XCVR_AMODE_EARC:
- ret = fsl_xcvr_constr(substream, &fsl_xcvr_earc_bits_constr,
- &fsl_xcvr_earc_channels_constr,
+ ret = fsl_xcvr_constr(substream, &fsl_xcvr_earc_channels_constr,
&fsl_xcvr_earc_rates_constr);
break;
}