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

Commit d96c71eb 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 TDM support for apq8009"

parents 85108283 3c9d4c6b

arch/arm/boot/dts/qcom/apq8009-audio-external_codec.dtsi

+48 −2
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ 
		qcom,model = "apq8009-tashalite-snd-card";

		qcom,msm-mbhc-hphl-swh = <0>;

		qcom,msm-mbhc-gnd-swh = <0>;

		qcom,afe-rxtx-lb;

		qcom,msm-mclk-freq = <9600000>;

		qcom,tdm-audio-intf;

		qcom,msm-hs-micbias-type = "internal";

		qcom,audio-routing =

			"AIF4 VI", "MCLK",
@@ -87,7 +89,9 @@ 
				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music_2_rx>,

				<&bt_sco_rx>,

				<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>;

				<&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>,

				<&afe_loopback_tx>, <&dai_pri_tdm_rx_0>,

				<&dai_pri_tdm_tx_0>;

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

				 "msm-dai-q6-mi2s.0",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -101,7 +105,9 @@ 
				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-dev.32770",

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

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

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

				"msm-dai-q6-dev.24577", "msm-dai-q6-tdm.36864",

				"msm-dai-q6-tdm.36865";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

		qcom,wsa-max-devs = <2>;
@@ -221,4 +227,44 @@ 
			};

		};

	};



	pri_tdm_rx: 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-clk-rate = <12288000>;

		qcom,msm-cpudai-tdm-sec-port-enable;

		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;

		dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36864>;

			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 = <1>;

			qcom,msm-cpudai-tdm-data-align = <0>;

		};

	};



	pri_tdm_tx: 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-clk-rate = <12288000>;

		qcom,msm-cpudai-tdm-sec-port-enable;

		qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>;

		dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36865>;

			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 = <1>;

			qcom,msm-cpudai-tdm-data-align = <0>;

		};

	};

};

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

+5 −0
Original line number Diff line number Diff line
@@ -1726,6 +1726,11 @@ 
			qcom,msm-dai-q6-dev-id = <240>;

		};



		afe_loopback_tx: qcom,msm-dai-q6-afe-loopback-tx {

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

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

		};



		incall_record_rx: qcom,msm-dai-q6-incall-record-rx {

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

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

sound/soc/msm/apq8009-i2s-ext-codec.c

+696 −6

File changed.

Preview size limit exceeded, changes collapsed.