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

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

Merge "ARM: dts: msm: add snd evt client nodes for sa6155"

parents 2fa54984 e90dc4c7

arch/arm64/boot/dts/qcom/sa6155-adp-air.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
		status = "ok";

	};



	audio_apr: qcom,msm-audio-apr {

		status = "ok";

	};



	qcom,glink {

		modem {

			status = "disabled";

arch/arm64/boot/dts/qcom/sa6155-adp-star.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ 
		status = "ok";

	};



	audio_apr: qcom,msm-audio-apr {

		status = "ok";

	};



	qcom,glink {

		modem {

			status = "disabled";

arch/arm64/boot/dts/qcom/sa6155-audio.dtsi

+5 −1
Original line number Diff line number Diff line
@@ -422,15 +422,18 @@ 
&audio_apr {

	status = "ok";

	q6core: qcom,q6core-audio {

		status = "disabled";

		status = "ok";

		sm6150_snd: sound {

			status = "disabled";

		};



		bolero: bolero-cdc {

			status = "disabled";

		};

	};

};



&q6core {

	sound-adp-star {

		status = "ok";

		compatible = "qcom,sa6155-asoc-snd-adp-star";
@@ -517,6 +520,7 @@ 
				"msm-dai-q6-tdm.36935";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

		qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>;

	};

};