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

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

Merge "Documentation: change pinctrl configuration to optional"

parents 88a640e0 ab85ca8e

Documentation/devicetree/bindings/drm/msm/sde-dp.txt

+5 −5
Original line number Diff line number Diff line
@@ -91,11 +91,6 @@ DP Controller: Required properties: 
					-- qcom,supply-post-on-sleep: time to sleep (ms) after turning on

					-- qcom,supply-pre-off-sleep: time to sleep (ms) before turning off

					-- qcom,supply-post-off-sleep: time to sleep (ms) after turning off

- pinctrl-names:	List of names to assign mdss pin states defined in pinctrl device node

					Refer to pinctrl-bindings.txt

- pinctrl-<0..n>:	Lists phandles each pointing to the pin configuration node within a pin

					controller. These pin configurations are installed in the pinctrl

					device node. Refer to pinctrl-bindings.txt



msm_ext_disp is a device which manages the interaction between external

display interfaces, e.g. Display Port, and the audio subsystem.
@@ -104,6 +99,11 @@ Optional properties: 
- qcom,ext-disp:		phandle for msm-ext-display module

- compatible:			Must be "qcom,msm-ext-disp"

- qcom,phy-version:		Phy version

- pinctrl-names:		List of names to assign mdss pin states defined in pinctrl device node

				Refer to pinctrl-bindings.txt

- pinctrl-<0..n>:		Lists phandles each pointing to the pin configuration node within a pin

				controller. These pin configurations are installed in the pinctrl

				device node. Refer to pinctrl-bindings.txt



[Optional child nodes]: These nodes are for devices which are

dependent on msm_ext_disp. If msm_ext_disp is disabled then

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