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 00:24:41 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "ARM: dts: msm: Enable btfm for shima"

Browse source
This commit is contained in:
qctecmdr 2020-08-31 03:20:21 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0f0e94315c
5 changed files with 25 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qcom/shima-audio-overlay.dtsi
View file

@ -244,7 +244,9 @@
&shima_snd {
qcom,model = "lahaina-shimaidp-snd-card";
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;
qcom,wcn-btfm = <0>;
qcom,wcn-bt = <1>;
qcom,tdm-max-slots = <8>;
qcom,wcd-disabled = <0>;
qcom,ext-disp-audio-rx = <0>;
qcom,audio-routing =
"AMIC1", "Analog Mic1",

2
qcom/shima-audio.dtsi
View file

@ -152,7 +152,7 @@
&q6core {
shima_snd: sound {
compatible = "qcom,lahaina-asoc-snd";
qcom,mi2s-audio-intf = <0>;
qcom,mi2s-audio-intf = <1>;
qcom,auxpcm-audio-intf = <1>;
qcom,wcn-bt = <0>;
qcom,ext-disp-audio-rx = <0>;

9
qcom/shima-idp.dtsi
View file

@ -183,4 +183,13 @@
};
};
&dai_mi2s2 {
qcom,msm-mi2s-tx-lines = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
&tert_mi2s_sd0_active>;
pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep
&tert_mi2s_sd0_sleep>;
};
#include "camera/shima-camera-sensor-idp.dtsi"

4
qcom/shima-idps-digital-mics.dtsi
View file

@ -6,7 +6,9 @@
&shima_snd {
qcom,model = "lahaina-shimaidps-snd-card";
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>;
qcom,wcn-btfm = <0>;
qcom,wcn-bt = <1>;
qcom,tdm-max-slots = <8>;
qcom,wcd-disabled = <0>;
qcom,ext-disp-audio-rx = <0>;
qcom,audio-routing =
"AMIC1", "Analog Mic1",

9
qcom/shima-qrd.dtsi
View file

@ -282,3 +282,12 @@
qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
<&bolero>;
};
&dai_mi2s2 {
qcom,msm-mi2s-tx-lines = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&tert_mi2s_sck_active &tert_mi2s_ws_active
&tert_mi2s_sd0_active>;
pinctrl-1 = <&tert_mi2s_sck_sleep &tert_mi2s_ws_sleep
&tert_mi2s_sd0_sleep>;
};