diff options
| author | Tatenda Chipeperekwa <tatendac@codeaurora.org> | 2015-12-10 11:58:49 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:17:52 -0700 |
| commit | 4a53d45f4bf2a2c9a9124cbbc79dc03e70ab1cc5 (patch) | |
| tree | 3eef63e65274199ee7b9740a6fb63ebad8943817 | |
| parent | 88af065f71baa8f7166b399bc5211732cf394b02 (diff) | |
msm: mdss: hdmi: add pin-control and splash enable
Initialize the splash enabled flag when HDMI is primary.
This is required during probe time so the HDMI driver can
add pin-control vote, enable regulators, enable GPIOs and
enable clocks.
Change-Id: Iaaf3d983512619bda753b12e3d80ee8efe32d810
Signed-off-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_hdmi_tx.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/drivers/video/fbdev/msm/mdss_hdmi_tx.c b/drivers/video/fbdev/msm/mdss_hdmi_tx.c index cdc8cc52f5c7..30d253b117a9 100644 --- a/drivers/video/fbdev/msm/mdss_hdmi_tx.c +++ b/drivers/video/fbdev/msm/mdss_hdmi_tx.c @@ -5241,6 +5241,13 @@ static int hdmi_tx_probe(struct platform_device *pdev) goto failed_no_mem; } + hdmi_ctrl->mdss_util = mdss_get_util_intf(); + if (hdmi_ctrl->mdss_util == NULL) { + pr_err("Failed to get mdss utility functions\n"); + rc = -ENODEV; + goto failed_dt_data; + } + platform_set_drvdata(pdev, hdmi_ctrl); hdmi_ctrl->pdev = pdev; hdmi_ctrl->enc_lvl = HDCP_STATE_AUTH_ENC_NONE; @@ -5258,13 +5265,9 @@ static int hdmi_tx_probe(struct platform_device *pdev) hdmi_ctrl->pdata.primary = true; hdmi_ctrl->vid_cfg.vic = vic; hdmi_ctrl->panel_data.panel_info.is_prim_panel = true; - } - - hdmi_ctrl->mdss_util = mdss_get_util_intf(); - if (hdmi_ctrl->mdss_util == NULL) { - pr_err("Failed to get mdss utility functions\n"); - rc = -ENODEV; - goto failed_res_init; + hdmi_ctrl->panel_data.panel_info.cont_splash_enabled = + hdmi_ctrl->mdss_util->panel_intf_status(DISPLAY_1, + MDSS_PANEL_INTF_HDMI) ? true : false; } hdmi_tx_hw.irq_info = mdss_intr_line(); @@ -5325,6 +5328,8 @@ static int hdmi_tx_probe(struct platform_device *pdev) hdmi_ctrl->pdata.power_data[i].vreg_config, hdmi_ctrl->pdata.power_data[i].num_vreg, 1); + hdmi_tx_pinctrl_set_state(hdmi_ctrl, i, 1); + msm_dss_enable_gpio( hdmi_ctrl->pdata.power_data[i].gpio_config, hdmi_ctrl->pdata.power_data[i].num_gpio, 1); |