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

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

Merge "ARM: dts: msm: add gpio cells property for auto sa*155 platform"

parents d4534f35 772f34de

qcom/sa6155-audio.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ 
				&ter_i2s_data1_active>;

		pinctrl-1 = <&ter_i2s_sck_sleep &ter_i2s_data0_sleep

				&ter_i2s_data1_sleep>;

		#gpio-cells = <0>;

		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>;
@@ -282,6 +283,7 @@ 
		pinctrl-1 = <&quat_tdm_sclk_sleep &quat_tdm_ws_sleep

				&quat_tdm_data0_sleep &quat_tdm_data1_sleep

				&quat_tdm_data2_sleep &quat_tdm_data3_sleep>;

		#gpio-cells = <0>;

		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>;
@@ -376,6 +378,7 @@ 
				&quin_tdm_data0_active &quin_tdm_data1_active>;

		pinctrl-1 = <&quin_tdm_sclk_sleep &quin_tdm_ws_sleep

				&quin_tdm_data0_sleep &quin_tdm_data1_sleep>;

		#gpio-cells = <0>;

		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>;
@@ -464,6 +467,7 @@ 
		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&audio_internal_mclk2_active>;

		pinctrl-1 = <&audio_internal_mclk2_sleep>;

		#gpio-cells = <0>;

	};



qcom,msm-dai-q6 {

qcom/sa8155-audio.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ 
			     &sec_tdm_dout_active>;

		pinctrl-1 = <&sec_tdm_sleep &sec_tdm_din_sleep

			     &sec_tdm_dout_sleep>;

		#gpio-cells = <0>;

		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>;
@@ -191,6 +192,7 @@ 
			     &tert_tdm_dout_active>;

		pinctrl-1 = <&tert_tdm_sleep &tert_tdm_din_sleep

			     &tert_tdm_dout_sleep>;

		#gpio-cells = <0>;

		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>;
@@ -285,6 +287,7 @@ 
			     &quat_tdm_dout_active>;

		pinctrl-1 = <&quat_tdm_sleep &quat_tdm_din_sleep

			     &quat_tdm_dout_sleep>;

		#gpio-cells = <0>;

		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>;
@@ -379,6 +382,7 @@ 
			     &quin_tdm_dout_active>;

		pinctrl-1 = <&quin_tdm_sleep &quin_tdm_din_sleep

			     &quin_tdm_dout_sleep>;

		#gpio-cells = <0>;

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