Merge "dts: sdx: add support for tdm for sa515m card" (235215c1) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm64/boot/dts/qcom/sa515m-ccard.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -51,7 +51,9 @@
		<&afe_proxy_tx>, <&incall_record_rx>,
		<&incall_record_tx>, <&incall_music_rx>,
		<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
		<&dai_pri_tdm_rx_1>, <&dai_pri_tdm_tx_1>,
		<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
		<&dai_sec_tdm_rx_1>, <&dai_sec_tdm_tx_1>,
		<&dai_sec_auxpcm>, <&incall2_record_rx>,
		<&incall_music_2_rx>, <&incall_music_dl_rx>;
		asoc-cpu-names = "msm-dai-q6-auxpcm.1",
		@@ -63,7 +65,9 @@
		"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",
		"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",
		"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",
		"msm-dai-q6-tdm.36866", "msm-dai-q6-tdm.36867",
		"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",
		"msm-dai-q6-tdm.36882", "msm-dai-q6-tdm.36883",
		"msm-dai-q6-auxpcm.2", "msm-dai-q6-dev.32769",
		"msm-dai-q6-dev.32770", "msm-dai-q6-dev.32774";
		asoc-codec = <&tlv320aic3x_codec>, <&stub_codec>;

arch/arm64/boot/dts/qcom/sdx-audio-lpass.dtsi

+36 −14

Original line number	Diff line number	Diff line
		@@ -216,8 +216,8 @@
		qcom,msm-dai-tdm-pri-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37120>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36864>;
		qcom,msm-cpudai-tdm-group-num-ports = <2>;
		qcom,msm-cpudai-tdm-group-port-id = <36864 36866>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-internal = <1>;
		qcom,msm-cpudai-tdm-sync-mode = <0>;
		@@ -232,13 +232,18 @@
		qcom,msm-cpudai-tdm-data-align = <0>;
		};

		dai_pri_tdm_rx_1: qcom,msm-dai-q6-tdm-pri-rx-1 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36866>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-pri-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37121>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36865>;
		qcom,msm-cpudai-tdm-group-num-ports = <2>;
		qcom,msm-cpudai-tdm-group-port-id = <36865 36867>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-internal = <1>;
		qcom,msm-cpudai-tdm-sync-mode = <0>;
		@@ -252,44 +257,61 @@
		qcom,msm-cpudai-tdm-dev-id = <36865>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		dai_pri_tdm_tx_1: qcom,msm-dai-q6-tdm-pri-tx-1 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36867>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-sec-rx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37136>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36880>;
		qcom,msm-cpudai-tdm-group-num-ports = <2>;
		qcom,msm-cpudai-tdm-group-port-id = <36880 36882>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-internal = <1>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <0>;
		qcom,msm-cpudai-tdm-sync-mode = <0>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <0>;
		qcom,msm-cpudai-tdm-data-delay = <0>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36880>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		dai_sec_tdm_rx_1: qcom,msm-dai-q6-tdm-sec-rx-1 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36882>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-tdm-sec-tx {
		compatible = "qcom,msm-dai-tdm";
		qcom,msm-cpudai-tdm-group-id = <37137>;
		qcom,msm-cpudai-tdm-group-num-ports = <1>;
		qcom,msm-cpudai-tdm-group-port-id = <36881>;
		qcom,msm-cpudai-tdm-group-num-ports = <2>;
		qcom,msm-cpudai-tdm-group-port-id = <36881 36883>;
		qcom,msm-cpudai-tdm-clk-rate = <12288000>;
		qcom,msm-cpudai-tdm-clk-internal = <1>;
		qcom,msm-cpudai-tdm-sync-mode = <1>;
		qcom,msm-cpudai-tdm-sync-src = <0>;
		qcom,msm-cpudai-tdm-sync-mode = <0>;
		qcom,msm-cpudai-tdm-sync-src = <1>;
		qcom,msm-cpudai-tdm-data-out = <0>;
		qcom,msm-cpudai-tdm-invert-sync = <0>;
		qcom,msm-cpudai-tdm-data-delay = <0>;
		qcom,msm-cpudai-tdm-data-delay = <1>;
		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;
		dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36881>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		dai_sec_tdm_tx_1: qcom,msm-dai-q6-tdm-sec-tx-1 {
		compatible = "qcom,msm-dai-q6-tdm";
		qcom,msm-cpudai-tdm-dev-id = <36883>;
		qcom,msm-cpudai-tdm-data-align = <0>;
		};
		};

		qcom,msm-dai-mi2s {