From 8c25fc3a4ed7a6c2f4b35587de890afdff52f0ae Mon Sep 17 00:00:00 2001 From: Ricardo Neri Date: Thu, 3 May 2012 12:27:12 -0500 Subject: [PATCH] --- yaml --- r: 310361 b: refs/heads/master c: 24ccfc5541b11f1e6ffcf10f5ce94370440d6c75 h: refs/heads/master i: 310359: 1075e74a8e2e65afa89c305bcec1673b66d8f01f v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 126b68bfde8c..8f3b7deea47e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6ec355d6c79e811a3b7f85ca6b22fa4bd7b1bbfc +refs/heads/master: 24ccfc5541b11f1e6ffcf10f5ce94370440d6c75 diff --git a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c index 1ce77f37ab50..667c960e10b9 100644 --- a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c +++ b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c @@ -1152,6 +1152,14 @@ static void ti_hdmi_4xxx_core_audio_config(struct hdmi_ip_data *ip_data, r = FLD_MOD(r, cfg->en_parallel_aud_input, 2, 2); r = FLD_MOD(r, cfg->en_spdif, 1, 1); hdmi_write_reg(av_base, HDMI_CORE_AV_AUD_MODE, r); + + /* Audio channel mappings */ + /* TODO: Make channel mapping dynamic. For now, map channels + * in the ALSA order: FL/FR/RL/RR/C/LFE/SL/SR. Remapping is needed as + * HDMI speaker order is different. See CEA-861 Section 6.6.2. + */ + hdmi_write_reg(av_base, HDMI_CORE_AV_I2S_IN_MAP, 0x78); + REG_FLD_MOD(av_base, HDMI_CORE_AV_SWAP_I2S, 1, 5, 5); } static void ti_hdmi_4xxx_core_audio_infoframe_cfg(struct hdmi_ip_data *ip_data,