Merge "RM: dts: msm: add support for gpio based jack detection on qcs610" (e8956bd6) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/qcs610-ipc.dtsi

+7 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,13 @@
		qcom,wsa-max-devs = <1>;
		qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0213>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft";
		qcom,linein-det-swh = <1>;
		qcom,lineout-det-swh = <1>;
		qcom,linein-det-gpio = <&tlmm 1 0>;
		qcom,lineout-det-gpio = <&tlmm 60 0>;
		pinctrl-names = "default";
		pinctrl-0 = <&jack_det_linein_default
		&jack_det_lineout_default>;
		};

		&pm6150_charger {

+29 −0

Original line number	Diff line number	Diff line
		@@ -1146,6 +1146,35 @@
		};
		};


		gpio_jack_det_line_in {
		jack_det_linein_default: jack_det_linein_default {
		mux {
		pins = "gpio1";
		function = "gpio";
		};
		config {
		pins = "gpio1";
		bias-pull-up; /* pull up */
		input-enable;
		};
		};
		};

		gpio_jack_det_line_out {
		jack_det_lineout_default: jack_det_lineout_default {
		mux {
		pins = "gpio60";
		function = "gpio";
		};
		config {
		pins = "gpio60";
		bias-pull-up; /* pull up */
		input-enable;
		};
		};
		};

		ter_i2s_sck_ws {
		ter_i2s_sck_sleep: ter_i2s_sck_sleep {
		mux {