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

Commit 7e0837e7 authored by Vatsal Bucha's avatar Vatsal Bucha
Browse files

ARM: dts: msm: Fix label names for sm6150 wcd 



Correct sequence of inclusion of dtsi files and
fix label names for sm6150 wcd934x.

Change-Id: I71af78e90c105113475578408e66f48ccfef5b24
Signed-off-by: default avatarVatsal Bucha <vbucha@codeaurora.org>
parent 4424b4d6

arch/arm64/boot/dts/qcom/pm6150.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ 
			clocks = <&clock_rpmh RPMH_CXO_CLK>;

			clock-names = "xo";

			assigned-clocks = <&pm6150_clkdiv 1>;

			assigned-clock-rates = <9600000>;

			assigned-clock-rates = <19200000>;

		};



		pm6150_gpios: pinctrl@c000 {

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

+9 −8
Original line number Diff line number Diff line
@@ -81,13 +81,13 @@ 
	qcom,audio-routing =

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Analog Mic2",

		"DMIC0", "MIC BIAS1",

		"TX DMIC0", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic0",

		"DMIC1", "MIC BIAS1",

		"TX DMIC1", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic1",

		"DMIC2", "MIC BIAS3",

		"TX DMIC2", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic2",

		"DMIC3", "MIC BIAS3",

		"TX DMIC3", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic3",

		"TX_AIF1 CAP", "VA_MCLK",

		"TX_AIF2 CAP", "VA_MCLK",
@@ -147,8 +147,8 @@ 
		qcom,cdc-vdd-mic-bias-current = <25000>;



		qcom,cdc-static-supplies = "cdc-vdd-ldo-rxtx",

					   "cdc-vddpx-1";

		qcom,cdc-on-demand-supplies = "cdc-vdd-buck",

					   "cdc-vddpx-1",

					   "cdc-vdd-buck",

					   "cdc-vdd-mic-bias";

	};
@@ -236,7 +236,7 @@ 
		qcom,lpi-gpios;

	};



	qcom,wcd-dsp-glink {

	tavil_glink: qcom,wcd-dsp-glink {

		status = "disabled";

		compatible = "qcom,wcd-dsp-glink";

		qcom,wdsp-channels = "g_glink_ctrl",
@@ -312,6 +312,7 @@ 


	clock_audio: audio_ext_clk {

		status = "disabled";

		qcom,codec-ext-clk-src = <0>;

		compatible = "qcom,audio-ref-clk";

		pinctrl-names = "active", "sleep";

		pinctrl-0 = <&wcd934x_mclk_default>;

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

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ 


&slim_aud {

	status = "disabled";

	msm_dai_slim {

	dai_slim: msm_dai_slim {

		status = "disabled";

		compatible = "qcom,msm-dai-slim";

		elemental-addr = [ff ff ff fe 17 02];

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

+2 −2
Original line number Diff line number Diff line
@@ -56,11 +56,11 @@ 
	status = "okay";

};



&wdsp_mgr {

&tavil_wdsp {

	status = "okay";

};



&wdsp_glink {

&tavil_glink {

	status = "okay";

};

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

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


#include "sm6150.dtsi"

#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";