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

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

Merge "ARM: dts: msm: remove gpio pin and pin config for lagoon target"

parents ebf93ec0 ba47bffc

qcom/lagoon-pinctrl.dtsi

+0 −27
Original line number Diff line number Diff line
@@ -623,33 +623,6 @@ 
			};

		};



		sde_dp_usbplug_cc_suspend: sde_dp_cc_suspend {

			mux {

				pins = "gpio124";

				function = "gpio";



			};



			config {

				pins = "gpio124";

				bias-pull-down;

				drive-strength = <2>;

			};

		};



		sde_dp_usbplug_cc_active: sde_dp_usbplug_cc_active {

			mux {

				pins = "gpio124";

				function = "gpio";

			};



			config {

				pins = "gpio124";

				bias-disable;

				drive-strength = <16>;

			};

		};



		/* WSA speaker reset pins */

		spkr_1_sd_n {

			spkr_1_sd_n_sleep: spkr_1_sd_n_sleep {

qcom/lagoon-sde-display.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -140,12 +140,7 @@ 
	qcom,dp-usbpd-detection = <&pm7250b_pdphy>;

	qcom,ext-disp = <&ext_disp>;



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

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



	pinctrl-names = "mdss_dp_active", "mdss_dp_sleep";

	pinctrl-0 = <&sde_dp_usbplug_cc_active>;

	pinctrl-1 = <&sde_dp_usbplug_cc_suspend>;

};



&mdss_mdp {