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

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

Merge "ARM: dts: qcom: add pinctrl for audio internal mclk2 on sa6155 platform"

parents 14d36d0e 5cd82aeb

qcom/sa6155-audio.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -459,6 +459,13 @@ 
			&pri_aux_pcm_data0_sleep &pri_aux_pcm_data1_sleep>;

	};



	internal_mclk2: qcom,msm-internal-mclk2 {

		compatible = "qcom,msm-pcm-routing";

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

		pinctrl-0 = <&audio_internal_mclk2_active>;

		pinctrl-1 = <&audio_internal_mclk2_sleep>;

	};



qcom,msm-dai-q6 {

		compatible = "qcom,msm-dai-q6";
@@ -491,6 +498,7 @@ qcom,msm-dai-q6 { 
		qcom,tert-tdm-gpios = <&tdm_tert_rx>;

		qcom,quat-tdm-gpios = <&tdm_quat_rx>;

		qcom,quin-tdm-gpios = <&tdm_quin_rx>;

		qcom,internal-mclk2-gpios = <&internal_mclk2>;



		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

qcom/sm6150-pinctrl.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -1603,6 +1603,32 @@ 
			};

		};



		audio_internal_mclk2_active: audio_internal_mclk2_active {

			mux {

				pins = "gpio122";

				function = "mclk2";

			};



			config {

				pins = "gpio122";

				drive-strength = <2>;

				bias-disable;

			};

		};



		audio_internal_mclk2_sleep: audio_internal_mclk2_sleep {

			mux {

				pins = "gpio122";

				function = "mclk2";

			};



			config {

				pins = "gpio122";

				drive-strength = <2>;

				bias-pull-down;

			};

		};



		pmx_ts_int_active {

			ts_int_active: ts_int_active {

				mux {