Commit 99304fd0 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Neil Armstrong

drm/bridge: display-connector: rename dp_pwr to connector_pwr

In preparation to adding support for the hdmi_pwr supply, rename dp_pwr
structure field to the generic connector_pwr.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20230531000259.3758235-3-dmitry.baryshkov@linaro.org
parent 41b74821
...@@ -24,7 +24,7 @@ struct display_connector { ...@@ -24,7 +24,7 @@ struct display_connector {
struct gpio_desc *hpd_gpio; struct gpio_desc *hpd_gpio;
int hpd_irq; int hpd_irq;
struct regulator *dp_pwr; struct regulator *supply;
struct gpio_desc *ddc_en; struct gpio_desc *ddc_en;
}; };
...@@ -316,14 +316,14 @@ static int display_connector_probe(struct platform_device *pdev) ...@@ -316,14 +316,14 @@ static int display_connector_probe(struct platform_device *pdev)
if (type == DRM_MODE_CONNECTOR_DisplayPort) { if (type == DRM_MODE_CONNECTOR_DisplayPort) {
int ret; int ret;
conn->dp_pwr = devm_regulator_get_optional(&pdev->dev, "dp-pwr"); conn->supply = devm_regulator_get_optional(&pdev->dev, "dp-pwr");
if (IS_ERR(conn->dp_pwr)) { if (IS_ERR(conn->supply)) {
ret = PTR_ERR(conn->dp_pwr); ret = PTR_ERR(conn->supply);
switch (ret) { switch (ret) {
case -ENODEV: case -ENODEV:
conn->dp_pwr = NULL; conn->supply = NULL;
break; break;
case -EPROBE_DEFER: case -EPROBE_DEFER:
...@@ -335,8 +335,8 @@ static int display_connector_probe(struct platform_device *pdev) ...@@ -335,8 +335,8 @@ static int display_connector_probe(struct platform_device *pdev)
} }
} }
if (conn->dp_pwr) { if (conn->supply) {
ret = regulator_enable(conn->dp_pwr); ret = regulator_enable(conn->supply);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to enable DP PWR regulator: %d\n", ret); dev_err(&pdev->dev, "failed to enable DP PWR regulator: %d\n", ret);
return ret; return ret;
...@@ -386,8 +386,8 @@ static void display_connector_remove(struct platform_device *pdev) ...@@ -386,8 +386,8 @@ static void display_connector_remove(struct platform_device *pdev)
if (conn->ddc_en) if (conn->ddc_en)
gpiod_set_value(conn->ddc_en, 0); gpiod_set_value(conn->ddc_en, 0);
if (conn->dp_pwr) if (conn->supply)
regulator_disable(conn->dp_pwr); regulator_disable(conn->supply);
drm_bridge_remove(&conn->bridge); drm_bridge_remove(&conn->bridge);
......
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