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

Commit 70654b96 authored by Sudheer Papothi's avatar Sudheer Papothi
Browse files

ARM: dts: msm: Update changes for audio device tree on Lahaina 

Update changes for audio device tree on Lahaina.

Change-Id: If52eb0d3451626c62f6afb565c6112ebf2475692
parent d03820b8

qcom/lahaina-audio-overlay.dtsi

+26 −9
Original line number Diff line number Diff line
@@ -3,10 +3,12 @@ 
#include <dt-bindings/sound/audio-codec-port-types.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "lahaina-lpi.dtsi"

#include "lahaina-va-bolero.dtsi"



&bolero {

	qcom,num-macros = <4>;

	qcom,bolero-version = <4>;

	#address-cells = <1>;

	#size-cells = <1>;

	bolero-clk-rsc-mngr {

		compatible = "qcom,bolero-clk-rsc-mngr";

		qcom,fs-gen-sequence = <0x3000 0x1>,
@@ -22,6 +24,20 @@ 
		<&clock_audio_va_1 0>, <&clock_audio_va_2 0>;

	};



	va_macro: va-macro@3370000 {

		compatible = "qcom,va-macro";

		reg = <0x3370000 0x0>;

		clock-names = "lpass_audio_hw_vote";

		clocks = <&lpass_audio_hw_vote 0>;

		qcom,va-vdd-micb-voltage = <1800000 1800000>;

		qcom,va-vdd-micb-current = <11200>;

		qcom,va-dmic-sample-rate = <600000>;

		qcom,va-clk-mux-select = <1>;

		qcom,va-island-mode-muxsel = <0x033A0000>;

		qcom,default-clk-id = <TX_CORE_CLK>;

		qcom,is-used-swr-gpio = <0>;

	};



	tx_macro: tx-macro@3220000 {

		compatible = "qcom,tx-macro";

		reg = <0x3220000 0x0>;
@@ -169,7 +185,7 @@ 
			qcom,swr-num-dev = <2>;

			wsa883x_0221: wsa883x@02170221 {

				compatible = "qcom,wsa883x";

				reg = <0x02 0x02170221>;

				reg = <0x2 0x2170221>;

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

				qcom,bolero-handle = <&bolero>;
@@ -181,7 +197,7 @@ 


			wsa883x_0222: wsa883x@02170222 {

				compatible = "qcom,wsa883x";

				reg = <0x02 0x02170222>;

				reg = <0x2 0x2170222>;

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

				qcom,bolero-handle = <&bolero>;
@@ -318,18 +334,15 @@ 
		"Digital Mic5", "VA MIC BIAS4";

	qcom,msm-mbhc-hphl-swh = <1>;

	qcom,msm-mbhc-gnd-swh = <1>;

	asoc-codec  = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>,

	asoc-codec  = <&stub_codec>, <&bolero>,

		      <&swr_dmic_01>, <&swr_dmic_02>,

		      <&swr_dmic_03>, <&swr_dmic_04>;

	asoc-codec-names = "msm-stub-codec.1", "bolero_codec",

			   "msm-ext-disp-audio-codec-rx",

			   "swr-dmic-01", "swr-dmic-02",

			   "swr-dmic-03", "swr-dmic-04";

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

	qcom,wsa-devs = <&wsa881x_0211>, <&wsa881x_0212>,

			<&wsa881x_0213>, <&wsa881x_0214>;

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

				  "SpkrLeft", "SpkrRight";

	qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>;

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

	qcom,codec-max-aux-devs = <1>;

	qcom,codec-aux-devs = <&wcd938x_codec>;

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
@@ -367,6 +380,10 @@ 
	};

};



&va_cdc_dma_0_tx {

	qcom,msm-dai-is-island-supported = <1>;

};



&soc {

	wsa_spkr_en1: wsa_spkr_en1_pinctrl {

		compatible = "qcom,msm-cdc-pinctrl";

qcom/lahaina-audio.dtsi

+31 −2
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@ 
&audio_apr {

	q6core: qcom,q6core-audio {

		compatible = "qcom,q6core-audio";



		#address-cells = <1>;

		#size-cells = <1>;

		lpass_core_hw_vote: vote_lpass_core_hw {

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

			qcom,codec-ext-clk-src = <AUDIO_LPASS_CORE_HW_VOTE>;
@@ -22,6 +23,34 @@ 
			#clock-cells = <1>;

		};



		lpi_tlmm: lpi_pinctrl@33c0000 {

			compatible = "qcom,lpi-pinctrl";

			reg = <0x33c0000 0x0>;

			qcom,slew-reg = <0x355a000 0x0>;

			qcom,num-gpios = <15>;

			gpio-controller;

			#gpio-cells = <2>;

			qcom,lpi-offset-tbl = <0x00000000>, <0x00001000>,

					      <0x00002000>, <0x00003000>,

					      <0x00004000>, <0x00005000>,

					      <0x00006000>, <0x00007000>,

					      <0x00008000>, <0x00009000>,

					      <0x0000A000>, <0x0000B000>,

					      <0x0000C000>, <0x0000D000>,

					      <0x0000E000>;

			qcom,lpi-slew-offset-tbl = <0x00000000>, <0x00000002>,

						   <0x00000004>, <0x00000008>,

						   <0x0000000A>, <0x0000000C>,

						   <0x00000000>, <0x00000000>,

						   <0x00000000>, <0x00000000>,

						   <0x00000010>, <0x00000012>,

						   <0x00000000>, <0x00000000>,

						   <0x00000006>;



			clock-names = "lpass_core_hw_vote";

			clocks = <&lpass_core_hw_vote 0>;

		};



		bolero: bolero-cdc {

			compatible = "qcom,bolero-codec";

			clock-names = "lpass_core_hw_vote",
@@ -152,7 +181,7 @@ 
	};

};



&qupv3_se15_i2c {

&qupv3_se13_i2c {

	status = "ok";

	fsa4480: fsa4480@43 {

		compatible = "qcom,fsa4480-i2c";

qcom/lahaina-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/input/input.h>



#include "lahaina-pmic-overlay.dtsi"

#include "lahaina-audio-overlay.dtsi"



&spmi_debug_bus {

	status = "ok";

qcom/lahaina-lpi.dtsi

+1452 −1480
Original line number Diff line number Diff line 
&q6core {

	lpi_tlmm: lpi_pinctrl@33c0000 {

		compatible = "qcom,lpi-pinctrl";

		reg = <0x33c0000 0x0>;

		qcom,slew-reg = <0x355a000 0x0>;

		qcom,num-gpios = <15>;

		gpio-controller;

		#gpio-cells = <2>;

		qcom,lpi-offset-tbl = <0x00000000>, <0x00001000>,

				      <0x00002000>, <0x00003000>,

				      <0x00004000>, <0x00005000>,

				      <0x00006000>, <0x00007000>,

				      <0x00008000>, <0x00009000>,

				      <0x0000A000>, <0x0000B000>,

				      <0x0000C000>, <0x0000D000>,

				      <0x0000E000>;

		qcom,lpi-slew-offset-tbl = <0x00000000>, <0x00000002>,

					   <0x00000004>, <0x00000008>,

					   <0x0000000A>, <0x0000000C>,

					   <0x00000000>, <0x00000000>,

					   <0x00000000>, <0x00000000>,

					   <0x00000010>, <0x00000012>,

					   <0x00000000>, <0x00000000>,

					   <0x00000006>;



		clock-names = "lpass_core_hw_vote";

		clocks = <&lpass_core_hw_vote 0>;



&lpi_tlmm {

	quat_mi2s_sck {

		quat_mi2s_sck_sleep: quat_mi2s_sck_sleep {

			mux {
@@ -1704,4 +1677,3 @@ 
		};

	};

};
 
};

qcom/lahaina-mtp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <dt-bindings/input/input.h>



#include "lahaina-pmic-overlay.dtsi"

#include "lahaina-audio-overlay.dtsi"



&spmi_debug_bus {

	status = "ok";