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

Commit dd0af8d2 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: update compander gpio configuration for msmtitanium"

parents 0f7347e0 d9c02661

arch/arm/boot/dts/qcom/msmtitanium-audio.dtsi

+90 −0
Original line number Diff line number Diff line
@@ -22,6 +22,96 @@ 
	qcom,msm-hs-micbias-type = "internal";

	qcom,msm-micbias1-ext-cap;



	qcom,msm-gpios =

		"pri_i2s",

		"us_eu_gpio",

		"quin_i2s",

		"comp_gpio";

	qcom,pinctrl-names =

		"all_off",

		"pri_i2s_act",

		"us_eu_gpio_act",

		"pri_i2s_us_eu_gpio_act",

		"quin_act",

		"quin_pri_i2s_act",

		"quin_us_eu_gpio_act",

		"quin_us_eu_gpio_pri_i2s_act",

		"comp_gpio_act",

		"comp_gpio_pri_i2s_act",

		"comp_gpio_us_eu_gpio_act",

		"comp_gpio_pri_i2s_us_eu_gpio_act",

		"comp_gpio_quin_act",

		"comp_gpio_quin_pri_i2s_act",

		"comp_gpio_quin_us_eu_gpio_act",

		"comp_gpio_quin_us_eu_gpio_pri_i2s_act";



	pinctrl-names =

		"all_off",

		"pri_i2s_act",

		"us_eu_gpio_act",

		"pri_i2s_us_eu_gpio_act",

		"quin_act",

		"quin_pri_i2s_act",

		"quin_us_eu_gpio_act",

		"quin_us_eu_gpio_pri_i2s_act",

		"comp_gpio_act",

		"comp_gpio_pri_i2s_act",

		"comp_gpio_us_eu_gpio_act",

		"comp_gpio_pri_i2s_us_eu_gpio_act",

		"comp_gpio_quin_act",

		"comp_gpio_quin_pri_i2s_act",

		"comp_gpio_quin_us_eu_gpio_act",

		"comp_gpio_quin_us_eu_gpio_pri_i2s_act";



	pinctrl-0 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_sus &cross_conn_det_sus

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-1 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_act &cross_conn_det_sus

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-2 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_sus &cross_conn_det_act

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-3 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_act &cross_conn_det_act

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-4 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_sus &cross_conn_det_sus

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-5 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_act &cross_conn_det_sus

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-6 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_sus &cross_conn_det_act

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-7 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_sus

		&cdc_pdm_lines_2_act &cross_conn_det_act

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-8 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_sus &cross_conn_det_sus

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-9 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_act &cross_conn_det_sus

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-10 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_sus &cross_conn_det_act

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-11 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_act &cross_conn_det_act

		&pri_tlmm_lines_sus &pri_tlmm_ws_sus>;

	pinctrl-12 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_sus &cross_conn_det_sus

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-13 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_act &cross_conn_det_sus

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-14 = <&cdc_pdm_lines_sus &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_sus &cross_conn_det_act

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;

	pinctrl-15 = <&cdc_pdm_lines_act &cdc_pdm_comp_lines_act

		&cdc_pdm_lines_2_act &cross_conn_det_act

		&pri_tlmm_lines_act &pri_tlmm_ws_act>;



	asoc-codec = <&stub_codec>, <&pmtitanium_diangu_dig>, <&hdmi_dba>;

	asoc-codec-names = "msm-stub-codec.1", "cajon_codec",

						"msm-hdmi-dba-codec-rx";

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

+27 −0
Original line number Diff line number Diff line
@@ -887,6 +887,33 @@ 
			};

		};



		cdc-pdm-comp-lines {

			cdc_pdm_comp_lines_act: pdm_comp_lines_on {

				mux {

					pins = "gpio67", "gpio68";

					function = "cdc_pdm0";

				};



				config {

					pins = "gpio67", "gpio68";

					drive-strength = <8>;

				};

			};



			cdc_pdm_comp_lines_sus: pdm_comp_lines_off {

				mux {

					pins = "gpio67", "gpio68";

					function = "cdc_pdm0";

				};



				config {

					pins = "gpio67", "gpio68";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		cross-conn-det {

			cross_conn_det_act: lines_on {

				mux {