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

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

Merge "ARM: dts: msm: Add support for Headset voice activation on lito"

parents 751899dd 94353184

qcom/lito-audio-overlay.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -154,8 +154,8 @@ 
	va_macro: va-macro@3370000 {

		compatible = "qcom,va-macro";

		reg = <0x3370000 0x0>;

		clock-names = "va_core_clk";

		clocks = <&clock_audio_va_1 0>;

		clock-names = "lpass_audio_hw_vote";

		clocks = <&lpass_audio_hw_vote 0>;

		qcom,va-dmic-sample-rate = <600000>;

		qcom,va-clk-mux-select = <1>;

		qcom,va-island-mode-muxsel = <0x033A0000>;

qcom/lito-audio.dtsi

+10 −2
Original line number Diff line number Diff line
@@ -27,10 +27,18 @@ 
			#clock-cells = <1>;

		};



		lpass_audio_hw_vote: vote_lpass_audio_hw {

			compatible = "qcom,audio-ref-clk";

			qcom,codec-ext-clk-src = <AUDIO_LPASS_AUDIO_HW_VOTE>;

			#clock-cells = <1>;

		};



		bolero: bolero-cdc {

			compatible = "qcom,bolero-codec";

			clock-names = "lpass_core_hw_vote";

			clocks = <&lpass_core_hw_vote 0>;

			clock-names = "lpass_core_hw_vote",

					"lpass_audio_hw_vote";

			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			bolero-clk-rsc-mngr {

				compatible = "qcom,bolero-clk-rsc-mngr";

			};

qcom/lito-lpi.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ 
				pins = "gpio1";

				drive-strength = <2>;

				input-enable;

				bias-pull-down;

				bias-bus-hold;

			};

		};