Merge "adv7481: Add support for CSI 4 lane for ADV7481"

This commit is contained in:
Linux Build Service Account 2017-09-13 10:58:08 -07:00 committed by Gerrit - the friendly Code Review server
commit 884b439578

View file

@ -2051,7 +2051,7 @@ static int adv7481_set_op_stream(struct adv7481_state *state, bool on)
__func__, on, state->csia_src, state->csib_src); __func__, on, state->csia_src, state->csib_src);
if (on && state->csia_src != ADV7481_IP_NONE) if (on && state->csia_src != ADV7481_IP_NONE)
if (ADV7481_IP_HDMI == state->csia_src) { if (ADV7481_IP_HDMI == state->csia_src) {
state->tx_lanes = ADV7481_MIPI_2LANE; state->tx_lanes = ADV7481_MIPI_4LANE;
ret = adv7481_set_audio_spdif(state, on); ret = adv7481_set_audio_spdif(state, on);
ret |= adv7481_csi_powerup(state, ADV7481_OP_CSIA); ret |= adv7481_csi_powerup(state, ADV7481_OP_CSIA);
} else { } else {
@ -2066,7 +2066,7 @@ static int adv7481_set_op_stream(struct adv7481_state *state, bool on)
/* Turn off */ /* Turn off */
if (ADV7481_IP_NONE != state->csia_src) { if (ADV7481_IP_NONE != state->csia_src) {
if (ADV7481_IP_HDMI == state->csia_src) { if (ADV7481_IP_HDMI == state->csia_src) {
state->tx_lanes = ADV7481_MIPI_1LANE; state->tx_lanes = ADV7481_MIPI_4LANE;
ret = adv7481_set_audio_spdif(state, on); ret = adv7481_set_audio_spdif(state, on);
} else { } else {
state->tx_lanes = ADV7481_MIPI_1LANE; state->tx_lanes = ADV7481_MIPI_1LANE;