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

Commit 1eb4898e authored by Aditya Bavanari's avatar Aditya Bavanari
Browse files

ARM: dts: msm: Bringup changes for tasha codec on trinket 



Update cpe nodes, wsa device nodes, clocks and
gpio configuration to support audio on tasha codec
for trinket target.

Change-Id: I266d28a97b0dd1ea044d7b38bdda722b4693326e
Signed-off-by: default avatarAditya Bavanari <abavanar@codeaurora.org>
parent d8ccfa1e

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

+9 −4
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ 
		interrupt-controller;

		#interrupt-cells = <1>;

		interrupt-parent = <&tlmm>;

		qcom,gpio-connect = <&tlmm 118 0>;

		qcom,gpio-connect = <&tlmm 110 0>;

		pinctrl-names = "default";

		pinctrl-0 = <&wcd_intr_default>;

	};
@@ -368,6 +368,8 @@ 
		status = "disabled";

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

		#clock-cells = <1>;

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

		clock-names = "osr_clk";

		qcom,lpass-mclk-id = <0x116>;

		qcom,codec-mclk-clk-freq = <11289600>;

		qcom,audio-ref-clk-gpio = <&tlmm 112 0>;
@@ -379,12 +381,15 @@ 
	clock_audio: audio_ext_clk {

		status = "disabled";

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

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

		qcom,use-pinctrl = <1>;

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

		pinctrl-0 = <&tasha_mclk_default>;

		pinctrl-1 = <&tasha_mclk_default>;

		qcom,audio-ref-clk-gpio = <&pm6125_gpios 1 0>;

		clock-names = "osr_clk";

		clocks = <&pm6125_clkdiv>;

		pmic-clock-names = "pm6125_div_clk1";

		qcom,node_has_rpm_clock;

		#clock-cells = <1>;

	};
@@ -411,8 +416,8 @@ 
		qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;



		clock-names = "wcd_clk", "wcd_native_clk";

		clocks = <&clock_audio AUDIO_PMI_CLK>,

			 <&clock_audio_native AUDIO_LPASS_MCLK_1>;

		clocks = <&clock_audio 0>,

			 <&clock_audio_native 0>;



		qcom,cdc-micbias1-mv = <1800>;

		qcom,cdc-micbias2-mv = <1800>;
@@ -443,7 +448,7 @@ 
					   "cdc-buck-sido",

					   "cdc-vdd-tx-h",

					   "cdc-vdd-rx-h",

					   "cdc-vddpx-1";

					   "cdc-vddio-1";



		qcom,cdc-mclk-clk-rate = <9600000>;

		qcom,cdc-slim-ifd = "tasha-slim-ifd";

arch/arm64/boot/dts/qcom/trinket-pinctrl.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -715,12 +715,12 @@ 
		wcd9xxx_intr {

			wcd_intr_default: wcd_intr_default{

				mux {

					pins = "gpio118";

					pins = "gpio110";

					function = "gpio";

				};



				config {

					pins = "gpio118";

					pins = "gpio110";

					drive-strength = <2>; /* 2 mA */

					bias-pull-down; /* pull down */

					input-enable;
@@ -818,7 +818,7 @@ 
		audio_ref_clk_active: audio_ref_clk_active {

			mux {

				pins = "gpio112";

				function = "func2";

				function = "gpio";

			};



			config {
@@ -832,7 +832,7 @@ 
		audio_ref_clk_sleep: audio_ref_clk_sleep {

			mux {

				pins = "gpio112";

				function = "func2";

				function = "gpio";

			};



			config {

arch/arm64/boot/dts/qcom/trinket-tasha-codec-audio-overlay.dtsi

+40 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ 
	status = "disabled";

};



&wcd937x_rst_gpio{

	status = "disabled";

};



&cdc_dmic01_gpios {

	status = "disabled";

};
@@ -27,6 +31,42 @@ 
	status = "disabled";

};



&clock_audio_wsa_1 {

	status = "disabled";

};



&clock_audio_wsa_2 {

	status = "disabled";

};



&clock_audio_va {

	status = "disabled";

};



&clock_audio_rx_1 {

	status = "disabled";

};



&clock_audio_rx_2 {

	status = "disabled";

};



&clock_audio_tx_1 {

	status = "disabled";

};



&clock_audio_tx_2 {

	status = "disabled";

};



&wsa_spkr_en1 {

	status = "disabled";

};



&rx_swr_gpios {

	status = "disabled";

};



&slim_aud {

	status = "okay";

};

arch/arm64/boot/dts/qcom/trinket-tasha-codec.dtsi

+22 −8
Original line number Diff line number Diff line
@@ -13,20 +13,32 @@ 
#include <dt-bindings/sound/audio-codec-port-types.h>

#include "trinket-wcd.dtsi"



&soc {

	cpe: qcom,msm-cpe-lsm {

		compatible = "qcom,msm-cpe-lsm";

	};



	cpe3: qcom,msm-cpe-lsm@3 {

		compatible = "qcom,msm-cpe-lsm";

		qcom,msm-cpe-lsm-id = <3>;

	};

};



&sm6150_snd {

	qcom,model = "trinket-tashalite-snd-card";

	qcom,tasha_codec = <1>;

	asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,

		<&loopback>, <&compress>, <&hostless>,

		<&afe>, <&lsm>, <&routing>, <&compr>,

		<&pcm_noirq>;

		<&pcm_noirq>, <&cpe>, <&cpe3>;

	asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1",

		"msm-pcm-dsp.2", "msm-voip-dsp",

		"msm-pcm-voice", "msm-pcm-loopback",

		"msm-compress-dsp", "msm-pcm-hostless",

		"msm-pcm-afe", "msm-lsm-client",

		"msm-pcm-routing",

		"msm-compr-dsp", "msm-pcm-dsp-noirq";

		"msm-compr-dsp", "msm-pcm-dsp-noirq",

		"msm-cpe-lsm", "msm-cpe-lsm.3";

	asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>,

		<&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s4>,

		<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
@@ -108,10 +120,12 @@ 
	asoc-codec = <&stub_codec>;

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

	qcom,wsa-max-devs = <2>;

	qcom,wsa-devs = <&wsa881x_00211>, <&wsa881x_00212>,

		<&wsa881x_00213>, <&wsa881x_00214>;

	qcom,wsa-devs = <&wsa881x_70211>, <&wsa881x_70212>,

		<&wsa881x_70213>, <&wsa881x_70214>;

	qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",

		"SpkrLeft", "SpkrRight";

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&wcd9335>,

				<&q6core>;

};



&slim_aud {
@@ -127,25 +141,25 @@ 
				<6 SPKR_R_BOOST 0x3>, <7 SPKR_L_VI 0x3>,

				<8 SPKR_R_VI 0x3>;

			qcom,swr_master_id = <1>;

			wsa881x_00211: wsa881x@20170211 {

			wsa881x_70211: wsa881x@70211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-node = <&wsa_spk_wcd_sd1>;

			};



			wsa881x_00212: wsa881x@20170212 {

			wsa881x_70212: wsa881x@70212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-node = <&wsa_spk_wcd_sd2>;

			};



			wsa881x_00213: wsa881x@21170213 {

			wsa881x_70213: wsa881x@70213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-node = <&wsa_spk_wcd_sd1>;

			};



			wsa881x_00214: wsa881x@21170214 {

			wsa881x_70214: wsa881x@70214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-node = <&wsa_spk_wcd_sd2>;