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

Commit e0446ab3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: add support for secondary TDM TX capture"

parents 5ddab966 c55f5e69

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -687,6 +687,8 @@ 
				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&dai_sec_tdm_tx_0>, <&dai_sec_tdm_tx_1>,

				<&dai_sec_tdm_tx_2>, <&dai_sec_tdm_tx_3>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_rx_1>,

				<&dai_tert_tdm_rx_2>, <&dai_tert_tdm_rx_3>,

				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,
@@ -702,6 +704,8 @@ 
				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

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

				"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36883",

				"msm-dai-q6-tdm.36885", "msm-dai-q6-tdm.36887",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36898",

				"msm-dai-q6-tdm.36900", "msm-dai-q6-tdm.36902",

				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -993,6 +993,8 @@ 
				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&dai_sec_tdm_tx_0>, <&dai_sec_tdm_tx_1>,

				<&dai_sec_tdm_tx_2>, <&dai_sec_tdm_tx_3>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_rx_1>,

				<&dai_tert_tdm_rx_2>, <&dai_tert_tdm_rx_3>,

				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,
@@ -1008,6 +1010,8 @@ 
				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

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

				"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36883",

				"msm-dai-q6-tdm.36885", "msm-dai-q6-tdm.36887",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36898",

				"msm-dai-q6-tdm.36900", "msm-dai-q6-tdm.36902",

				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -856,6 +856,8 @@ 
				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&dai_sec_tdm_tx_0>, <&dai_sec_tdm_tx_1>,

				<&dai_sec_tdm_tx_2>, <&dai_sec_tdm_tx_3>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_rx_1>,

				<&dai_tert_tdm_rx_2>, <&dai_tert_tdm_rx_3>,

				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,
@@ -871,6 +873,8 @@ 
				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

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

				"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36883",

				"msm-dai-q6-tdm.36885", "msm-dai-q6-tdm.36887",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36898",

				"msm-dai-q6-tdm.36900", "msm-dai-q6-tdm.36902",

				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -538,6 +538,8 @@ 
				<&afe_proxy_rx>, <&afe_proxy_tx>,

				<&incall_record_rx>, <&incall_record_tx>,

				<&incall_music_rx>, <&incall_music2_rx>,

				<&dai_sec_tdm_tx_0>, <&dai_sec_tdm_tx_1>,

				<&dai_sec_tdm_tx_2>, <&dai_sec_tdm_tx_3>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_rx_1>,

				<&dai_tert_tdm_rx_2>, <&dai_tert_tdm_rx_3>,

				<&dai_tert_tdm_tx_0>, <&dai_tert_tdm_tx_1>,
@@ -553,6 +555,8 @@ 
				"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",

				"msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772",

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

				"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36883",

				"msm-dai-q6-tdm.36885", "msm-dai-q6-tdm.36887",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36898",

				"msm-dai-q6-tdm.36900", "msm-dai-q6-tdm.36902",

				"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36899",

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

+51 −0
Original line number Diff line number Diff line
@@ -3301,6 +3301,57 @@ 
		};

	};



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

		qcom,msm-cpudai-tdm-group-port-id = <36881 36883 36885 36887>;

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

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

			qcom,msm-cpudai-tdm-sync-src = <0>;

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

			qcom,msm-cpudai-tdm-sync-src = <0>;

			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-align = <0>;

		};



		dai_sec_tdm_tx_2: qcom,msm-dai-q6-tdm-sec-tx-2 {

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

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

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

			qcom,msm-cpudai-tdm-sync-src = <0>;

			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-align = <0>;

		};



		dai_sec_tdm_tx_3: qcom,msm-dai-q6-tdm-sec-tx-3 {

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

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

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

			qcom,msm-cpudai-tdm-sync-src = <0>;

			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-align = <0>;

		};

	};



	qcom,msm-dai-tdm-tert-rx {

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

		qcom,msm-cpudai-tdm-group-id = <37152>;