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

Commit 5312d79e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add the pinctrl dtsi nodes for DisplayPort on SDM855" into msm-4.14

parents cadaf908 36a97e92
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
@@ -3243,6 +3243,33 @@
			};
		};

		/* add pins for DisplayPort */
		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {
				mux {
					pins = "gpio38";
					function = "gpio";
				};

				config {
					pins = "gpio38";
					bias-disable;
					drive-strength = <16>;
				};
		};

		sde_dp_usbplug_cc_suspend: sde_dp_usbplug_cc_suspend {
				mux {
					pins = "gpio38";
					function = "gpio";
				};

				config {
					pins = "gpio38";
					bias-pull-down;
					drive-strength = <2>;
				};
		};

		ap2mdm {
			ap2mdm_active: ap2mdm_active {
				mux {
+4 −0
Original line number Diff line number Diff line
@@ -501,6 +501,10 @@
	qcom,aux-en-gpio = <&tlmm 43 0>;
	qcom,aux-sel-gpio = <&tlmm 51 0>;
	qcom,usbplug-cc-gpio = <&tlmm 38 0>;

	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";
	pinctrl-0 = <&sde_dp_usbplug_cc_active>;
	pinctrl-1 = <&sde_dp_usbplug_cc_suspend>;
};

&mdss_mdp {