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

Commit 60b4eb06 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 headset type switch gpio and pinctrl"

parents 956cef3e 89799e96

arch/arm/boot/dts/qcom/msm8916-mtp.dtsi

+6 −1
Original line number Diff line number Diff line
@@ -91,9 +91,14 @@ 
			"AMIC2", "MIC BIAS Internal2",

			"AMIC3", "MIC BIAS External";

		pinctrl-names = "cdc_pdm_lines_act",

				"cdc_pdm_lines_sus";

				"cdc_pdm_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		pinctrl-2 = <&cross_conn_det_act>;

		pinctrl-3 = <&cross_conn_det_sus>;

		qcom,cdc-us-euro-gpios = <&msm_gpio 120 0>;

	};

};

arch/arm/boot/dts/qcom/msm8916-pinctrl.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -45,6 +45,20 @@ 
				bias-disable;

			};

		};

		cross-conn-det {

			qcom,pins = <&gp 120>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <0>;

			label = "cross-conn-det-sw";

			cross_conn_det_act: lines_on {

				drive-strength = <8>;

				bias-pull-none;

			};

			cross_conn_det_sus: lines_off {

				drive-strength = <2>;

				bias-disable;

			};

		};

		pmx-uartconsole {

			qcom,pins = <&gp 4>, <&gp 5>;

			qcom,num-grp-pins = <2>;