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

Commit a136d739 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 sec_mi2s node and gpio for msm8996"

parents 41e3d089 97de81a2

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -645,6 +645,14 @@ 
	};



	qcom,msm-dai-mi2s {

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active

				&sec_mi2s_sd1_active>;

			pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep

				&sec_mi2s_sd1_sleep>;

		};



		dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {

			pinctrl-names = "default", "sleep";

			pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

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

+81 −0
Original line number Diff line number Diff line
@@ -1449,6 +1449,87 @@ 
			};

		};



		sec_mi2s {

			sec_mi2s_sleep: sec_mi2s_sleep {

				mux {

					pins = "gpio80", "gpio81";

					function = "sec_mi2s";

				};



				config {

					pins = "gpio80", "gpio81";

					drive-strength = <2>;   /* 2 mA */

					bias-disable;         /* NO PULL */

				};

			};

			sec_mi2s_active: sec_mi2s_active {

				mux {

					pins = "gpio80", "gpio81";

					function = "sec_mi2s";

				};



				config {

					pins = "gpio80", "gpio81";

					drive-strength = <8>;   /* 8 mA */

					bias-disable;           /* NO PULL */

				};

			};

		};



		sec_mi2s_sd0 {

			sec_mi2s_sd0_sleep: sec_mi2s_sd0_sleep {

				mux {

					pins = "gpio82";

					function = "sec_mi2s";

				};



				config {

					pins = "gpio82";

					drive-strength = <2>;   /* 2 mA */

					bias-pull-down;         /* PULL DOWN */

				};

			};

			sec_mi2s_sd0_active: sec_mi2s_sd0_active {

				mux {

					pins = "gpio82";

					function = "sec_mi2s";

				};



				config {

					pins = "gpio82";

					drive-strength = <8>;   /* 8 mA */

					bias-disable;           /* NO PULL */

				};

			};

		};



		sec_mi2s_sd1 {

			sec_mi2s_sd1_sleep: sec_mi2s_sd1_sleep {

				mux {

					pins = "gpio83";

					function = "sec_mi2s";

				};



				config {

					pins = "gpio83";

					drive-strength = <2>;   /* 2 mA */

					bias-pull-down;         /* PULL DOWN */

				};

			};

			sec_mi2s_sd1_active: sec_mi2s_sd1_active {

				mux {

					pins = "gpio83";

					function = "sec_mi2s";

				};



				config {

					pins = "gpio83";

					drive-strength = <8>;   /* 8 mA */

					bias-disable;           /* NO PULL */

				};

			};

		};



		tert_mi2s {

			tert_mi2s_sleep: tert_mi2s_sleep {

				mux {

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

+7 −0
Original line number Diff line number Diff line
@@ -3200,6 +3200,13 @@ 


	qcom,msm-dai-mi2s {

		compatible = "qcom,msm-dai-mi2s";

		dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <1>;

			qcom,msm-mi2s-rx-lines = <1>;

			qcom,msm-mi2s-tx-lines = <0>;

		};



		dai_mi2s: qcom,msm-dai-q6-mi2s-tert {

			compatible = "qcom,msm-dai-q6-mi2s";

			qcom,msm-dai-q6-mi2s-dev-id = <2>;