summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCristina Ciocan <cristina-mihaela.ciocan@nxp.com>2017-04-20 13:32:43 +0300
committerAnson Huang <Anson.Huang@nxp.com>2017-06-09 22:19:34 +0800
commit81fd19dbb502058fb945ac275b681281309c5620 (patch)
treec105f65cd471097004aa35c34423cf869e916511
parentfd0477c0fc71e7ba5d308707964b90581b4f34c2 (diff)
MLK-14548: video: fb: hdmi: Allow reset pin deferral
The HDMI transmitter Sil902x driver displays a warning when it cannot reset the device before any other instruction, but carries on without exiting the probe() function. If the needed reset pin is not yet available because the pinctrl controllers are not set up and the reset fails with deferral error, try to acquire the pin later on in order to allow proper initialization of the Sil902 HDMI transmitter. Signed-off-by: Cristina Ciocan <cristina-mihaela.ciocan@nxp.com>
-rw-r--r--drivers/video/fbdev/mxc/mxsfb_sii902x.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/fbdev/mxc/mxsfb_sii902x.c b/drivers/video/fbdev/mxc/mxsfb_sii902x.c
index 97c46b6dc0e6..c3c4a1847bce 100644
--- a/drivers/video/fbdev/mxc/mxsfb_sii902x.c
+++ b/drivers/video/fbdev/mxc/mxsfb_sii902x.c
@@ -398,6 +398,8 @@ static int sii902x_probe(struct i2c_client *client,
ret = device_reset(&sii902x.client->dev);
if (ret)
dev_warn(&sii902x.client->dev, "No reset pin found\n");
+ if (ret == -EPROBE_DEFER)
+ return ret;
/* Set 902x in hardware TPI mode on and jump out of D3 state */
if (i2c_smbus_write_byte_data(sii902x.client, 0xc7, 0x00) < 0) {