Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1703470a authored by Russell King's avatar Russell King Committed by Mark Brown
Browse files

ASoC: kirkwood-dma: remove channel restrictions 



This is part of a patch found in Rabeeh Khoury's git tree for the
cubox.

With SPDIF passthrough, we are not restricted to just two channels of
audio; we can support however many channels the non-audio stream can
itself support.  In any case, kirkwood-dma is not involved in the
format selection.  So yet rid of this restriction.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 363589bf

sound/soc/kirkwood/kirkwood-dma.c

+4 −2
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ 
#define KIRKWOOD_FORMATS \

	(SNDRV_PCM_FMTBIT_S16_LE | \

	 SNDRV_PCM_FMTBIT_S24_LE | \

	 SNDRV_PCM_FMTBIT_S32_LE)

	 SNDRV_PCM_FMTBIT_S32_LE | \

	 SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_LE | \

	 SNDRV_PCM_FMTBIT_IEC958_SUBFRAME_BE)



struct kirkwood_dma_priv {

	struct snd_pcm_substream *play_stream;
@@ -48,7 +50,7 @@ static struct snd_pcm_hardware kirkwood_dma_snd_hw = { 
	.rate_min		= 8000,

	.rate_max		= 384000,

	.channels_min		= 1,

	.channels_max		= 2,

	.channels_max		= 8,

	.buffer_bytes_max	= KIRKWOOD_SND_MAX_PERIOD_BYTES * KIRKWOOD_SND_MAX_PERIODS,

	.period_bytes_min	= KIRKWOOD_SND_MIN_PERIOD_BYTES,

	.period_bytes_max	= KIRKWOOD_SND_MAX_PERIOD_BYTES,