From 4c84cada565e9b34e8c23bbc29bfe3dea332a72d Mon Sep 17 00:00:00 2001 From: Russell King Date: Tue, 20 Nov 2012 12:20:55 +0000 Subject: [PATCH] --- yaml --- r: 342745 b: refs/heads/master c: 1703470aa7cfbef8d8e596106447bac894f5623e h: refs/heads/master i: 342743: a3f0972e289b828b62c91542e0899237f61a86d7 v: v3 --- [refs] | 2 +- trunk/sound/soc/kirkwood/kirkwood-dma.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dfe08cd9fd97..b3f8a10a10a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 363589bf110aa0352a203112af16685dd9cb56c1 +refs/heads/master: 1703470aa7cfbef8d8e596106447bac894f5623e diff --git a/trunk/sound/soc/kirkwood/kirkwood-dma.c b/trunk/sound/soc/kirkwood/kirkwood-dma.c index 73c90c637033..58d5a96b366f 100644 --- a/trunk/sound/soc/kirkwood/kirkwood-dma.c +++ b/trunk/sound/soc/kirkwood/kirkwood-dma.c @@ -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,