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

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

Merge "ARM: dts: msm: Enable audio for sm6150 external codec"

parents e8fa4af9 e0e10360

arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -361,10 +361,12 @@ 
		pinctrl-names = "active", "sleep";

		pinctrl-0 = <&wcd934x_mclk_default>;

		pinctrl-1 = <&wcd934x_mclk_default>;

		qcom,use-pinctrl = <1>;

		qcom,audio-ref-clk-gpio = <&pm6150_gpios 8 0>;

		clock-names = "osr_clk";

		clocks = <&pm6150_clkdiv>;

		qcom,node_has_rpm_clock;

		pmic-clock-names = "pm6150_div_clk1";

		#clock-cells = <1>;

	};

arch/arm64/boot/dts/qcom/sm6150-ext-codec-audio-overlay.dtsi

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

};



&qupv3_se4_spi {

	status = "okay";

};



&tavil_wdsp {

	status = "okay";

};

arch/arm64/boot/dts/qcom/sm6150-external-codec-idp-overlay.dts

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>



#include "sm6150-idp.dtsi"

#include "sm6150-ext-codec-audio-overlay.dtsi"

#include "sm6150-external-codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SM6150 External Audio Codec IDP";

arch/arm64/boot/dts/qcom/sm6150-external-codec.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
&slim_aud {

	status = "okay";

	tavil_codec {

		swr_tavil: tavil_wsa_swr_master {

		swr_tavil: swr_master {

			compatible = "qcom,swr-mstr";

			#address-cells = <2>;

			#size-cells = <0>;