bcm2835-pcm.c: Support multichannel audio

diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
index f783b63..446724e 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c
@@ -14,9 +14,9 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_hw = {
                 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
                 SNDRV_PCM_INFO_SYNC_APPLPTR),
        .formats = SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE,
-       .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_8000_48000,
+       .rates = SNDRV_PCM_RATE_CONTINUOUS |  SNDRV_PCM_RATE_8000_192000,
        .rate_min = 8000,
-       .rate_max = 48000,
+       .rate_max = 192000,
        .channels_min = 1,
        .channels_max = 2,
        .buffer_bytes_max = 128 * 1024,
@@ -31,15 +31,16 @@ static const struct snd_pcm_hardware snd_bcm2835_playback_spdif_hw = {
                 SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_MMAP_VALID |
                 SNDRV_PCM_INFO_SYNC_APPLPTR),
        .formats = SNDRV_PCM_FMTBIT_S16_LE,
-       .rates = SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_44100 |
-       SNDRV_PCM_RATE_48000,
+       .rates = SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |
+       SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 |
+       SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000,
        .rate_min = 44100,
-       .rate_max = 48000,
+       .rate_max = 192000,
        .channels_min = 2,
-       .channels_max = 2,
-       .buffer_bytes_max = 128 * 1024,
+       .channels_max = 8,
+       .buffer_bytes_max = 512 * 1024,
        .period_bytes_min = 1 * 1024,
-       .period_bytes_max = 128 * 1024,
+       .period_bytes_max = 512 * 1024,
        .periods_min = 1,
        .periods_max = 128,
 };