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

Commit 88359b99 authored Apr 22, 2015 by Misael Lopez Cruz Committed by Tomi Valkeinen Jun 03, 2015

ASoC: omap-hdmi-audio: Force channel allocation only for OMAP4



There is a constraint in the OMAP4 HDMI IP that requires to use
the 8-channel code when transmitting more than two channels.

The constraint doesn't apply for OMAP5 so don't force the channel
allocation in the sound driver as it can be done specifically for
OMAP4 later in the hdmi4 core.

Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Mark Brown <broonie@kernel.org>

parent 65c8b464

drivers/video/fbdev/omap2/dss/hdmi4_core.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -654,6 +654,13 @@ static void hdmi_core_audio_infoframe_cfg(struct hdmi_core_data *core,
		hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(2), info_aud->db3);
		sum += info_aud->db3;

		/*
		* The OMAP HDMI IP requires to use the 8-channel channel code when
		* transmitting more than two channels.
		*/
		if (info_aud->db4_ca != 0x00)
		info_aud->db4_ca = 0x13;

		hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_DBYTE(3), info_aud->db4_ca);
		sum += info_aud->db4_ca;

sound/soc/omap/omap-hdmi-audio.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -210,12 +210,10 @@ static int hdmi_dai_hw_params(struct snd_pcm_substream *substream,

		cea->db3 = 0; /* not used, all zeros */

		/*
		* The OMAP HDMI IP requires to use the 8-channel channel code when
		* transmitting more than two channels.
		*/
		if (params_channels(params) == 2)
		cea->db4_ca = 0x0;
		else if (params_channels(params) == 6)
		cea->db4_ca = 0xb;
		else
		cea->db4_ca = 0x13;