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

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

Merge "ARM: dts: msm: Audio dtsi changes for tasha variants"

parents 7b51ccde 38861b33

qcom/msm-audio-lpass.dtsi

+70 −0
Original line number Diff line number Diff line
@@ -253,6 +253,71 @@ 


	qcom,msm-dai-q6 {

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

		sb_0_rx: qcom,msm-dai-q6-sb-0-rx {

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

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

		};



		sb_0_tx: qcom,msm-dai-q6-sb-0-tx {

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

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

		};



		sb_1_rx: qcom,msm-dai-q6-sb-1-rx {

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

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

		};



		sb_1_tx: qcom,msm-dai-q6-sb-1-tx {

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

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

		};



		sb_2_rx: qcom,msm-dai-q6-sb-2-rx {

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

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

		};



		sb_2_tx: qcom,msm-dai-q6-sb-2-tx {

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

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

		};



		sb_3_rx: qcom,msm-dai-q6-sb-3-rx {

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

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

		};



		sb_3_tx: qcom,msm-dai-q6-sb-3-tx {

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

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

		};



		sb_4_rx: qcom,msm-dai-q6-sb-4-rx {

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

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

		};



		sb_4_tx: qcom,msm-dai-q6-sb-4-tx {

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

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

		};



		sb_5_tx: qcom,msm-dai-q6-sb-5-tx {

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

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

		};



		sb_5_rx: qcom,msm-dai-q6-sb-5-rx {

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

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

		};



		sb_6_rx: qcom,msm-dai-q6-sb-6-rx {

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

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

		};



		sb_7_rx: qcom,msm-dai-q6-sb-7-rx {

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

			qcom,msm-dai-q6-dev-id = <16398>;
@@ -265,6 +330,11 @@ 
			qcom,msm-dai-q6-slim-dev-id = <0>;

		};



		sb_8_rx: qcom,msm-dai-q6-sb-8-rx {

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

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

		};



		sb_8_tx: qcom,msm-dai-q6-sb-8-tx {

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

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

qcom/msm8937-audio.dtsi

+12 −21
Original line number Diff line number Diff line
@@ -257,23 +257,16 @@ 


		asoc-cpu = <&dai_pri_auxpcm>,

				<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s5>,

			/* TBD

			 * <&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

			 * <&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,

			 * <&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,

			 */

				<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,

				<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,

				<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,

				<&afe_pcm_rx>, <&afe_pcm_tx>,

				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music_2_rx>,

				/* TBD

				 * <&sb_5_rx>, <&bt_sco_rx>, <&bt_sco_tx>,

				 */

				<&int_fm_rx>, <&int_fm_tx>;

				/* TBD

				 * , <&sb_6_rx>,

				 * <&proxy_rx>, <&proxy_tx>;

				 */

				<&sb_5_rx>, <&bt_sco_rx>, <&bt_sco_tx>,

				<&int_fm_rx>, <&int_fm_tx>, <&sb_6_rx>,

				<&proxy_rx>, <&proxy_tx>;



		asoc-cpu-names = "msm-dai-q6-auxpcm.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -289,10 +282,8 @@ 
				"msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.16394", "msm-dai-q6-dev.12288",

				"msm-dai-q6-dev.12289", "msm-dai-q6-dev.12292",

				"msm-dai-q6-dev.12293", "msm-dai-q6-dev.16396";

				/* TBD

				 * "msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";

				 */

				"msm-dai-q6-dev.12293", "msm-dai-q6-dev.16396",

				"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";



		asoc-codec = <&stub_codec>, <&hdmi_dba>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-dba-codec-rx";
@@ -322,6 +313,8 @@ 
	clock_audio: audio_ext_clk {

		status = "disabled";

		compatible = "qcom,audio-ref-clk";

		qcom,use-pinctrl = <1>;

		qcom,codec-ext-clk-src = <14>;

		clock-names = "osr_clk";

		qcom,node_has_rpm_clock;

		#clock-cells = <1>;
@@ -364,10 +357,8 @@ 
		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;



		clock-names = "wcd_clk", "wcd_native_clk";

		/* TODO

		 * clocks = < &clock_audio clk_audio_pmi_clk>,

		 * <&clock_audio clk_audio_ap_clk2>;

		 */

		clocks = < &clock_audio 0>,

			<&clock_audio_native 0>;



		qcom,cdc-static-supplies =

				"cdc-vdd-buck",

qcom/sdm439-audio.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
	clock_audio_native: audio_ext_clk_native {

		status = "disabled";

		compatible = "qcom,audio-ref-clk";

		qcom,use-pinctrl = <1>;

		qcom,codec-ext-clk-src = <2>;

		#clock-cells = <1>;

		qcom,codec-mclk-clk-freq = <11289600>;

		qcom,audio-ref-clk-gpio = <&tlmm 66 0>;

qcom/sdm439-ext-audio-mtp.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 
	status = "disabled";

};



&pmic_analog_codec {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "disabled";

};
@@ -10,6 +14,10 @@ 
	status = "disabled";

};



&wsa881x_analog_clk {

	status = "disabled";

};



&cdc_pri_mi2s_gpios {

	status = "disabled";

};
@@ -42,6 +50,10 @@ 
	status = "okay";

};



&clock_audio_native {

	status = "okay";

};



&wcd9335 {

	status = "okay";

};