diff options
| author | Liam Girdwood <liam.r.girdwood@linux.intel.com> | 2014-10-16 15:29:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-20 12:20:33 +0100 |
| commit | 48dc326f6ba71ba0ee5b1bbfc128a6577ba98608 (patch) | |
| tree | b442a8339668b32960ccc93d0e35a2a2467b9be9 /sound/soc/intel | |
| parent | f07e51c51e44a6e4e6d003f3bccbbf8a1b2cda0d (diff) | |
| download | blackbird-obmc-linux-48dc326f6ba71ba0ee5b1bbfc128a6577ba98608.tar.gz blackbird-obmc-linux-48dc326f6ba71ba0ee5b1bbfc128a6577ba98608.zip | |
ASoC: Intel: Add 4 channel support to DSP.
DSP can now support 4 channels in certain use cases.
Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/sst-haswell-ipc.c | 4 | ||||
| -rw-r--r-- | sound/soc/intel/sst-haswell-pcm.c | 8 |
2 files changed, 1 insertions, 11 deletions
diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c index 92d625ab6415..4799768c43cd 100644 --- a/sound/soc/intel/sst-haswell-ipc.c +++ b/sound/soc/intel/sst-haswell-ipc.c @@ -1256,10 +1256,6 @@ int sst_hsw_stream_set_channels(struct sst_hsw *hsw, return -EINVAL; } - /* stereo is only supported atm */ - if (channels != 2) - return -EINVAL; - stream->request.format.ch_num = channels; return 0; } diff --git a/sound/soc/intel/sst-haswell-pcm.c b/sound/soc/intel/sst-haswell-pcm.c index 33fc5c3abf55..32a33b9e36c4 100644 --- a/sound/soc/intel/sst-haswell-pcm.c +++ b/sound/soc/intel/sst-haswell-pcm.c @@ -421,13 +421,7 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream, return ret; } - /* we only support stereo atm */ channels = params_channels(params); - if (channels != 2) { - dev_err(rtd->dev, "error: invalid channels %d\n", channels); - return -EINVAL; - } - map = create_channel_map(SST_HSW_CHANNEL_CONFIG_STEREO); sst_hsw_stream_set_map_config(hsw, pcm_data->stream, map, SST_HSW_CHANNEL_CONFIG_STEREO); @@ -743,7 +737,7 @@ static struct snd_soc_dai_driver hsw_dais[] = { .capture = { .stream_name = "Analog Capture", .channels_min = 2, - .channels_max = 2, + .channels_max = 4, .rates = SNDRV_PCM_RATE_48000, .formats = SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE, }, |
