From: Misael Lopez Cruz Date: Wed, 22 Apr 2015 13:22:59 +0000 (+0300) Subject: OMAPDSS: HDMI5: Fix AUDICONF3 bitfield offsets X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=65c8b46400752d54291e976d60ab13bfe5bb06b8;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git 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 Signed-off-by: Jyri Sarha Signed-off-by: Tomi Valkeinen --- 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,