diff options
| author | Mark Brown | 2017-08-10 16:51:05 +0200 |
|---|---|---|
| committer | Mark Brown | 2017-08-10 16:51:05 +0200 |
| commit | 880c15b1e66345cdd1bbd8fc4c9c2119c6eb2da3 (patch) | |
| tree | d2992ff133cc036b1ea83655c25142e8e29f5bee /sound/soc/sh/rcar/core.c | |
| parent | ASoC: rsnd: rsnd_ssi_can_output_clk() macro (diff) | |
| parent | ASoC: rsnd: avoid duplicate free_irq() (diff) | |
| download | kernel-qcow2-linux-880c15b1e66345cdd1bbd8fc4c9c2119c6eb2da3.tar.gz kernel-qcow2-linux-880c15b1e66345cdd1bbd8fc4c9c2119c6eb2da3.tar.xz kernel-qcow2-linux-880c15b1e66345cdd1bbd8fc4c9c2119c6eb2da3.zip | |
Merge branch 'fix/rcar' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rcar
Diffstat (limited to 'sound/soc/sh/rcar/core.c')
| -rw-r--r-- | sound/soc/sh/rcar/core.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index c34562388cfa..2c12ad2b2b34 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, case 2: case 6: case 8: - case 16: /* TDM Extend Mode */ rsnd_rdai_channels_set(rdai, slots); rsnd_rdai_ssi_lane_set(rdai, 1); @@ -740,7 +739,7 @@ static int rsnd_soc_set_dai_tdm_slot(struct snd_soc_dai *dai, } static unsigned int rsnd_soc_hw_channels_list[] = { - 2, 6, 8, 16, + 2, 6, 8, }; static unsigned int rsnd_soc_hw_rate_list[] = { @@ -1025,7 +1024,7 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, drv->playback.rates = RSND_RATES; drv->playback.formats = RSND_FMTS; drv->playback.channels_min = 2; - drv->playback.channels_max = 16; + drv->playback.channels_max = 8; drv->playback.stream_name = rdai->playback.name; snprintf(rdai->capture.name, RSND_DAI_NAME_SIZE, @@ -1033,7 +1032,7 @@ static void __rsnd_dai_probe(struct rsnd_priv *priv, drv->capture.rates = RSND_RATES; drv->capture.formats = RSND_FMTS; drv->capture.channels_min = 2; - drv->capture.channels_max = 16; + drv->capture.channels_max = 8; drv->capture.stream_name = rdai->capture.name; rdai->playback.rdai = rdai; |