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

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

Merge "bindings: add audio device tree for lahaina"

parents 874cabba 2d6fb44c

qcom/lahaina-audio-overlay.dtsi

0 → 100644
+465 −0
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,audio-ext-clk.h>

#include <dt-bindings/sound/qcom,bolero-clk-rsc.h>

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

	bolero-clk-rsc-mngr {

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

		qcom,fs-gen-sequence = <0x3000 0x1>,

					<0x3004 0x1>, <0x3080 0x2>;

	qcom,rx_mclk_mode_muxsel = <0x033240D8>;

	qcom,wsa_mclk_mode_muxsel = <0x033220D8>;

	qcom,va_mclk_mode_muxsel = <0x033A0000>;

	clock-names = "tx_core_clk", "tx_npl_clk", "rx_core_clk", "rx_npl_clk",

		 "wsa_core_clk", "wsa_npl_clk", "va_core_clk", "va_npl_clk";

	clocks = <&clock_audio_tx_1 0>, <&clock_audio_tx_2 0>,

		<&clock_audio_rx_1 0>, <&clock_audio_rx_2 0>,

		<&clock_audio_wsa_1 0>, <&clock_audio_wsa_2 0>,

		<&clock_audio_va_1 0>, <&clock_audio_va_2 0>;

	};



	tx_macro: tx-macro@3220000 {

		compatible = "qcom,tx-macro";

		reg = <0x3220000 0x0>;

		clock-names = "tx_core_clk", "tx_npl_clk";

		clocks = <&clock_audio_tx_1 0>,

			 <&clock_audio_tx_2 0>;

		qcom,tx-swr-gpios = <&tx_swr_gpios>;

		qcom,tx-dmic-sample-rate = <2400000>;

		swr2: tx_swr_master {

			compatible = "qcom,swr-mstr";

			#address-cells = <2>;

			#size-cells = <0>;

			clock-names = "lpass_core_hw_vote",

					"lpass_audio_hw_vote";

			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			qcom,swr_master_id = <3>;

			qcom,mipi-sdw-block-packing-mode = <1>;

			swrm-io-base = <0x3230000 0x0>;

			interrupts-extended =

				<&intc GIC_SPI 297 IRQ_TYPE_LEVEL_HIGH>,

				<&pdc 109 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "swr_master_irq", "swr_wake_irq";

			qcom,swr-wakeup-required = <1>;

			qcom,swr-num-ports = <5>;

			qcom,swr-port-mapping = <1 PCM_OUT1 0xF>,

				<2 ADC1 0x1>, <2 ADC2 0x2>,

				<3 ADC3 0x1>, <3 ADC4 0x2>,

				<4 DMIC0 0x1>, <4 DMIC1 0x2>,

				<4 DMIC2 0x4>, <4 DMIC3 0x8>,

				<5 DMIC4 0x1>, <5 DMIC5 0x2>,

				<5 DMIC6 0x4>, <5 DMIC7 0x8>;

			qcom,swr-num-dev = <1>;

			qcom,swr-clock-stop-mode0 = <1>;

			qcom,swr-mstr-irq-wakeup-capable = <1>;

			wcd938x_tx_slave: wcd938x-tx-slave {

				compatible = "qcom,wcd938x-slave";

				reg = <0x0D 0x01170223>;

			};

		};

	};



	rx_macro: rx-macro@3200000 {

		compatible = "qcom,rx-macro";

		reg = <0x3200000 0x0>;

		clock-names = "rx_core_clk", "rx_npl_clk";

		clocks = <&clock_audio_rx_1 0>,

			 <&clock_audio_rx_2 0>;

		qcom,rx-swr-gpios = <&rx_swr_gpios>;

		qcom,rx_mclk_mode_muxsel = <0x033240D8>;

		qcom,rx-bcl-pmic-params = /bits/ 8 <0x00 0x04 0x3E>;

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

		swr1: rx_swr_master {

			compatible = "qcom,swr-mstr";

			#address-cells = <2>;

			#size-cells = <0>;

			clock-names = "lpass_core_hw_vote",

					"lpass_audio_hw_vote";

			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			qcom,swr_master_id = <2>;

			qcom,mipi-sdw-block-packing-mode = <1>;

			swrm-io-base = <0x3210000 0x0>;

			interrupts = <GIC_SPI 298 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "swr_master_irq";

			qcom,swr-num-ports = <5>;

			qcom,swr-port-mapping = <1 HPH_L 0x1>,

				<1 HPH_R 0x2>, <2 CLSH 0x1>,

				<3 COMP_L 0x1>, <3 COMP_R 0x2>,

				<4 LO 0x1>, <5 DSD_L 0x1>,

				<5 DSD_R 0x2>;

			qcom,swr-num-dev = <1>;

			qcom,swr-clock-stop-mode0 = <1>;

			wcd938x_rx_slave: wcd938x-rx-slave {

				compatible = "qcom,wcd938x-slave";

				reg = <0x0D 0x01170224>;

			};

		};

	};



	wsa_macro: wsa-macro@3240000 {

		compatible = "qcom,wsa-macro";

		reg = <0x3240000 0x0>;

		clock-names = "wsa_core_clk", "wsa_npl_clk";

		clocks = <&clock_audio_wsa_1 0>,

			 <&clock_audio_wsa_2 0>;

		qcom,wsa-swr-gpios = <&wsa_swr_gpios>;

		qcom,wsa-bcl-pmic-params = /bits/ 8 <0x00 0x04 0x3E>;

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

		swr0: wsa_swr_master {

			compatible = "qcom,swr-mstr";

			#address-cells = <2>;

			#size-cells = <0>;

			clock-names = "lpass_core_hw_vote",

					"lpass_audio_hw_vote";

			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			qcom,swr_master_id = <1>;

			qcom,mipi-sdw-block-packing-mode = <0>;

			swrm-io-base = <0x3250000 0x0>;

			interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "swr_master_irq";

			qcom,swr-num-ports = <8>;

			qcom,swr-port-mapping = <1 SPKR_L 0x1>,

				<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,

				<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,

				<6 SPKR_R_BOOST 0x3>, <7 SPKR_L_VI 0x3>,

				<8 SPKR_R_VI 0x3>;

			qcom,swr-num-dev = <2>;

			wsa881x_0211: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x10 0x20170211>;

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

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x10 0x20170212>;

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

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x10 0x21170213>;

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

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x10 0x21170214>;

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

				qcom,bolero-handle = <&bolero>;

			};

		};



	};



	wcd938x_codec: wcd938x-codec {

		compatible = "qcom,wcd938x-codec";

		qcom,split-codec = <1>;

		qcom,rx_swr_ch_map = <0 HPH_L 0x1 0 HPH_L>,

			<0 HPH_R 0x2 0 HPH_R>, <1 CLSH 0x1 0 CLSH>,

			<2 COMP_L 0x1 0 COMP_L>, <2 COMP_R 0x2 0 COMP_R>,

			<3 LO 0x1 0 LO>, <4 DSD_L 0x1 0 DSD_L>,

			<4 DSD_R 0x2 0 DSD_R>;

		qcom,tx_swr_ch_map = <0 ADC1 0x1 0 ADC1>,

			<0 ADC2 0x2 0 ADC2>, <1 ADC3 0x1 0 ADC3>,

			<1 ADC4 0x2 0 ADC4>, <2 DMIC0 0x1 0 DMIC0>,

			<2 DMIC1 0x2 0 DMIC1>, <2 MBHC 0x4 0 DMIC2>,

			<2 DMIC2 0x4 0 DMIC2>, <2 DMIC3 0x8 0 DMIC3>,

			<3 DMIC4 0x1 0 DMIC4>, <3 DMIC5 0x2 0 DMIC5>,

			<3 DMIC6 0x4 0 DMIC6>, <3 DMIC7 0x8 0 DMIC7>;



		qcom,wcd-rst-gpio-node = <&wcd938x_rst_gpio>;

		qcom,rx-slave = <&wcd938x_rx_slave>;

		qcom,tx-slave = <&wcd938x_tx_slave>;



		cdc-vdd-rxtx-supply = <&S4A>;

		qcom,cdc-vdd-rxtx-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rxtx-current = <30000>;



		cdc-vddio-supply = <&S4A>;

		qcom,cdc-vddio-voltage = <1800000 1800000>;

		qcom,cdc-vddio-current = <30000>;



		cdc-vdd-buck-supply = <&S4A>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-vdd-mic-bias-supply = <&BOB>;

		qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;

		qcom,cdc-vdd-mic-bias-current = <30000>;



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

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

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

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



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

					   "cdc-vddio",

					   "cdc-vdd-buck",

					   "cdc-vdd-mic-bias";

	};



};



&lahaina_snd {

	qcom,model = "lahaina-mtp-snd-card";

	qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;

	qcom,wcn-bt = <1>;

	qcom,ext-disp-audio-rx = <1>;

	qcom,audio-routing =

		"AMIC1", "MIC BIAS1",

		"MIC BIAS1", "Analog Mic1",

		"AMIC2", "MIC BIAS2",

		"MIC BIAS2", "Analog Mic2",

		"AMIC3", "MIC BIAS3",

		"MIC BIAS3", "Analog Mic3",

		"AMIC4", "MIC BIAS3",

		"MIC BIAS3", "Analog Mic4",

		"AMIC5", "MIC BIAS4",

		"MIC BIAS4", "Analog Mic5",

		"TX DMIC0", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic0",

		"TX DMIC1", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic1",

		"TX DMIC2", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic2",

		"TX DMIC3", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic3",

		"TX DMIC4", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic4",

		"TX DMIC5", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic5",

		"IN1_HPHL", "HPHL_OUT",

		"IN2_HPHR", "HPHR_OUT",

		"IN3_AUX", "AUX_OUT",

		"TX SWR_ADC0", "ADC1_OUTPUT",

		"TX SWR_ADC1", "ADC2_OUTPUT",

		"TX SWR_ADC2", "ADC3_OUTPUT",

		"TX SWR_ADC3", "ADC4_OUTPUT",

		"TX SWR_DMIC0", "DMIC1_OUTPUT",

		"TX SWR_DMIC1", "DMIC2_OUTPUT",

		"TX SWR_DMIC2", "DMIC3_OUTPUT",

		"TX SWR_DMIC3", "DMIC4_OUTPUT",

		"TX SWR_DMIC4", "DMIC5_OUTPUT",

		"TX SWR_DMIC5", "DMIC6_OUTPUT",

		"TX SWR_DMIC6", "DMIC7_OUTPUT",

		"TX SWR_DMIC7", "DMIC8_OUTPUT",

		"WSA SRC0_INP", "SRC0",

		"WSA_TX DEC0_INP", "TX DEC0 MUX",

		"WSA_TX DEC1_INP", "TX DEC1 MUX",

		"RX_TX DEC0_INP", "TX DEC0 MUX",

		"RX_TX DEC1_INP", "TX DEC1 MUX",

		"RX_TX DEC2_INP", "TX DEC2 MUX",

		"RX_TX DEC3_INP", "TX DEC3 MUX",

		"SpkrLeft IN", "WSA_SPK1 OUT",

		"SpkrRight IN", "WSA_SPK2 OUT",

		"VA_AIF1 CAP", "VA_SWR_CLK",

		"VA_AIF2 CAP", "VA_SWR_CLK",

		"VA_AIF3 CAP", "VA_SWR_CLK",

		"VA MIC BIAS3", "Digital Mic0",

		"VA MIC BIAS3", "Digital Mic1",

		"VA MIC BIAS1", "Digital Mic2",

		"VA MIC BIAS1", "Digital Mic3",

		"VA MIC BIAS4", "Digital Mic4",

		"VA MIC BIAS4", "Digital Mic5",

		"VA DMIC0", "VA MIC BIAS3",

		"VA DMIC1", "VA MIC BIAS3",

		"VA DMIC2", "VA MIC BIAS1",

		"VA DMIC3", "VA MIC BIAS1",

		"VA DMIC4", "VA MIC BIAS4",

		"VA DMIC5", "VA MIC BIAS4",

		"VA SWR_ADC0", "VA_SWR_CLK",

		"VA SWR_ADC1", "VA_SWR_CLK",

		"VA SWR_ADC2", "VA_SWR_CLK",

		"VA SWR_ADC3", "VA_SWR_CLK",

		"VA SWR_MIC0", "VA_SWR_CLK",

		"VA SWR_MIC1", "VA_SWR_CLK",

		"VA SWR_MIC2", "VA_SWR_CLK",

		"VA SWR_MIC3", "VA_SWR_CLK",

		"VA SWR_MIC4", "VA_SWR_CLK",

		"VA SWR_MIC5", "VA_SWR_CLK",

		"VA SWR_MIC6", "VA_SWR_CLK",

		"VA SWR_MIC7", "VA_SWR_CLK",

		"VA SWR_ADC0", "ADC1_OUTPUT",

		"VA SWR_ADC1", "ADC2_OUTPUT",

		"VA SWR_ADC2", "ADC3_OUTPUT",

		"VA SWR_ADC3", "ADC4_OUTPUT",

		"VA SWR_MIC0", "DMIC1_OUTPUT",

		"VA SWR_MIC1", "DMIC2_OUTPUT",

		"VA SWR_MIC2", "DMIC3_OUTPUT",

		"VA SWR_MIC3", "DMIC4_OUTPUT",

		"VA SWR_MIC4", "DMIC5_OUTPUT",

		"VA SWR_MIC5", "DMIC6_OUTPUT",

		"VA SWR_MIC6", "DMIC7_OUTPUT",

		"VA SWR_MIC7", "DMIC8_OUTPUT";

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

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

	qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

	qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;

	qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;

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

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

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

	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,codec-max-aux-devs = <1>;

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

	qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,

				  <&bolero>;

};



&q6core {

	cdc_dmic01_gpios: cdc_dmic01_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic01_clk_active &cdc_dmic01_data_active>;

		pinctrl-1 = <&cdc_dmic01_clk_sleep &cdc_dmic01_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic23_gpios: cdc_dmic23_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic23_clk_active &cdc_dmic23_data_active>;

		pinctrl-1 = <&cdc_dmic23_clk_sleep &cdc_dmic23_data_sleep>;

		qcom,lpi-gpios;

	};



	cdc_dmic45_gpios: cdc_dmic45_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&cdc_dmic45_clk_active &cdc_dmic45_data_active>;

		pinctrl-1 = <&cdc_dmic45_clk_sleep &cdc_dmic45_data_sleep>;

		qcom,lpi-gpios;

		qcom,tlmm-gpio = <158>;

	};



	wsa_swr_gpios: wsa_swr_clk_data_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&wsa_swr_clk_active &wsa_swr_data_active>;

		pinctrl-1 = <&wsa_swr_clk_sleep &wsa_swr_data_sleep>;

		qcom,lpi-gpios;

	};



	rx_swr_gpios: rx_swr_clk_data_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&rx_swr_clk_active &rx_swr_data_active

				&rx_swr_data1_active>;

		pinctrl-1 = <&rx_swr_clk_sleep &rx_swr_data_sleep

				&rx_swr_data1_sleep>;

		qcom,lpi-gpios;

	};



	tx_swr_gpios: tx_swr_clk_data_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&tx_swr_clk_active &tx_swr_data1_active

			    &tx_swr_data2_active>;

		pinctrl-1 = <&tx_swr_clk_sleep &tx_swr_data1_sleep

			    &tx_swr_data2_sleep>;

		qcom,lpi-gpios;

		qcom,tlmm-gpio = <147>;

	};

};



&soc {

	wsa_spkr_en1: wsa_spkr_en1_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&spkr_1_sd_n_active>;

		pinctrl-1 = <&spkr_1_sd_n_sleep>;

	};



	wsa_spkr_en2: wsa_spkr_en2_pinctrl {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&spkr_2_sd_n_active>;

		pinctrl-1 = <&spkr_2_sd_n_sleep>;

	};



	wcd938x_rst_gpio: msm_cdc_pinctrl@32 {

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

		pinctrl-names = "aud_active", "aud_sleep";

		pinctrl-0 = <&wcd938x_reset_active>;

		pinctrl-1 = <&wcd938x_reset_sleep>;

	};



	clock_audio_wsa_1: wsa_core_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x309>;

		#clock-cells = <1>;

	};



	clock_audio_wsa_2: wsa_npl_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x30A>;

		#clock-cells = <1>;

	};



	clock_audio_rx_1: rx_core_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <22579200>;

		qcom,codec-lpass-clk-id = <0x30E>;

		#clock-cells = <1>;

	};



	clock_audio_rx_2: rx_npl_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <22579200>;

		qcom,codec-lpass-clk-id = <0x30F>;

		#clock-cells = <1>;

	};



	clock_audio_tx_1: tx_core_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x30C>;

		#clock-cells = <1>;

	};



	clock_audio_tx_2: tx_npl_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x30D>;

		#clock-cells = <1>;

	};



	clock_audio_va_1: va_core_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x30B>;

		#clock-cells = <1>;

	};



	clock_audio_va_2: va_npl_clk {

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

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

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x310>;

		#clock-cells = <1>;

	};

};

qcom/lahaina-audio.dtsi

0 → 100644
+162 −0
Original line number Diff line number Diff line 
#include <dt-bindings/clock/qcom,audio-ext-clk.h>

#include "msm-audio-lpass.dtsi"



&msm_audio_ion {

	iommus = <&apps_smmu 0x1801 0x0>;

	qcom,smmu-sid-mask = /bits/ 64 <0xf>;

};



&audio_apr {

	q6core: qcom,q6core-audio {

		compatible = "qcom,q6core-audio";



		lpass_core_hw_vote: vote_lpass_core_hw {

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

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

			#clock-cells = <1>;

		};



		lpass_audio_hw_vote: vote_lpass_audio_hw {

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

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

			#clock-cells = <1>;

		};



		bolero: bolero-cdc {

			compatible = "qcom,bolero-codec";

			clock-names = "lpass_core_hw_vote",

					"lpass_audio_hw_vote";

			clocks = <&lpass_core_hw_vote 0>,

					<&lpass_audio_hw_vote 0>;

			bolero-clk-rsc-mngr {

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

			};



			tx_macro: tx-macro@3220000 {

				swr2: tx_swr_master {

				};

			};



			rx_macro: rx-macro@3200000 {

				swr1: rx_swr_master {

				};

			};



			wsa_macro: wsa-macro@3240000 {

				swr0: wsa_swr_master {

				};

			};

		};

	};

};



&q6core {

	lahaina_snd: sound {

		compatible = "qcom,lahaina-asoc-snd";

		qcom,mi2s-audio-intf = <1>;

		qcom,auxpcm-audio-intf = <1>;

		qcom,wcn-bt = <0>;

		qcom,ext-disp-audio-rx = <0>;

		qcom,afe-rxtx-lb = <0>;



		clock-names = "lpass_audio_hw_vote";

		clocks = <&lpass_audio_hw_vote 0>;



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

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

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

				<&pcm_noirq>;

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

		asoc-cpu = <&dai_dp>, <&dai_dp1>,

				<&dai_mi2s0>, <&dai_mi2s1>,

				<&dai_mi2s2>, <&dai_mi2s3>,

				<&dai_mi2s4>, <&dai_mi2s5>, <&dai_pri_auxpcm>,

				<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,

				<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,

				<&dai_sen_auxpcm>,

				<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>,

				<&afe_proxy_tx>, <&incall_record_rx>,

				<&incall_record_tx>, <&incall_music_rx>,

				<&incall_music_2_rx>,

				<&usb_audio_rx>, <&usb_audio_tx>,

				<&sb_7_rx>, <&sb_7_tx>,

				<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,

				<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,

				<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,

				<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,

				<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,

				<&dai_sen_tdm_rx_0>, <&dai_sen_tdm_tx_0>,

				<&wsa_cdc_dma_0_rx>, <&wsa_cdc_dma_0_tx>,

				<&wsa_cdc_dma_1_rx>, <&wsa_cdc_dma_1_tx>,

				<&wsa_cdc_dma_2_tx>,

				<&va_cdc_dma_0_tx>, <&va_cdc_dma_1_tx>,

				<&va_cdc_dma_2_tx>,

				<&rx_cdc_dma_0_rx>, <&tx_cdc_dma_0_tx>,

				<&rx_cdc_dma_1_rx>, <&tx_cdc_dma_1_tx>,

				<&rx_cdc_dma_2_rx>, <&tx_cdc_dma_2_tx>,

				<&rx_cdc_dma_3_rx>, <&tx_cdc_dma_3_tx>,

				<&rx_cdc_dma_4_rx>, <&tx_cdc_dma_4_tx>,

				<&rx_cdc_dma_5_rx>, <&tx_cdc_dma_5_tx>,

				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>,

				<&afe_loopback_tx>;

		asoc-cpu-names = "msm-dai-q6-dp.0", "msm-dai-q6-dp.1",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",

				"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",

				"msm-dai-q6-auxpcm.1",

				"msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3",

				"msm-dai-q6-auxpcm.4", "msm-dai-q6-auxpcm.5",

				"msm-dai-q6-auxpcm.6", "msm-dai-q6-dev.224",

				"msm-dai-q6-dev.225", "msm-dai-q6-dev.241",

				"msm-dai-q6-dev.240", "msm-dai-q6-dev.32771",

				"msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773",

				"msm-dai-q6-dev.32770",

				"msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673",

				"msm-dai-q6-dev.16398", "msm-dai-q6-dev.16399",

				"msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865",

				"msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881",

				"msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897",

				"msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913",

				"msm-dai-q6-tdm.36928", "msm-dai-q6-tdm.36929",

				"msm-dai-q6-tdm.36944", "msm-dai-q6-tdm.36945",

				"msm-dai-cdc-dma-dev.45056",

				"msm-dai-cdc-dma-dev.45057",

				"msm-dai-cdc-dma-dev.45058",

				"msm-dai-cdc-dma-dev.45059",

				"msm-dai-cdc-dma-dev.45061",

				"msm-dai-cdc-dma-dev.45089",

				"msm-dai-cdc-dma-dev.45091",

				"msm-dai-cdc-dma-dev.45093",

				"msm-dai-cdc-dma-dev.45104",

				"msm-dai-cdc-dma-dev.45105",

				"msm-dai-cdc-dma-dev.45106",

				"msm-dai-cdc-dma-dev.45107",

				"msm-dai-cdc-dma-dev.45108",

				"msm-dai-cdc-dma-dev.45109",

				"msm-dai-cdc-dma-dev.45110",

				"msm-dai-cdc-dma-dev.45111",

				"msm-dai-cdc-dma-dev.45112",

				"msm-dai-cdc-dma-dev.45113",

				"msm-dai-cdc-dma-dev.45114",

				"msm-dai-cdc-dma-dev.45115",

				"msm-dai-cdc-dma-dev.45116",

				"msm-dai-cdc-dma-dev.45118",

				"msm-dai-q6-dev.24577";

		fsa4480-i2c-handle = <&fsa4480>;

	};

};



&qupv3_se15_i2c {

	status = "ok";

	fsa4480: fsa4480@43 {

		compatible = "qcom,fsa4480-i2c";

		reg = <0x43>;

	};

};

qcom/lahaina-lpi.dtsi

0 → 100644
+1677 −0

File added.

Preview size limit exceeded, changes collapsed.

qcom/lahaina-va-bolero.dtsi

0 → 100644
+19 −0
Original line number Diff line number Diff line 
&bolero {

	va_macro: va-macro@3370000 {

		compatible = "qcom,va-macro";

		reg = <0x3370000 0x0>;

		clock-names = "lpass_audio_hw_vote";

		clocks = <&lpass_audio_hw_vote 0>;

		va-vdd-micb-supply = <&S4A>;

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

	};

};



&va_cdc_dma_0_tx {

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

};

qcom/lahaina.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2872,6 +2872,7 @@ 
#include "lahaina-coresight.dtsi"

#include "lahaina-pm.dtsi"

#include "lahaina-qupv3.dtsi"

#include "lahaina-audio.dtsi"

#include "lahaina-vidc.dtsi"

#include "lahaina-cvp.dtsi"

#include "lahaina-pcie.dtsi"