aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMisael Lopez Cruz2013-06-02 18:01:51 -0500
committerMisael Lopez Cruz2013-07-22 15:04:27 -0500
commit053b56a5839b653491d623e0670ad72116d90000 (patch)
treecd322ffe8d90cf81a022f46077f03f5e147a625d
parent514bce18bc4c0339555296c2f4b094035dc8e2b7 (diff)
downloadkernel-video-053b56a5839b653491d623e0670ad72116d90000.tar.gz
kernel-video-053b56a5839b653491d623e0670ad72116d90000.tar.xz
kernel-video-053b56a5839b653491d623e0670ad72116d90000.zip
OMAPDSS: OMAP5: HDMI: Audio InfoFrame DB1 field offsets
CHNL_COUNT is in bits 6:4 and CODING_TYPE in bits 3:0 of HDMI_CORE_FC_AUDICONF0 register, while in the CEA-861 definition DB1CC is in bits 2:0 and DB1CT in bits 7:4. Change-Id: Ifd6ca2c91209b7fcf31dfdc921707c0ad5c9378a Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
index 232d708df0e..1e99149560f 100644
--- a/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_5xxx_ip.c
@@ -924,8 +924,10 @@ static void ti_hdmi_5xxx_core_audio_infoframe_cfg
924{ 924{
925 void __iomem *core_sys_base = hdmi_core_sys_base(ip_data); 925 void __iomem *core_sys_base = hdmi_core_sys_base(ip_data);
926 926
927 /* Channel count and coding type fields in AUDICONF0 are swapped */
927 hdmi_write_reg(core_sys_base, HDMI_CORE_FC_AUDICONF0, 928 hdmi_write_reg(core_sys_base, HDMI_CORE_FC_AUDICONF0,
928 info_aud->db1_ct_cc); 929 (info_aud->db1_ct_cc & CEA861_AUDIO_INFOFRAME_DB1CC)<<4 |
930 (info_aud->db1_ct_cc & CEA861_AUDIO_INFOFRAME_DB1CT)>>4);
929 931
930 hdmi_write_reg(core_sys_base, HDMI_CORE_FC_AUDICONF1, 932 hdmi_write_reg(core_sys_base, HDMI_CORE_FC_AUDICONF1,
931 info_aud->db2_sf_ss); 933 info_aud->db2_sf_ss);