summaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
diff options
context:
space:
mode:
authorRicardo Neri2012-03-19 16:30:21 +0100
committerTomi Valkeinen2012-05-11 14:15:21 +0200
commit7c92af16780c614b493c4e8a9f495f9dc8008de4 (patch)
tree78bf084a14a362aa7253b3d6d3e273c5977e2b6b /drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
parentOMAPDSS: HDMI: OMAP4: Remove CEA-861 audio infoframe and IEC-60958 enums (diff)
downloadkernel-qcow2-linux-7c92af16780c614b493c4e8a9f495f9dc8008de4.tar.gz
kernel-qcow2-linux-7c92af16780c614b493c4e8a9f495f9dc8008de4.tar.xz
kernel-qcow2-linux-7c92af16780c614b493c4e8a9f495f9dc8008de4.zip
OMAPDSS: HDMI: OMAP4: Remove invalid I2S settings
According to the most up-to-date documentation from Texas Instruments, the configuration of High Bitrate Audio is not possible. Also, it is not possible to set polarity of the I2S Word Select signal. This patch removes the invalid settings. Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c')
-rw-r--r--drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index e9e8b0d4bddc..a1cbd2fe9889 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -1119,11 +1119,8 @@ void hdmi_core_audio_config(struct hdmi_ip_data *ip_data,
cfg->freq_sample, 3, 0);
r = hdmi_read_reg(av_base, HDMI_CORE_AV_I2S_IN_CTRL);
- r = FLD_MOD(r, cfg->i2s_cfg.en_high_bitrate_aud, 7, 7);
r = FLD_MOD(r, cfg->i2s_cfg.sck_edge_mode, 6, 6);
- r = FLD_MOD(r, cfg->i2s_cfg.cbit_order, 5, 5);
r = FLD_MOD(r, cfg->i2s_cfg.vbit, 4, 4);
- r = FLD_MOD(r, cfg->i2s_cfg.ws_polarity, 3, 3);
r = FLD_MOD(r, cfg->i2s_cfg.justification, 2, 2);
r = FLD_MOD(r, cfg->i2s_cfg.direction, 1, 1);
r = FLD_MOD(r, cfg->i2s_cfg.shift, 0, 0);