summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorMisael Lopez Cruz <misael.lopez@ti.com>2015-04-22 16:22:59 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-03 14:33:54 +0300
commit65c8b46400752d54291e976d60ab13bfe5bb06b8 (patch)
tree4a440f312763c1175a8963d9e87f5af7d3ee0a79 /drivers/video
parentaae1428c5060055b3ba7d38116aa8505f6b9e168 (diff)
downloadlinux-65c8b46400752d54291e976d60ab13bfe5bb06b8.tar.xz
OMAPDSS: HDMI5: Fix AUDICONF3 bitfield offsets
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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/omap2/dss/hdmi5_core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/dss/hdmi5_core.c b/drivers/video/fbdev/omap2/dss/hdmi5_core.c
index d96a63d84bfb..8ea531d2652c 100644
--- a/drivers/video/fbdev/omap2/dss/hdmi5_core.c
+++ b/drivers/video/fbdev/omap2/dss/hdmi5_core.c
@@ -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,