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

Commit a82c7d47 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: Fix proper i2c node for fsa4480 for sdm855" into msm-4.14

parents a86acd4b e2154360
Loading
Loading
Loading
Loading
+8 −8
Original line number Diff line number Diff line
@@ -90,14 +90,6 @@
				"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929";
		fsa4480-i2c-handle = <&fsa4480>;
	};
};

&qupv3_se12_i2c {
	status = "ok";
	fsa4480: fsa4480@43 {
		compatible = "qcom,fsa4480-i2c";
		reg = <0x43>;
	};

	snd_934x: sound-tavil {
		compatible = "qcom,sdm855-asoc-snd-tavil";
@@ -160,6 +152,14 @@
	};
};

&qupv3_se4_i2c {
	status = "ok";
	fsa4480: fsa4480@43 {
		compatible = "qcom,fsa4480-i2c";
		reg = <0x43>;
	};
};

&slim_aud {
	msm_dai_slim {
		compatible = "qcom,msm-dai-slim";