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

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

Merge "ARM: dts: msm: Add DP AUX gpio config for sdmmagpie QRD"

parents fd628b6d 8d26e0bd
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -203,6 +203,10 @@
	qcom,platform-reset-gpio = <&pm6150l_gpios 9 0>;
};

&sde_dp {
	qcom,dp-aux-switch = <&fsa4480>;
};

&qupv3_se7_i2c {
	status = "ok";
	st_fts@49 {
+26 −0
Original line number Diff line number Diff line
@@ -1031,6 +1031,32 @@
			};
		};

		sde_dp_aux_active: sde_dp_aux_active {
			mux {
				pins = "gpio42", "gpio33";
				function = "gpio";
			};

			config {
				pins = "gpio42", "gpio33";
				bias-disable = <0>; /* no pull */
				drive-strength = <8>;
			};
		};

		sde_dp_aux_suspend: sde_dp_aux_suspend {
			mux {
				pins = "gpio42", "gpio33";
				function = "gpio";
			};

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

		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {
			mux {
				pins = "gpio104";
+13 −0
Original line number Diff line number Diff line
@@ -408,3 +408,16 @@
		    0x00 0x23c /* CHG_CTRL2 */
		    0x22 0x210>; /* PWR_CTRL1 */
};

&fsa4480 {
	status = "disabled";
};

&sde_dp {
	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";
	pinctrl-0 = <&sde_dp_aux_active &sde_dp_usbplug_cc_active>;
	pinctrl-1 = <&sde_dp_aux_suspend &sde_dp_usbplug_cc_suspend>;
	qcom,aux-en-gpio = <&tlmm 42 0>;
	qcom,aux-sel-gpio = <&tlmm 33 0>;
	qcom,dp-gpio-aux-switch;
};
+0 −1
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@
		qcom,mst-enable;

		qcom,ext-disp = <&ext_disp>;
		qcom,dp-aux-switch = <&fsa4480>;

		qcom,usbplug-cc-gpio = <&tlmm 104 0>;