arm/dts: Capri audio configuration

Update Capri audio overlay
Move Capri audio overlay to Capri common overlay

Change-Id: I5cc9b769326a4823052f14273471d1a26908f22d
Signed-off-by: guoyf2 <guoyf2@lenovo.com>
Reviewed-on: https://gerrit.mot.com/1744513
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Yunfei Guo <guoyf2@motorola.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
guoyf2 authored and Carlos Pinho committed 2023-05-31 17:01:02 -03:00
1 parent e3f5225ccd
commit e96871ac6a
3 files changed
+41 -34

No files matched your search

+40 -33
View File
@@ -32,18 +32,29 @@
status = "disabled";
};
&cdc_dmic01_gpios {
status = "disabled";
};
&cdc_dmic23_gpios {
status = "disabled";
};
&fsa4480 {
status = "disabled";
};
&qupv3_se1_i2c {
status = "ok"
/* AWINIC AW882XX mono Smart PA */
aw882xx_smartpa@34 {
compatible = "awinic,aw882xx_smartpa";
reg = <0x34>;
reset-gpio = <&tlmm 97 0>;
/*irq-gpio = <&tlmm 136 0x2008>; */
/* irq-gpio = <&tlmm 112 0x2008>; */
monitor-flag = <1>;
monitor-timer-val = <3000>;
status = "okay";
afe-rx-portid = <0x1000>;
afe-tx-portid = <0x1001>;
@@ -53,39 +64,40 @@
low-temp-table-down = <0xFFFFFFFB 0x4 0x10 0xFFBEAE7E 0x0 0x5 0x9 0xFFD80505 0x5 0x6 0x6 0xFFED714D>;
low-temp-table-up = <0x7 0x9 0x0 0x00000000 0x2 0x6 0x06 0xFFED714D 0xFFFFFFE 0x05 0x09 0xFFD80505>;
status = "okay";
};
/* AWINIC AW882XX mono Smart PA End */
};
/* Add pinctrl for MI2S0 */
&soc {
cdc_pri_mi2s_gpios: msm_cdc_pinctrl_pri {
compatible = "qcom,msm-cdc-pinctrl";
pinctrl-names = "aud_active", "aud_sleep";
pinctrl-0 = <&lpi_i2s1_sck_active &lpi_i2s1_ws_active
&lpi_i2s1_sd0_active &lpi_i2s1_sd1_active>;
pinctrl-1 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep
&lpi_i2s1_sd0_sleep &lpi_i2s1_sd1_sleep>;
};
&q6core {
cdc_pri_mi2s_gpios: msm_cdc_pinctrl_pri {
compatible = "qcom,msm-cdc-pinctrl";
pinctrl-names = "aud_active", "aud_sleep";
pinctrl-0 = <&lpi_i2s1_sck_active &lpi_i2s1_ws_active
&lpi_i2s1_sd0_active &lpi_i2s1_sd1_active>;
pinctrl-1 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep
&lpi_i2s1_sd0_sleep &lpi_i2s1_sd1_sleep>;
qcom,lpi-gpios;
};
};
/* Configure MI2S0 SD0&SD1 */
&dai_mi2s0 {
/* SD0 line for playback */
qcom,msm-mi2s-rx-lines = <1>;
/* SD1 line for recording(SmartPA EC) */
qcom,msm-mi2s-tx-lines = <2>;
/* SD0 line for playback */
qcom,msm-mi2s-rx-lines = <1>;
/* SD1 line for recording(SmartPA EC) */
qcom,msm-mi2s-tx-lines = <2>;
};
/* Modify btfmslim_codec's compatible */
&btfmslim_codec {
compatible = "btfmslim_slave";
status = "ok"
compatible = "btfmslim_slave";
status = "ok"
};
&bengal_snd {
qcom,model = "bengal-awinic-snd-card";
qcom,model = "bengal-awinic-snd-card";
aw,have-882xx = <1>;
qcom,audio-routing =
@@ -117,19 +129,14 @@
qcom,mi2s-audio-intf = <1>;
qcom,pri-mi2s-gpios = <&cdc_pri_mi2s_gpios>;
/delete-property/ qcom,cdc-dmic01-gpios;
/delete-property/ qcom,cdc-dmic23-gpios;
qcom,wsa-max-devs = <0>;
qcom,wsa-devs = <0>;
};
qcom,wsa-devs = <0>;
qcom,wsa-max-devs = <0>;
&cdc_dmic01_gpios {
status = "disabled";
};
&cdc_dmic23_gpios {
status = "disabled";
/delete-property/ qcom,cdc-dmic01-gpios;
/delete-property/ qcom,cdc-dmic23-gpios;
/delete-property/ qcom,wsa-devs;
/delete-property/ qcom,wsa-aux-dev-prefix;
};
/* Modify headset's BIAS voltage to 2.6V */
+1
View File
@@ -14,6 +14,7 @@
#include "bengal-moto-common-overlay.dtsi"
#include "bengal-capri-display.dtsi"
#include "bengal-audio-overlay.dtsi"
#include "bengal-capri-awinic-audio-overlay.dtsi"
#include "bengal-capri-touchscreen-overlay.dtsi"
#include "camera/bengal-camera-sensor-mot-capri-overlay.dtsi"
#include "bengal-capri-fps.dtsi"
-1
View File
@@ -14,7 +14,6 @@
/plugin/;
#include "bengal-capri-common-overlay.dtsi"
#include "bengal-capri-awinic-audio-overlay.dtsi"
/ {
model = "capri";