Merge 2169e88bbb on remote branch

Change-Id: Ice9993bb4998fdc0f347da4f46d6cb8bdc3644a0
This commit is contained in:
Linux Build Service Account
2022-08-11 14:53:54 -07:00
6 changed files with 97 additions and 15 deletions

3
Kbuild Executable file → Normal file
View File

@@ -9,7 +9,8 @@ dtbo-y += kalama-audio.dtbo \
kalama-audio-atp.dtbo \
kalama-audio-rcm.dtbo \
kalama-audio-rumi.dtbo \
kalama-audio-hdk.dtbo
kalama-audio-hdk.dtbo \
kalama-audio-hhg.dtbo
endif
ifeq ($(CONFIG_ARCH_SA8155), y)

View File

@@ -1,11 +1,11 @@
#include "kalama-audio-overlay.dtsi"
&lpass_cdc {
qcom,num-macros = <5>;
qcom,num-macros = <4>;
};
&wsa2_macro {
status = "ok";
status = "disabled";
};
&swr_dmic_01 {
@@ -72,19 +72,14 @@
"IN3_AUX", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"WSA SRC0_INP", "SRC0",
"WSA2 SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",
"WSA2_TX DEC0_INP", "TX DEC0 MUX",
"WSA2_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",
"Spkr2Left IN", "WSA2_SPK1 OUT",
"Spkr2Right IN", "WSA2_SPK2 OUT",
"TX SWR_INPUT", "WCD_TX_OUTPUT",
"VA SWR_INPUT", "VA_SWR_CLK",
"VA SWR_INPUT", "WCD_TX_OUTPUT",
@@ -110,13 +105,11 @@
qcom,cdc-dmic67-gpios = <&cdc_dmic67_gpios>;
asoc-codec = <&stub_codec>, <&lpass_cdc>,
<&wcd938x_codec>, <&swr_haptics>,
<&wsa884x_0220>, <&wsa884x_0221>,
<&wsa884x_2_0220>, <&wsa884x_2_0221>;
<&wsa884x_0220>, <&wsa884x_0221>;
asoc-codec-names = "msm-stub-codec.1", "lpass-cdc",
"wcd938x_codec", "swr-haptics",
"wsa-codec1", "wsa-codec2",
"wsa-codec3", "wsa-codec4";
qcom,wsa-max-devs = <4>;
"wsa-codec1", "wsa-codec2";
qcom,wsa-max-devs = <2>;
qcom,sec-mi2s-gpios = <&fm_i2s1_gpios>;
};

View File

@@ -24,7 +24,7 @@
};
&kalama_snd {
qcom,model = "kalama-hdk-snd-card";
qcom,model = "kalama-qrd-snd-card";
qcom,audio-routing =
"AMIC1", "Analog Mic1",

10
kalama-audio-hhg.dts Normal file
View File

@@ -0,0 +1,10 @@
/dts-v1/;
/plugin/;
#include "kalama-audio-hhg.dtsi"
/ {
model = "Qualcomm Technologies, Inc. KalamaP HHG";
compatible = "qcom,kalamap-hhg", "qcom,kalamap", "qcom,hhg";
qcom,msm-id = <536 0x10000>, <536 0x20000>;
qcom,board-id = <0x1001f 0x1>;
};

71
kalama-audio-hhg.dtsi Normal file
View File

@@ -0,0 +1,71 @@
#include "kalama-audio-overlay.dtsi"
&tx_swr_clk_active {
config {
drive-strength = <2>;
};
};
&tx_swr_data0_active {
config {
drive-strength = <2>;
};
};
&tx_swr_data1_active {
config {
drive-strength = <2>;
};
};
&tx_swr_data2_active {
config {
drive-strength = <2>;
};
};
&kalama_snd {
qcom,model = "kalama-grd-snd-card";
qcom,audio-routing =
"AMIC1", "Analog Mic1",
"AMIC1", "MIC BIAS1",
"AMIC2", "Analog Mic2",
"AMIC2", "MIC BIAS2",
"AMIC3", "Analog Mic3",
"AMIC3", "MIC BIAS3",
"AMIC4", "Analog Mic4",
"AMIC4", "MIC BIAS3",
"AMIC5", "Analog Mic5",
"AMIC5", "MIC BIAS4",
"VA AMIC1", "Analog Mic1",
"VA AMIC1", "VA MIC BIAS1",
"VA AMIC2", "Analog Mic2",
"VA AMIC2", "VA MIC BIAS2",
"VA AMIC3", "Analog Mic3",
"VA AMIC3", "VA MIC BIAS3",
"VA AMIC4", "Analog Mic4",
"VA AMIC4", "VA MIC BIAS3",
"VA AMIC5", "Analog Mic5",
"VA AMIC5", "VA MIC BIAS4",
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"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",
"TX SWR_INPUT", "WCD_TX_OUTPUT",
"VA SWR_INPUT", "VA_SWR_CLK",
"VA SWR_INPUT", "WCD_TX_OUTPUT",
"VA_AIF1 CAP", "VA_SWR_CLK",
"VA_AIF2 CAP", "VA_SWR_CLK",
"VA_AIF3 CAP", "VA_SWR_CLK";
};

View File

@@ -219,6 +219,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "SpkrLeft";
};
@@ -237,6 +238,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "SpkrRight";
};
@@ -294,6 +296,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "Spkr2Left";
};
@@ -312,6 +315,7 @@
cdc-vdd-1p8-supply = <&L15B>;
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-vdd-1p8-lpm-supported = <1>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
sound-name-prefix = "Spkr2Right";
};
@@ -354,14 +358,17 @@
cdc-vdd-rxtx-supply = <&L15B>;
qcom,cdc-vdd-rxtx-voltage = <1800000 1800000>;
qcom,cdc-vdd-rxtx-current = <30000>;
qcom,cdc-vdd-rxtx-lpm-supported = <1>;
cdc-vddio-supply = <&L15B>;
qcom,cdc-vddio-voltage = <1800000 1800000>;
qcom,cdc-vddio-current = <30000>;
qcom,cdc-vddio-lpm-supported = <1>;
cdc-vdd-buck-supply = <&L15B>;
qcom,cdc-vdd-buck-voltage = <1800000 1800000>;
qcom,cdc-vdd-buck-current = <650000>;
qcom,cdc-vdd-buck-lpm-supported = <1>;
cdc-vdd-mic-bias-supply = <&BOB1>;
qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>;
@@ -374,8 +381,8 @@
qcom,cdc-static-supplies = "cdc-vdd-rxtx",
"cdc-vddio",
"cdc-vdd-buck",
"cdc-vdd-mic-bias";
qcom,cdc-on-demand-supplies = "cdc-vdd-buck";
};
};