From 69f8ed5872fd1ef581b750bb1e10afad5c13b8f9 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri@ti.com>
Date: Mon, 19 Mar 2012 09:30:21 -0600
Subject: [PATCH] --- yaml --- r: 310354 b: refs/heads/master c:
 7c92af16780c614b493c4e8a9f495f9dc8008de4 h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c | 3 ---
 trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h | 5 -----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5c5637f5a4d3..294a94e2d832 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 199e7fd6219cac2065a0e7e09d9d505e1f03f29e
+refs/heads/master: 7c92af16780c614b493c4e8a9f495f9dc8008de4
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 e9e8b0d4bddc..a1cbd2fe9889 100644
--- a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/trunk/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);
diff --git a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
index 9a08fbfdd1c7..ffc08da89cea 100644
--- a/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
+++ b/trunk/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h
@@ -337,8 +337,6 @@ enum hdmi_audio_blk_strt_end_sig {
 };
 
 enum hdmi_audio_i2s_config {
-	HDMI_AUDIO_I2S_WS_POLARITY_LOW_IS_LEFT = 0,
-	HDMI_AUDIO_I2S_WS_POLARIT_YLOW_IS_RIGHT = 1,
 	HDMI_AUDIO_I2S_MSB_SHIFTED_FIRST = 0,
 	HDMI_AUDIO_I2S_LSB_SHIFTED_FIRST = 1,
 	HDMI_AUDIO_I2S_SCK_EDGE_FALLING = 0,
@@ -413,11 +411,8 @@ struct hdmi_core_audio_i2s_config {
 	u8 word_length;
 	u8 in_length_bits;
 	u8 justification;
-	u8 en_high_bitrate_aud;
 	u8 sck_edge_mode;
-	u8 cbit_order;
 	u8 vbit;
-	u8 ws_polarity;
 	u8 direction;
 	u8 shift;
 	u8 active_sds;