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

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

Merge "drm/msm/dp: change pinctrl configuration to optional"

parents af714bb4 63ce3687

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

+1 −2
Original line number Diff line number Diff line
@@ -200,8 +200,7 @@ static int dp_parser_pinctrl(struct dp_parser *parser) 
	pinctrl->pin = devm_pinctrl_get(&parser->pdev->dev);



	if (IS_ERR_OR_NULL(pinctrl->pin)) {

		rc = PTR_ERR(pinctrl->pin);

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

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

		goto error;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int dp_power_pinctrl_set(struct dp_power_private *power, bool active) 
	parser = power->parser;



	if (IS_ERR_OR_NULL(parser->pinctrl.pin))

		return PTR_ERR(parser->pinctrl.pin);

		return 0;



	if (parser->no_aux_switch && parser->lphw_hpd) {

		pin_state = active ? parser->pinctrl.state_hpd_ctrl