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

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

Merge "ARM: dts: add pinctrl handle in snd card on 6155 platform"

parents 74b9fb89 8b575a30

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

+22 −26
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "sm6150-lpi.dtsi"



&soc {

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

	tdm_pri_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 = <4>;
@@ -51,7 +51,7 @@ 
		};

	};



	qcom,msm-dai-tdm-pri-tx {

	tdm_pri_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 = <4>;
@@ -89,7 +89,7 @@ 
		};

	};



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

	tdm_sec_rx: 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 = <5>;
@@ -133,7 +133,7 @@ 
		};

	};



	qcom,msm-dai-tdm-sec-tx {

	tdm_sec_tx: 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>;
@@ -170,7 +170,7 @@ 
		};

	};



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

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

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

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

		qcom,msm-cpudai-tdm-group-num-ports = <5>;
@@ -184,8 +184,10 @@ 
		qcom,msm-cpudai-tdm-invert-sync = <0>;

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

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&ter_i2s_sck_active &ter_i2s_data1_active>;

		pinctrl-1 = <&ter_i2s_sck_sleep &ter_i2s_data1_sleep>;

		pinctrl-0 = <&ter_i2s_sck_active &ter_i2s_data0_active

				&ter_i2s_data1_active>;

		pinctrl-1 = <&ter_i2s_sck_sleep &ter_i2s_data0_sleep

				&ter_i2s_data1_sleep>;

		dai_tert_tdm_rx_0: qcom,msm-dai-q6-tdm-tert-rx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36896>;
@@ -217,7 +219,7 @@ 
		};

	};



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

	tdm_tert_tx: qcom,msm-dai-tdm-tert-tx {

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

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

		qcom,msm-cpudai-tdm-group-num-ports = <5>;
@@ -230,9 +232,6 @@ 
		qcom,msm-cpudai-tdm-data-out = <0>;

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

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

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&ter_i2s_data0_active>;

		pinctrl-1 = <&ter_i2s_data0_sleep>;

		dai_tert_tdm_tx_0: qcom,msm-dai-q6-tdm-tert-tx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36897>;
@@ -264,7 +263,7 @@ 
		};

	};



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

	tdm_quat_rx: qcom,msm-dai-tdm-quat-rx {

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

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

		qcom,msm-cpudai-tdm-group-num-ports = <5>;
@@ -280,9 +279,9 @@ 
		qcom,msm-cpudai-tdm-data-delay = <0>;

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&quat_tdm_sclk_active &quat_tdm_ws_active

					&quat_tdm_data1_active>;

				&quat_tdm_data0_active &quat_tdm_data1_active>;

		pinctrl-1 = <&quat_tdm_sclk_sleep &quat_tdm_ws_sleep

					&quat_tdm_data1_sleep>;

				&quat_tdm_data0_sleep &quat_tdm_data1_sleep>;

		dai_quat_tdm_rx_0: qcom,msm-dai-q6-tdm-quat-rx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36912>;
@@ -313,7 +312,7 @@ 
		};

	};



	qcom,msm-dai-tdm-quat-tx {

	tdm_quat_tx: qcom,msm-dai-tdm-quat-tx {

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

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

		qcom,msm-cpudai-tdm-group-num-ports = <5>;
@@ -327,9 +326,6 @@ 
		qcom,msm-cpudai-tdm-data-out = <0>;

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

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

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&quat_tdm_data0_active>;

		pinctrl-1 = <&quat_tdm_data0_sleep>;

		dai_quat_tdm_tx_0: qcom,msm-dai-q6-tdm-quat-tx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36913>;
@@ -361,7 +357,7 @@ 
		};

	};



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

	tdm_quin_rx: qcom,msm-dai-tdm-quin-rx {

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

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

		qcom,msm-cpudai-tdm-group-num-ports = <4>;
@@ -375,9 +371,9 @@ 
		qcom,msm-cpudai-tdm-data-delay = <0>;

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&quin_tdm_sclk_active &quin_tdm_ws_active

					&quin_tdm_data1_active>;

				&quin_tdm_data0_active &quin_tdm_data1_active>;

		pinctrl-1 = <&quin_tdm_sclk_sleep &quin_tdm_ws_sleep

					&quin_tdm_data1_sleep>;

				&quin_tdm_data0_sleep &quin_tdm_data1_sleep>;

		dai_quin_tdm_rx_0: qcom,msm-dai-q6-tdm-quin-rx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36928>;
@@ -403,7 +399,7 @@ 
		};

	};



	qcom,msm-dai-tdm-quin-tx {

	tdm_quin_tx: qcom,msm-dai-tdm-quin-tx {

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

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

		qcom,msm-cpudai-tdm-group-num-ports = <4>;
@@ -415,9 +411,6 @@ 
		qcom,msm-cpudai-tdm-data-out = <0>;

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

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

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&quin_tdm_data0_active>;

		pinctrl-1 = <&quin_tdm_data0_sleep>;

		dai_quin_tdm_tx_0: qcom,msm-dai-q6-tdm-quin-tx-0 {

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

			qcom,msm-cpudai-tdm-dev-id = <36929>;
@@ -468,13 +461,16 @@ 


&q6core {

	sound-adp-star {

		status = "ok";

		compatible = "qcom,sa6155-asoc-snd-adp-star";

		qcom,model = "sa6155-adp-star-snd-card";

		qcom,mi2s-audio-intf;

		qcom,auxpcm-audio-intf;

		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;



		qcom,tert-tdm-gpios = <&tdm_tert_rx>;

		qcom,quat-tdm-gpios = <&tdm_quat_rx>;

		qcom,quin-tdm-gpios = <&tdm_quin_rx>;



		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

				<&loopback>, <&compress>, <&hostless>,

				<&afe>, <&lsm>, <&routing>, <&compr>,