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

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

Merge "ARM: dts: msm: update quat tdm multilane config on 815x platform"

parents 533cf6e5 be71a958

arch/arm64/boot/dts/qcom/sa8155-audio.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ 
		qcom,msm-cpudai-tdm-group-num-ports = <5>;

		qcom,msm-cpudai-tdm-group-port-id = <36912 36914 36916

							36918 36926>;

		qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <3>;

		qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <10>;

		qcom,msm-cpudai-tdm-clk-rate = <24576000>;

		qcom,msm-cpudai-tdm-clk-internal = <1>;

		qcom,msm-cpudai-tdm-sync-mode = <1>;
@@ -322,7 +322,7 @@ 
		qcom,msm-cpudai-tdm-group-num-ports = <5>;

		qcom,msm-cpudai-tdm-group-port-id = <36913 36915 36917

							36919 36927>;

		qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <12>;

		qcom,msm-cpudai-tdm-lane-mask = /bits/ 16 <5>;

		qcom,msm-cpudai-tdm-clk-rate = <24576000>;

		qcom,msm-cpudai-tdm-clk-internal = <1>;

		qcom,msm-cpudai-tdm-sync-mode = <1>;

arch/arm64/boot/dts/qcom/sm8150-pinctrl.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -2699,12 +2699,12 @@ 
		quat_tdm_din {

			quat_tdm_din_sleep: quat_tdm_din_sleep {

				mux {

					pins = "gpio139";

					pins = "gpio139", "gpio141";

					function = "gpio";

				};



				config {

					pins = "gpio139";

					pins = "gpio139", "gpio141";

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

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

					input-enable;
@@ -2713,12 +2713,12 @@ 


			quat_tdm_din_active: quat_tdm_din_active {

				mux {

					pins = "gpio139";

					pins = "gpio139", "gpio141";

					function = "qua_mi2s";

				};



				config {

					pins = "gpio139";

					pins = "gpio139", "gpio141";

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

					bias-disable;           /* NO PULL */

				};
@@ -2728,12 +2728,12 @@ 
		quat_tdm_dout {

			quat_tdm_dout_sleep: quat_tdm_dout_sleep {

				mux {

					pins = "gpio140";

					pins = "gpio140", "gpio142";

					function = "gpio";

				};



				config {

					pins = "gpio140";

					pins = "gpio140", "gpio142";

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

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

					input-enable;
@@ -2742,12 +2742,12 @@ 


			quat_tdm_dout_active: quat_tdm_dout_active {

				mux {

					pins = "gpio140";

					pins = "gpio140", "gpio142";

					function = "qua_mi2s";

				};



				config {

					pins = "gpio140";

					pins = "gpio140", "gpio142";

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

					bias-disable;           /* NO PULL */

				};