Merge "ARM: dts: msm: update swr-num-devs and swrm-io-base"

This commit is contained in:
QCTECMDR Service
2024-12-30 08:01:24 -08:00
committed by Gerrit - the friendly Code Review server
2 changed files with 6 additions and 7 deletions

View File

@@ -59,6 +59,7 @@
}; };
&swr0 { &swr0 {
qcom,swr-num-dev = <2>;
wsa884x_0220: wsa884x@02170220 { wsa884x_0220: wsa884x@02170220 {
status = "okay"; status = "okay";
}; };
@@ -68,6 +69,10 @@
}; };
}; };
&swr1 {
qcom,swr-num-dev = <2>;
};
&kera_snd { &kera_snd {
qcom,model = "kera-cdp-snd-card"; qcom,model = "kera-cdp-snd-card";
swr-haptics-unsupported; swr-haptics-unsupported;
@@ -79,7 +84,6 @@
"AMIC3", "Analog Mic3", "AMIC3", "Analog Mic3",
"AMIC3", "MIC BIAS3", "AMIC3", "MIC BIAS3",
"AMIC4", "Analog Mic4", "AMIC4", "Analog Mic4",
"AMIC4", "MIC BIAS4",
"VA AMIC1", "Analog Mic1", "VA AMIC1", "Analog Mic1",
"VA AMIC1", "VA MIC BIAS1", "VA AMIC1", "VA MIC BIAS1",
"VA AMIC2", "Analog Mic2", "VA AMIC2", "Analog Mic2",
@@ -87,7 +91,6 @@
"VA AMIC3", "Analog Mic3", "VA AMIC3", "Analog Mic3",
"VA AMIC3", "VA MIC BIAS3", "VA AMIC3", "VA MIC BIAS3",
"VA AMIC4", "Analog Mic4", "VA AMIC4", "Analog Mic4",
"VA AMIC4", "VA MIC BIAS4",
"TX DMIC0", "Digital Mic0", "TX DMIC0", "Digital Mic0",
"TX DMIC0", "MIC BIAS3", "TX DMIC0", "MIC BIAS3",
"TX DMIC1", "Digital Mic1", "TX DMIC1", "Digital Mic1",

View File

@@ -25,13 +25,9 @@
}; };
&swr2 { &swr2 {
reg = <0x7630000 0x0>; swrm-io-base = <0x7630000 0x0>;
}; };
&va_macro { &va_macro {
reg = <0x7660000 0x0>; reg = <0x7660000 0x0>;
}; };
&tlmm {
reg = <0x7760000 0x0>;
};