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

Commit 73f27391 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add audio device tree properties on sdmshrike"

parents 1d0f51b6 d326f95c
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@

	qcom,pahu-ext-clk-freq = <19200000>;

	asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
	asoc-codec-names = "msm-stub-codec.1",
			   "msm-ext-disp-audio-codec-rx";

	qcom,wsa-max-devs = <2>;
	qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,
			<&wsa881x_0213>, <&wsa881x_0214>;
+5 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
#include "sdmshrike-sde-display.dtsi"

#include "sdmshrike-pmic-overlay.dtsi"
#include "sdmshrike-audio-overlay.dtsi"

&soc {
	gpio_keys {
@@ -45,6 +46,10 @@
			linux,can-disable;
		};
	};

	sound-tavil {
		qcom,us-euro-gpios = <&tavil_us_euro_switch>;
	};
};

&pm855l_wled {
+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
#include "sdmshrike-sde-display.dtsi"

#include "sdmshrike-pmic-overlay.dtsi"
#include "sdmshrike-audio-overlay.dtsi"

&soc {
	gpio_keys {
+11 −9
Original line number Diff line number Diff line
@@ -1730,6 +1730,7 @@
		};

		fsa_usbc_ana_en_n@100 {
			fsa_usbc_ana_en: fsa_usbc_ana_en {
				mux {
					pins = "gpio100";
					function = "gpio";
@@ -1742,6 +1743,7 @@
					output-low;
				};
			};
		};

		sdc2_clk_on: sdc2_clk_on {
			config {
+1 −0
Original line number Diff line number Diff line
@@ -1423,3 +1423,4 @@
#include "msm-arm-smmu-sdmshrike.dtsi"
#include "sdmshrike-usb.dtsi"
#include "sdmshrike-qupv3.dtsi"
#include "sm8150-audio.dtsi"