2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
index 1e99149560f..c77d865b1f9 100644
--- a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
@@ -898,10 +898,15 @@ static void ti_hdmi_5xxx_core_audio_config(struct hdmi_ip_data *ip_data,
                 REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5);
                 /* enable two channels in GPA */
                 REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 3, 7, 0);
+        } else if (cfg->layout == HDMI_AUDIO_LAYOUT_6CH) {
+                /* select HBR/SPDIF interfaces */
+                REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5);
+                /* enable six channels in GPA */
+                REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 0x3F, 7, 0);
         } else {
                 /* select HBR/SPDIF interfaces */
                 REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_CONF0, 0, 5, 5);
-                /* enable two channels in GPA */
+                /* enable eight channels in GPA */
                 REG_FLD_MOD(core_sys_base, HDMI_CORE_AUD_GP_CONF1, 0xFF, 7, 0);
         }
 
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index b65a57484d0..b60a32faf9f 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -193,12 +193,10 @@ static int omap_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;