mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-13 08:07:32 -04:00
Merge "ARM: dts: msm: update setting for tert MI2S on Lahaina"
This commit is contained in:
commit
d816a87c90
3 changed files with 36 additions and 23 deletions
|
|
@ -201,17 +201,20 @@
|
|||
status = "ok"
|
||||
};
|
||||
|
||||
&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>;
|
||||
&q6core {
|
||||
cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {
|
||||
compatible = "qcom,msm-cdc-pinctrl";
|
||||
pinctrl-names = "aud_active", "aud_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>;
|
||||
};
|
||||
};
|
||||
|
||||
&lahaina_snd {
|
||||
qcom,model = "lahaina-cdp-snd-card";
|
||||
qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
|
||||
};
|
||||
|
||||
&usb1 {
|
||||
|
|
|
|||
|
|
@ -182,13 +182,19 @@
|
|||
status = "ok"
|
||||
};
|
||||
|
||||
&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>;
|
||||
&q6core {
|
||||
cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {
|
||||
compatible = "qcom,msm-cdc-pinctrl";
|
||||
pinctrl-names = "aud_active", "aud_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>;
|
||||
};
|
||||
};
|
||||
|
||||
&lahaina_snd {
|
||||
qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
|
||||
};
|
||||
|
||||
&usb1 {
|
||||
|
|
|
|||
|
|
@ -97,6 +97,17 @@
|
|||
};
|
||||
};
|
||||
|
||||
&q6core {
|
||||
cdc_tert_mi2s_gpios: msm_cdc_pinctrl_tert {
|
||||
compatible = "qcom,msm-cdc-pinctrl";
|
||||
pinctrl-names = "aud_active", "aud_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>;
|
||||
};
|
||||
};
|
||||
|
||||
&lahaina_snd {
|
||||
qcom,model = "lahaina-qrd-snd-card";
|
||||
|
||||
|
|
@ -164,6 +175,8 @@
|
|||
qcom,msm-mbhc-usbc-audio-supported = <1>;
|
||||
qcom,msm-mbhc-hphl-swh = <0>;
|
||||
qcom,msm-mbhc-gnd-swh = <0>;
|
||||
|
||||
qcom,tert-mi2s-gpios = <&cdc_tert_mi2s_gpios>;
|
||||
};
|
||||
|
||||
&usb1 {
|
||||
|
|
@ -214,15 +227,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
&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>;
|
||||
};
|
||||
|
||||
&battery_charger {
|
||||
qcom,thermal-mitigation = <10000000 9500000 9000000 8500000 8000000
|
||||
7500000 7000000 6500000 6000000 5500000
|
||||
|
|
|
|||
Loading…
Reference in a new issue