ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI

According to the HDMI specification, a source is permitted to
transmit L-PCM audio in the following sample rates: 32kHz, 44.1kHz,
48kHz, 88.2kHz, 96kHz, 176.4kHz or 192kHz.

It also supports up to 8 audio channels.

The sink may not necessarily support all these sample rates and
channels. However, as this CPU DAI describes the HDMI source, it
makes sense to include them. The limitation of capabilities as
supported by the sink should be done in the ASoC HDMI codec.

Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>

diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index ec7c7e62b012a4e11198fa89aab67d95abec06c4..a08245d9203cddfd20e38254d02104c25c18f9a8 100644 (file)
--- a/sound/soc/omap/omap-hdmi.c
+++ b/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/sound/soc/omap/omap-hdmi.h b/sound/soc/omap/omap-hdmi.h
index 34c298d5057e26dac9864a7e184aad7882c4c18a..6ad2bf4f269783e3d95513a19c3b8290368d8127 100644 (file)
--- a/sound/soc/omap/omap-hdmi.h
+++ b/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)