Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1ab92da authored May 18, 2012 by Ricardo Neri Committed by Liam Girdwood May 22, 2012

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>

parent a0534e3b

sound/soc/omap/omap-hdmi.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -253,7 +253,7 @@ static const struct snd_soc_dai_ops omap_hdmi_dai_ops = {
	static struct snd_soc_dai_driver omap_hdmi_dai = {		static struct snd_soc_dai_driver omap_hdmi_dai = {
	.playback = {		.playback = {
	.channels_min = 2,		.channels_min = 2,
	.channels_max = 2,		.channels_max = 8,
	.rates = OMAP_HDMI_RATES,		.rates = OMAP_HDMI_RATES,
	.formats = OMAP_HDMI_FORMATS,		.formats = OMAP_HDMI_FORMATS,
	},		},

sound/soc/omap/omap-hdmi.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,9 @@
	#define OMAP_HDMI_AUDIO_DMA_PORT 0x8c		#define OMAP_HDMI_AUDIO_DMA_PORT 0x8c

	#define OMAP_HDMI_RATES (SNDRV_PCM_RATE_32000 \| \		#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 \| \		#define OMAP_HDMI_FORMATS (SNDRV_PCM_FMTBIT_S16_LE \| \
	SNDRV_PCM_FMTBIT_S24_LE)		SNDRV_PCM_FMTBIT_S24_LE)