Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85896a70 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dp: change mdss_dp_active and mdss_dp_sleep to optional"

parents 283371cd c8aa5131

drivers/gpu/drm/msm/dp/dp_parser.c

+8 −11
Original line number Diff line number Diff line
@@ -205,14 +205,13 @@ static int dp_parser_msm_hdcp_dev(struct dp_parser *parser) 


static int dp_parser_pinctrl(struct dp_parser *parser)

{

	int rc = 0;

	struct dp_pinctrl *pinctrl = &parser->pinctrl;



	pinctrl->pin = devm_pinctrl_get(&parser->pdev->dev);



	if (IS_ERR_OR_NULL(pinctrl->pin)) {

		pr_debug("failed to get pinctrl, rc=%d\n", rc);

		goto error;

		pr_debug("failed to get pinctrl\n");

		return 0;

	}



	if (parser->no_aux_switch && parser->lphw_hpd) {
@@ -235,20 +234,18 @@ static int dp_parser_pinctrl(struct dp_parser *parser) 
	pinctrl->state_active = pinctrl_lookup_state(pinctrl->pin,

					"mdss_dp_active");

	if (IS_ERR_OR_NULL(pinctrl->state_active)) {

		rc = PTR_ERR(pinctrl->state_active);

		pr_err("failed to get pinctrl active state, rc=%d\n", rc);

		goto error;

		pinctrl->state_active = NULL;

		pr_debug("failed to get pinctrl active state\n");

	}



	pinctrl->state_suspend = pinctrl_lookup_state(pinctrl->pin,

					"mdss_dp_sleep");

	if (IS_ERR_OR_NULL(pinctrl->state_suspend)) {

		rc = PTR_ERR(pinctrl->state_suspend);

		pr_err("failed to get pinctrl suspend state, rc=%d\n", rc);

		goto error;

		pinctrl->state_suspend = NULL;

		pr_debug("failed to get pinctrl suspend state\n");

	}

error:

	return rc;



	return 0;

}



static int dp_parser_gpio(struct dp_parser *parser)

drivers/gpu/drm/msm/dp/dp_power.c

+1 −8
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int dp_power_regulator_ctrl(struct dp_power_private *power, bool enable) 


static int dp_power_pinctrl_set(struct dp_power_private *power, bool active)

{

	int rc = -EFAULT;

	int rc = 0;

	struct pinctrl_state *pin_state;

	struct dp_parser *parser;
@@ -140,9 +140,6 @@ static int dp_power_pinctrl_set(struct dp_power_private *power, bool active) 
		}

	}



	if (parser->no_aux_switch)

		return 0;



	pin_state = active ? parser->pinctrl.state_active

				: parser->pinctrl.state_suspend;

	if (!IS_ERR_OR_NULL(pin_state)) {
@@ -152,10 +149,6 @@ static int dp_power_pinctrl_set(struct dp_power_private *power, bool active) 
			pr_err("can not set %s pins\n",

			       active ? "dp_active"

			       : "dp_sleep");

	} else {

		pr_err("invalid '%s' pinstate\n",

		       active ? "dp_active"

		       : "dp_sleep");

	}



	return rc;