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

Commit b1a0433e 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 support for secondary mi2s interface"

parents ddde82c3 c2c00a83

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

+9 −1
Original line number Diff line number Diff line
@@ -238,11 +238,19 @@ 
		pinctrl-names = "cdc_lines_act",

				"cdc_lines_sus",

				"cross_conn_det_act",

				"cross_conn_det_sus";

				"cross_conn_det_sus",

				"cdc_lines_sec_ext_act",

				"cdc_lines_sec_ext_sus";

		pinctrl-0 = <&cdc_pdm_lines_act>;

		pinctrl-1 = <&cdc_pdm_lines_sus>;

		pinctrl-2 = <&cross_conn_det_act>;

		pinctrl-3 = <&cross_conn_det_sus>;

		pinctrl-4 = <&cdc_pdm_lines_act &cdc_ext_pa_act

				&cdc_ext_pa_d0_act &cdc_ext_mclk_act

				&cross_conn_det_act>;

		pinctrl-5 = <&cdc_pdm_lines_sus &cdc_ext_pa_sus

				&cdc_ext_pa_d0_sus &cdc_ext_mclk_sus

				&cross_conn_det_sus>;

		qcom,cdc-us-euro-gpios = <&msm_gpio 97 0>;

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

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

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

+43 −0
Original line number Diff line number Diff line
@@ -192,6 +192,49 @@ 
			};

		};



		cdc-ext-pa-lines {

			qcom,pins = <&gp 94>, <&gp 96>,

					 <&gp 110>;

			qcom,num-grp-pins = <3>;

			qcom,pin-func = <1>;

			label = "cdc-ext-pa-lines";

			cdc_ext_pa_act: ext_pa_on {

				drive-strength = <8>;

			};

			cdc_ext_pa_sus: ext_pa_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cdc-ext-pa-d0-lines {

			qcom,pins = <&gp 95>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <2>;

			label = "cdc-ext-pa-d0-lines";

			cdc_ext_pa_d0_act: ext_pa_d0_on {

				drive-strength = <8>;

			};

			cdc_ext_pa_d0_sus: ext_pa_d0_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		cdc-ext-mclk-lines {

			qcom,pins = <&gp 98>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <2>;

			label = "cdc-ext-mclk-lines";

			cdc_ext_mclk_act: ext_mclk_on {

				drive-strength = <8>;

			};

			cdc_ext_mclk_sus: ext_mclk_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		/* QDSD pin type */

		qdsd: qdsd {

			/* 0-> clk, 1 -> cmd, 2->data0, 3->data1, 4->data2, 5->data3 */

sound/soc/msm/qdsp6v2/q6afe.c

+1 −0
Original line number Diff line number Diff line
@@ -3426,6 +3426,7 @@ int afe_validate_port(u16 port_id) 
	case SLIMBUS_6_TX:

	case AFE_PORT_ID_PRIMARY_MI2S_RX:

	case AFE_PORT_ID_PRIMARY_MI2S_TX:

	case AFE_PORT_ID_SECONDARY_MI2S_RX:

	case AFE_PORT_ID_QUATERNARY_MI2S_RX:

	case AFE_PORT_ID_QUATERNARY_MI2S_TX:

	case AFE_PORT_ID_TERTIARY_MI2S_TX: