Commit e6d7a16f authored by Jilai Wang's avatar Jilai Wang Committed by Rob Clark

drm/msm/hdmi: enable regulators before clocks to avoid warnings

HPD regulators need to be enabled before clocks, otherwise clock
driver will report warning.
Signed-off-by: default avatarJilai Wang <jilaiw@codeaurora.org>
parent 8bc1fe92
...@@ -141,6 +141,15 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) ...@@ -141,6 +141,15 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
uint32_t hpd_ctrl; uint32_t hpd_ctrl;
int i, ret; int i, ret;
for (i = 0; i < config->hpd_reg_cnt; i++) {
ret = regulator_enable(hdmi->hpd_regs[i]);
if (ret) {
dev_err(dev->dev, "failed to enable hpd regulator: %s (%d)\n",
config->hpd_reg_names[i], ret);
goto fail;
}
}
ret = gpio_config(hdmi, true); ret = gpio_config(hdmi, true);
if (ret) { if (ret) {
dev_err(dev->dev, "failed to configure GPIOs: %d\n", ret); dev_err(dev->dev, "failed to configure GPIOs: %d\n", ret);
...@@ -164,15 +173,6 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) ...@@ -164,15 +173,6 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
} }
} }
for (i = 0; i < config->hpd_reg_cnt; i++) {
ret = regulator_enable(hdmi->hpd_regs[i]);
if (ret) {
dev_err(dev->dev, "failed to enable hpd regulator: %s (%d)\n",
config->hpd_reg_names[i], ret);
goto fail;
}
}
hdmi_set_mode(hdmi, false); hdmi_set_mode(hdmi, false);
phy->funcs->reset(phy); phy->funcs->reset(phy);
hdmi_set_mode(hdmi, true); hdmi_set_mode(hdmi, true);
...@@ -200,7 +200,7 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector) ...@@ -200,7 +200,7 @@ static int hpd_enable(struct hdmi_connector *hdmi_connector)
return ret; return ret;
} }
static int hdp_disable(struct hdmi_connector *hdmi_connector) static void hdp_disable(struct hdmi_connector *hdmi_connector)
{ {
struct hdmi *hdmi = hdmi_connector->hdmi; struct hdmi *hdmi = hdmi_connector->hdmi;
const struct hdmi_platform_config *config = hdmi->config; const struct hdmi_platform_config *config = hdmi->config;
...@@ -212,28 +212,19 @@ static int hdp_disable(struct hdmi_connector *hdmi_connector) ...@@ -212,28 +212,19 @@ static int hdp_disable(struct hdmi_connector *hdmi_connector)
hdmi_set_mode(hdmi, false); hdmi_set_mode(hdmi, false);
for (i = 0; i < config->hpd_reg_cnt; i++) {
ret = regulator_disable(hdmi->hpd_regs[i]);
if (ret) {
dev_err(dev->dev, "failed to disable hpd regulator: %s (%d)\n",
config->hpd_reg_names[i], ret);
goto fail;
}
}
for (i = 0; i < config->hpd_clk_cnt; i++) for (i = 0; i < config->hpd_clk_cnt; i++)
clk_disable_unprepare(hdmi->hpd_clks[i]); clk_disable_unprepare(hdmi->hpd_clks[i]);
ret = gpio_config(hdmi, false); ret = gpio_config(hdmi, false);
if (ret) { if (ret)
dev_err(dev->dev, "failed to unconfigure GPIOs: %d\n", ret); dev_warn(dev->dev, "failed to unconfigure GPIOs: %d\n", ret);
goto fail;
}
return 0;
fail: for (i = 0; i < config->hpd_reg_cnt; i++) {
return ret; ret = regulator_disable(hdmi->hpd_regs[i]);
if (ret)
dev_warn(dev->dev, "failed to disable hpd regulator: %s (%d)\n",
config->hpd_reg_names[i], ret);
}
} }
static void static void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment