Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c92af16 authored by Ricardo Neri's avatar Ricardo Neri Committed by Tomi Valkeinen
Browse files

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: default avatarRicardo Neri <ricardo.neri@ti.com>
parent 199e7fd6

drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/video/omap2/dss/ti_hdmi_4xxx_ip.h

+0 −5
Original line number Diff line number Diff line
@@ -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;