alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Ricardo Neri <ricardo.neri@ti.com>
To: broonie@opensource.wolfsonmicro.com, lrg@ti.com
Cc: x0055901@ti.com, peter.ujfalusi@ti.com, s-guiriec@ti.com,
	linux-omap@vger.kernel.org, alsa-devel@alsa-project.org,
	Ricardo Neri <ricardo.neri@ti.com>
Subject: [PATCH 08/11] ASoC: OMAP: HDMI: Expand capabilities of the HDMI DAI
Date: Fri, 18 May 2012 01:42:40 -0500	[thread overview]
Message-ID: <1337323363-11449-9-git-send-email-ricardo.neri@ti.com> (raw)
In-Reply-To: <1337323363-11449-1-git-send-email-ricardo.neri@ti.com>

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>
---
 sound/soc/omap/omap-hdmi.c |    2 +-
 sound/soc/omap/omap-hdmi.h |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index ec7c7e6..a08245d 100644
--- 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 34c298d..6ad2bf4 100644
--- 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)
-- 
1.7.5.4


  parent reply	other threads:[~2012-05-18  6:42 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-18  6:42 [PATCH 00/11] ASoC: OMAP: HDMI: Use DSS audio interface and prepare for OMAP5 Ricardo Neri
2012-05-18  6:42 ` [PATCH 01/11] ASoC: OMAP: HDMI: Introduce codec Ricardo Neri
2012-05-18 16:32   ` Mark Brown
2012-05-18 16:55     ` Ricardo Neri
2012-05-18  6:42 ` [PATCH 02/11] ASoC: OMAP: HDMI: Update the platform device names Ricardo Neri
2012-05-18  6:42 ` [PATCH 03/11] ASoC: OMAP: HDMI: Change error values in HDMI CPU DAI Ricardo Neri
2012-05-18 20:46   ` does snd_pcm_info_get_sync work at all? Pierre-Louis Bossart
2012-05-18 21:21     ` Clemens Ladisch
2012-05-18  6:42 ` [PATCH 04/11] ASoC: OMAP: HDMI: Create a structure for private data of the CPU DAI Ricardo Neri
2012-05-18  6:42 ` [PATCH 05/11] ASoC: OMAP: HDMI: Use the DSS audio interface Ricardo Neri
2012-05-18  6:42 ` [PATCH 06/11] ASoC: OMAP: HDMI: Expand configuration of hw_params Ricardo Neri
2012-05-18  6:42 ` [PATCH 07/11] ASoC: OMAP: HDMI: Improve how the display state is verified Ricardo Neri
2012-05-18  6:42 ` Ricardo Neri [this message]
2012-05-18  6:42 ` [PATCH 09/11] ASoC: OMAP: HDMI: Make build config options more generic Ricardo Neri
2012-05-18  6:42 ` [PATCH 10/11] ASoC: OMAP: HDMI: Make sound card naming " Ricardo Neri
2012-05-18  6:42 ` [PATCH 11/11] ASoC: OMAP: HDMI: Rename sound card source file Ricardo Neri
2012-05-18 16:33 ` [PATCH 00/11] ASoC: OMAP: HDMI: Use DSS audio interface and prepare for OMAP5 Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1337323363-11449-9-git-send-email-ricardo.neri@ti.com \
    --to=ricardo.neri@ti.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=lrg@ti.com \
    --cc=peter.ujfalusi@ti.com \
    --cc=s-guiriec@ti.com \
    --cc=x0055901@ti.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).