OMAPDSS: HDMI5: Fix AUDICONF3 bitfield offsets
authorMisael Lopez Cruz <misael.lopez@ti.com>
Wed, 22 Apr 2015 13:22:59 +0000 (16:22 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 3 Jun 2015 11:33:54 +0000 (14:33 +0300)
Downmix inhibit in HDMI_CORE_FC_AUDICONF3 register is in
bit 4 while CEA861_AUDIO_INFOFRAME_DB5_DM_INH sets bit 7.

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>
drivers/video/fbdev/omap2/dss/hdmi5_core.c

index d96a63d84bfbc9692f3640c956cfa7128b482de8..8ea531d2652c4cd96fcefab1f6fec938494ebc71 100644 (file)
@@ -790,7 +790,9 @@ static void hdmi5_core_audio_infoframe_cfg(struct hdmi_core_data *core,
 
        hdmi_write_reg(base, HDMI_CORE_FC_AUDICONF1, info_aud->db2_sf_ss);
        hdmi_write_reg(base, HDMI_CORE_FC_AUDICONF2, info_aud->db4_ca);
-       hdmi_write_reg(base, HDMI_CORE_FC_AUDICONF3, info_aud->db5_dminh_lsv);
+       hdmi_write_reg(base, HDMI_CORE_FC_AUDICONF3,
+         (info_aud->db5_dminh_lsv & CEA861_AUDIO_INFOFRAME_DB5_DM_INH) >> 3 |
+         (info_aud->db5_dminh_lsv & CEA861_AUDIO_INFOFRAME_DB5_LSV));
 }
 
 int hdmi5_audio_config(struct hdmi_core_data *core, struct hdmi_wp_data *wp,