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

Commit e79de756 authored by Xiaowen Wu's avatar Xiaowen Wu
Browse files

drm/msm/dp: change pinctrl configuration to optional 



Change pinctrl configuration in device tree to optional.

CRs-Fixed: 2359470
Change-Id: I9b44c709b0786ed601f231e28f85892469c0e01f
Signed-off-by: default avatarXiaowen Wu <wxiaowen@codeaurora.org>
parent 01decae7

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

+1 −2
Original line number Original line 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);

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





	if (IS_ERR_OR_NULL(pinctrl->pin)) {

	if (IS_ERR_OR_NULL(pinctrl->pin)) {

		rc = PTR_ERR(pinctrl->pin);

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

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

		goto error;

		goto error;

	}

	}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ static int dp_power_pinctrl_set(struct dp_power_private *power, bool active) 
		return 0;

		return 0;





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

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

		return PTR_ERR(parser->pinctrl.pin);

		return 0;





	pin_state = active ? parser->pinctrl.state_active

	pin_state = active ? parser->pinctrl.state_active

				: parser->pinctrl.state_suspend;

				: parser->pinctrl.state_suspend;