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

Commit d75622e1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: msm: dts: enable gpio configuration of ti amplifier"

parents e83626d2 f70ff3d5
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -13,6 +13,15 @@

#include "apq8053-lite-dragon.dtsi"

&soc {
	cdc_quat_mi2s_gpios: msm_cdc_pinctrl_quat {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&sec_tlmm_lines_act>;
		pinctrl-1 = <&sec_tlmm_lines_sus>;
	};
};

&pm8953_l4 {
	status = "okay";
	regulator-always-on;
+27 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@
	cdc_quat_mi2s_gpios: msm_cdc_pinctrl_quat {
		compatible = "qcom,msm-cdc-pinctrl";
		pinctrl-names = "aud_active", "aud_sleep";
		pinctrl-0 = <&sec_tlmm_lines_act>;
		pinctrl-1 = <&sec_tlmm_lines_sus>;
		pinctrl-0 = <&sec_tlmm_lines_act &ext_amp_ctrl_active>;
		pinctrl-1 = <&sec_tlmm_lines_sus &ext_amp_ctrl_sleep>;
	};

	gpio_keys {
@@ -130,6 +130,31 @@
	};
};

&cdc_pdm_comp_lines_act {
	mux {
		pins = "gpio67";
		function = "cdc_pdm0";
	};

	config {
		pins = "gpio67";
		drive-strength = <8>;
	};
};

&cdc_pdm_comp_lines_sus {
	mux {
		pins = "gpio67";
		function = "cdc_pdm0";
	};

	config {
		pins = "gpio67";
		drive-strength = <2>;
		bias-disable;
	};
};

&firmware {
	android {
		vbmeta {
+28 −0
Original line number Diff line number Diff line
@@ -466,6 +466,34 @@
			};
		};

		ext_amp_ctrl {
			label = "ext_amp_ctrl";
			ext_amp_ctrl_active: ext_amp_ctrl_active {
				mux {
					pins = "gpio68";
					function = "gpio";
				};
				config {
					pins = "gpio68";
					drive-strength = <8>;   /* 8 MA */
					bias-pull-up;           /*  PULL UP */
					output-high;
				};
			};

			ext_amp_ctrl_sleep: ext_amp_ctrl_sleep {
				mux {
					pins = "gpio68";
					function = "gpio";
				};
				configs {
					pins = "gpio68";
					drive-strength = <2>;   /* 2 MA */
					bias-pull-down;         /* PULL DOWN */
				};
			};
		};

		cdc_dmic0_clk_act: cdc_dmic0_clk_act_default {
				mux {
						pins = "gpio89";