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

Commit 86bceaca 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: make sound card child of APR for SDM845"

parents 68fc555c 6c39ebf7

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

+2 −0
Original line number Diff line number Diff line
@@ -27,7 +27,9 @@ 
		qcom,clk-div = <192>;

		qcom,clk-mult = <10>;

	};

};



&audio_apr {

	snd_934x: sound-tavil {

		compatible = "qcom,sdm845-asoc-snd-tavil";

		qcom,model = "sdm845-tavil-snd-card";

arch/arm64/boot/dts/qcom/sdm845-cdp-audio-overlay.dtsi

+3 −5
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -13,9 +13,7 @@ 


#include "sdm845-audio-overlay.dtsi"



&soc {

	sound-tavil {

&snd_934x {

	qcom,us-euro-gpios = <&tavil_us_euro_sw>;

};

};

arch/arm64/boot/dts/qcom/sdm845-qrd-audio-overlay.dtsi

+11 −13
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -13,8 +13,7 @@ 


#include "sdm845-audio-overlay.dtsi"



&soc {

	sound-tavil {

&snd_934x {

	qcom,model = "sdm845-tavil-qrd-snd-card";



	qcom,wsa-max-devs = <1>;
@@ -28,7 +27,6 @@ 
	pinctrl-0 = <&wcd_usbc_analog_en2_active>;

	pinctrl-1 = <&wcd_usbc_analog_en2_idle>;

};

};



&us_euro_sw_wcd_active {

	mux {