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

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

Merge "ARM: dts: msm: config primary tdm as pcm on auto platforms"

parents e79adc94 95f2ffbb

arch/arm64/boot/dts/qcom/sa6155-audio.dtsi

+4 −6
Original line number Diff line number Diff line
@@ -26,12 +26,11 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36864 36866 36868 36870>;

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

		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-clk-attribute = /bits/ 16 <1>;

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

		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>;
@@ -64,12 +63,11 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36865 36867 36869 36871>;

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

		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-clk-attribute = /bits/ 16 <1>;

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

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

arch/arm64/boot/dts/qcom/sa8155-audio.dtsi

+4 −6
Original line number Diff line number Diff line
@@ -25,12 +25,11 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36864 36866 36868 36870>;

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

		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-clk-attribute = /bits/ 16 <1>;

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

		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>;
@@ -63,12 +62,11 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36865 36867 36869 36871>;

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

		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-clk-attribute = /bits/ 16 <1>;

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

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

arch/arm64/boot/dts/qcom/sa8155-vm-audio.dtsi

+4 −6
Original line number Diff line number Diff line
@@ -21,12 +21,11 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36864 36866 36868 36870>;

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

		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-clk-attribute = /bits/ 16 <1>;

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

		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>;
@@ -59,12 +58,11 @@ 
		qcom,msm-cpudai-tdm-group-port-id = <36865 36867 36869 36871>;

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

		qcom,msm-cpudai-tdm-clk-internal = <1>;

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

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

		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-clk-attribute = /bits/ 16 <1>;

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

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