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

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

Merge "ARM: dts: msm: Update micbias settings for lagoon CDP/MTP"

parents a576da7a 1bd7a97a

qcom/lagoon-audio-overlay.dtsi

+17 −17
Original line number Diff line number Diff line
@@ -233,14 +233,14 @@ 
		"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 DMIC0", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic0",

		"TX DMIC1", "MIC BIAS1",

		"MIC BIAS1", "Digital Mic1",

		"TX DMIC2", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic2",

		"TX DMIC3", "MIC BIAS3",

		"MIC BIAS3", "Digital Mic3",

		"TX DMIC4", "MIC BIAS4",

		"MIC BIAS4", "Digital Mic4",

		"TX DMIC5", "MIC BIAS4",
@@ -272,16 +272,16 @@ 
		"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 BIAS1", "Digital Mic0",

		"VA MIC BIAS1", "Digital Mic1",

		"VA MIC BIAS3", "Digital Mic2",

		"VA MIC BIAS3", "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 DMIC0", "VA MIC BIAS1",

		"VA DMIC1", "VA MIC BIAS1",

		"VA DMIC2", "VA MIC BIAS3",

		"VA DMIC3", "VA MIC BIAS3",

		"VA DMIC4", "VA MIC BIAS4",

		"VA DMIC5", "VA MIC BIAS4",

		"VA SWR_ADC0", "VA_SWR_CLK",
@@ -397,7 +397,7 @@ 
		pinctrl-1 = <&spkr_2_sd_n_sleep>;

	};



	wcd938x_rst_gpio: msm_cdc_pinctrl@57 {

	wcd938x_rst_gpio: msm_cdc_pinctrl@83 {

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

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

		pinctrl-0 = <&wcd938x_reset_active>;

qcom/lagoon-cdp.dtsi

+88 −0
Original line number Diff line number Diff line
@@ -5,6 +5,94 @@ 
&soc {

};



&lagoon_snd {

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

};



&ufsphy_mem {

	compatible = "qcom,ufs-phy-qmp-v3";