Merge "ARM: dts: msm: separate out AUXPCM data-in/out lines" (c2bf85ad) · Commits · e / devices / android_kernel_xiaomi_markw

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

+32 −5

Original line number	Diff line number	Diff line
		@@ -1082,24 +1082,24 @@
		pri_aux_pcm {
		pri_aux_pcm_sleep: pri_aux_pcm_sleep {
		mux {
		pins = "gpio65", "gpio66", "gpio67";
		pins = "gpio65", "gpio66";
		function = "pri_mi2s";
		};

		config {
		pins = "gpio65", "gpio66", "gpio67";
		pins = "gpio65", "gpio66";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};
		pri_aux_pcm_active: pri_aux_pcm_active {
		mux {
		pins = "gpio65", "gpio66", "gpio67";
		pins = "gpio65", "gpio66";
		function = "pri_mi2s";
		};

		config {
		pins = "gpio65", "gpio66", "gpio67";
		pins = "gpio65", "gpio66";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL */
		output-high;
		@@ -1109,6 +1109,33 @@

		pri_aux_pcm_din {
		pri_aux_pcm_din_sleep: pri_aux_pcm_din_sleep {
		mux {
		pins = "gpio67";
		function = "pri_mi2s";
		};

		config {
		pins = "gpio67";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* PULL DOWN */
		};
		};
		pri_aux_pcm_din_active: pri_aux_pcm_din_active {
		mux {
		pins = "gpio67";
		function = "pri_mi2s";
		};

		config {
		pins = "gpio67";
		drive-strength = <8>; /* 8 mA */
		bias-disable; /* NO PULL */
		};
		};
		};

		pri_aux_pcm_dout {
		pri_aux_pcm_dout_sleep: pri_aux_pcm_dout_sleep {
		mux {
		pins = "gpio68";
		function = "pri_mi2s";
		@@ -1120,7 +1147,7 @@
		bias-pull-down; /* PULL DOWN */
		};
		};
		pri_aux_pcm_din_active: pri_aux_pcm_din_active {
		pri_aux_pcm_dout_active: pri_aux_pcm_dout_active {
		mux {
		pins = "gpio68";
		function = "pri_mi2s";

+4 −2

Original line number	Diff line number	Diff line
		@@ -3110,8 +3110,10 @@
		qcom,msm-auxpcm-interface = "primary";
		qcom,msm-cpudai-afe-clk-ver = <2>;
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&pri_aux_pcm_active &pri_aux_pcm_din_active>;
		pinctrl-1 = <&pri_aux_pcm_sleep &pri_aux_pcm_din_sleep>;
		pinctrl-0 = <&pri_aux_pcm_active &pri_aux_pcm_din_active
		&pri_aux_pcm_dout_active>;
		pinctrl-1 = <&pri_aux_pcm_sleep &pri_aux_pcm_din_sleep
		&pri_aux_pcm_dout_sleep>;
		};

		dai_sec_auxpcm: qcom,msm-sec-auxpcm {