A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ARM: dts: qcom: use spkr_1 for holi QRD"

Browse source
This commit is contained in:
qctecmdr 2020-07-29 01:14:00 -07:00 • committed by Gerrit - the friendly Code Review server
commit b72b6430be
6 changed files with 133 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qcom/holi-audio-overlay.dtsi
View file

@ -41,8 +41,8 @@
qcom,mipi-sdw-block-packing-mode = <1>;
swrm-io-base = <0xA740000 0x0>;
interrupts-extended =
<&intc GIC_SPI 296 IRQ_TYPE_LEVEL_HIGH>,
<&intc GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
<&wakegic 5 IRQ_TYPE_LEVEL_HIGH>,
<&wakegic 66 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "swr_master_irq", "swr_wake_irq";
qcom,swr-num-ports = <3>;
qcom,swr-port-mapping = <1 SWRM_TX1_CH1 0x1>,
@ -214,7 +214,7 @@
cdc-vdd-mic-bias-supply = <&BOB>;
qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
qcom,cdc-vdd-mic-bias-current = <i45000>;
qcom,cdc-vdd-mic-bias-current = <45000>;
qcom,cdc-micbias1-mv = <1800>;
qcom,cdc-micbias2-mv = <1800>;
@ -272,7 +272,7 @@
"VA DMIC0", "VA MIC BIAS1",
"VA DMIC1", "VA MIC BIAS1",
"VA DMIC2", "VA MIC BIAS3",
"VA DMIC3", "VA MIC BIAS3",
"VA DMIC3", "VA MIC BIAS3";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;

5
qcom/holi-cdp-overlay.dts
View file

@ -9,3 +9,8 @@
qcom,msm-id = <454 0x10000>;
qcom,board-id = <1 0>;
};
&wsa881x_analog_reset_gpio {
pinctrl-0 = <&spkr_1_sd_n_active>;
pinctrl-1 = <&spkr_1_sd_n_sleep>;
};

1
qcom/holi-cdp.dtsi
View file

@ -1,3 +1,4 @@
#include "holi-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v3";

7
qcom/holi-mtp-usbc.dtsi
View file

@ -1,3 +1,4 @@
#include "holi-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v3";
@ -29,3 +30,9 @@
status = "ok"
};
&holi_snd {
qcom,msm-mbhc-usbc-audio-supported = <1>;
qcom,msm-mbhc-hphl-swh = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
};

1
qcom/holi-mtp.dtsi
View file

@ -1,3 +1,4 @@
#include "holi-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v3";

115
qcom/holi-qrd.dtsi
View file

@ -1,3 +1,4 @@
#include "holi-audio-overlay.dtsi"
&ufsphy_mem {
compatible = "qcom,ufs-phy-qmp-v3";
@ -29,3 +30,117 @@
status = "ok"
};
&wsa881x_analog_reset_gpio {
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>;
};
&wsa881x_i2c_e {
compatible = "qcom,wsa881x-i2c-codec";
reg = <0x0e>;
clock-names = "wsa_mclk";
clocks = <&wsa881x_analog_clk 0>;
qcom,wsa-analog-clk-gpio = <&wsa881x_analog_clk_gpio>;
qcom,wsa-analog-reset-gpio = <&wsa881x_analog_reset_gpio>;
};
&wsa881x_i2c_e {
status = "ok"
};
&holi_snd {
qcom,model = "holi-qrd-snd-card";
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;
qcom,wcn-btfm = <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 BIAS1",
"MIC BIAS1", "Analog Mic4",
"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_ADC2", "ADC2_OUTPUT",
"TX SWR_ADC3", "ADC3_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",
"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_ADC2", "ADC2_OUTPUT",
"VA SWR_ADC3", "ADC3_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 = <0>;
qcom,msm-mbhc-gnd-swh = <0>;
qcom,wsa-devs = <&wsa881x_i2c_e>;
qcom,wsa-aux-dev-prefix = "SpkrLeft";
qcom,codec-aux-devs = <&wcd937x_codec>;
qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>,
<&lpi_tlmm>, <&bolero>;
};