From 515599d5a3fe81a9c3324d61799bfcd5f19a4cd7 Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Fri, 18 May 2012 01:42:40 -0500 Subject: [PATCH] --- yaml --- r: 308008 b: refs/heads/master c: a1ab92da141198a98989f3ea41eccc973c9d706e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/soc/omap/omap-hdmi.c | 2 +- trunk/sound/soc/omap/omap-hdmi.h | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 98c2b61f2d07..c039e84cb19a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a0534e3bb68537b749423efe60db7b38872b00a1 +refs/heads/master: a1ab92da141198a98989f3ea41eccc973c9d706e diff --git a/trunk/sound/soc/omap/omap-hdmi.c b/trunk/sound/soc/omap/omap-hdmi.c index ec7c7e62b012..a08245d9203c 100644 --- a/trunk/sound/soc/omap/omap-hdmi.c +++ b/trunk/sound/soc/omap/omap-hdmi.c @@ -253,7 +253,7 @@ static const struct snd_soc_dai_ops omap_hdmi_dai_ops = { static struct snd_soc_dai_driver omap_hdmi_dai = { .playback = { .channels_min = 2, - .channels_max = 2, + .channels_max = 8, .rates = OMAP_HDMI_RATES, .formats = OMAP_HDMI_FORMATS, }, diff --git a/trunk/sound/soc/omap/omap-hdmi.h b/trunk/sound/soc/omap/omap-hdmi.h index 34c298d5057e..6ad2bf4f2697 100644 --- a/trunk/sound/soc/omap/omap-hdmi.h +++ b/trunk/sound/soc/omap/omap-hdmi.h @@ -28,7 +28,9 @@ #define OMAP_HDMI_AUDIO_DMA_PORT 0x8c #define OMAP_HDMI_RATES (SNDRV_PCM_RATE_32000 | \ - SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000) + SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | \ + SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000 | \ + SNDRV_PCM_RATE_176400 | SNDRV_PCM_RATE_192000) #define OMAP_HDMI_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | \ SNDRV_PCM_FMTBIT_S24_LE)