From 63b02b32cccb0f9d79fec92ae47ccb7edf0989c2 Mon Sep 17 00:00:00 2001 From: liaohj Date: Wed, 14 Oct 2020 09:42:36 +0800 Subject: [PATCH] Ibiza:audio EVB bringup. 1.qcom 4350 platform 2. android R 3. kernel 5.4 4.wcd9370+aw88258 add Ibiza audio config dts. rename holi-audio-wcd9370-aw882xx-overlay.dtsi as wcd9370+aw882xx common. and delete nouseful wsa config. Change-Id: I30ee49fb6a5d99c6bfe5a00653f3dd4d16fdf13b Signed-off-by: liaohj Reviewed-on: https://gerrit.mot.com/1773361 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Wanlong Zhou Reviewed-by: Huosheng Liao Submit-Approved: Jira Key --- ...> holi-audio-wcd9370-aw882xx-overlay.dtsi} | 155 +----------------- qcom/holi-denver-common-overlay.dtsi | 2 +- qcom/holi-ibiza-common-overlay.dtsi | 1 + 3 files changed, 3 insertions(+), 155 deletions(-) rename qcom/{holi-denver-audio-overlay.dtsi => holi-audio-wcd9370-aw882xx-overlay.dtsi} (68%) diff --git a/qcom/holi-denver-audio-overlay.dtsi b/qcom/holi-audio-wcd9370-aw882xx-overlay.dtsi similarity index 68% rename from qcom/holi-denver-audio-overlay.dtsi rename to qcom/holi-audio-wcd9370-aw882xx-overlay.dtsi index e1bde3169e13..290250efda7b 100644 --- a/qcom/holi-denver-audio-overlay.dtsi +++ b/qcom/holi-audio-wcd9370-aw882xx-overlay.dtsi @@ -137,13 +137,6 @@ compatible = "qcom,wcd937x-slave"; reg = <0x0A 0x01170223>; }; - - wcd938x_tx_slave: wcd938x-tx-slave { - status = "disabled"; - compatible = "qcom,wcd938x-slave"; - reg = <0x0D 0x01170223>; - }; - }; }; @@ -191,19 +184,9 @@ compatible = "qcom,wcd937x-slave"; reg = <0x0A 0x01170224>; }; - - wcd938x_rx_slave: wcd938x-rx-slave { - status = "disabled"; - compatible = "qcom,wcd938x-slave"; - reg = <0x0D 0x01170224>; - }; }; }; - wcd938x_codec: wcd938x-codec { - status = "disabled"; - }; - wcd937x_codec: wcd937x-codec { compatible = "qcom,wcd937x-codec"; qcom,split-codec = <1>; @@ -261,81 +244,6 @@ qcom,tdm-max-slots = <4>; qcom,sec-mi2s-gpios = <&cdc_sec_mi2s_gpios>; - asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>, - <&loopback>, <&compress>, <&hostless>, - <&afe>, <&lsm>, <&routing>, <&compr>, - <&pcm_noirq>; - asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1", - "msm-pcm-dsp.2", "msm-voip-dsp", - "msm-pcm-voice", "msm-pcm-loopback", - "msm-compress-dsp", "msm-pcm-hostless", - "msm-pcm-afe", "msm-lsm-client", - "msm-pcm-routing", "msm-compr-dsp", - "msm-pcm-dsp-noirq"; - asoc-cpu = <&dai_mi2s0>, <&dai_mi2s1>, - <&dai_mi2s2>, <&dai_mi2s3>, - <&dai_pri_auxpcm>, - <&dai_sec_auxpcm>, <&dai_tert_auxpcm>, - <&dai_quat_auxpcm>, - <&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>, - <&afe_proxy_tx>, <&incall_record_rx>, - <&incall_record_tx>, <&incall_music_rx>, - <&incall_music_2_rx>, - <&afe_proxy_tx_1>, - <&proxy_rx>, <&proxy_tx>, - <&usb_audio_rx>, <&usb_audio_tx>, - <&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>, - <&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>, - <&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>, - <&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>, - <&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>, - <&va_cdc_dma_0_tx>, <&va_cdc_dma_1_tx>, - <&va_cdc_dma_2_tx>, - <&rx_cdc_dma_0_rx>, <&tx_cdc_dma_0_tx>, - <&rx_cdc_dma_1_rx>, <&tx_cdc_dma_1_tx>, - <&rx_cdc_dma_2_rx>, <&tx_cdc_dma_2_tx>, - <&rx_cdc_dma_3_rx>, <&tx_cdc_dma_3_tx>, - <&rx_cdc_dma_4_rx>, <&tx_cdc_dma_4_tx>, - <&rx_cdc_dma_5_rx>, <&tx_cdc_dma_5_tx>, - <&rx_cdc_dma_7_rx>,<&afe_loopback_tx>; - asoc-cpu-names = "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1", - "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", - "msm-dai-q6-auxpcm.1", - "msm-dai-q6-auxpcm.2", "msm-dai-q6-auxpcm.3", - "msm-dai-q6-auxpcm.4", - "msm-dai-q6-dev.224", - "msm-dai-q6-dev.225", "msm-dai-q6-dev.241", - "msm-dai-q6-dev.240", "msm-dai-q6-dev.32771", - "msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773", - "msm-dai-q6-dev.32770", - "msm-dai-q6-dev.242", - "msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195", - "msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673", - "msm-dai-q6-dev.16398", "msm-dai-q6-dev.16399", - "msm-dai-q6-dev.16401", - "msm-dai-q6-tdm.36864", "msm-dai-q6-tdm.36865", - "msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881", - "msm-dai-q6-tdm.36896", "msm-dai-q6-tdm.36897", - "msm-dai-q6-tdm.36912", "msm-dai-q6-tdm.36913", - "msm-dai-cdc-dma-dev.45089", - "msm-dai-cdc-dma-dev.45091", - "msm-dai-cdc-dma-dev.45093", - "msm-dai-cdc-dma-dev.45104", - "msm-dai-cdc-dma-dev.45105", - "msm-dai-cdc-dma-dev.45106", - "msm-dai-cdc-dma-dev.45107", - "msm-dai-cdc-dma-dev.45108", - "msm-dai-cdc-dma-dev.45109", - "msm-dai-cdc-dma-dev.45110", - "msm-dai-cdc-dma-dev.45111", - "msm-dai-cdc-dma-dev.45112", - "msm-dai-cdc-dma-dev.45113", - "msm-dai-cdc-dma-dev.45114", - "msm-dai-cdc-dma-dev.45115", - "msm-dai-cdc-dma-dev.45118", - "msm-dai-q6-dev.24577"; - - qcom,audio-routing = "AMIC1", "Analog Mic1", "Analog Mic1", "MIC BIAS1", @@ -403,50 +311,7 @@ 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"; - }; - - wsa881x_i2c_e: wsa881x-i2c-codec@e { - status = "disabled"; - compatible = "qcom,wsa881x-i2c-codec"; - reg = <0x0e>; - clock-names = "wsa_mclk"; - clocks = <&wsa881x_analog_clk 0>; - qcom,wsa-analog-clk-gpio = <&wsa881x_analog_clk_gpio>; - qcom,wsa-analog-reset-gpio = <&wsa881x_analog_reset_gpio>; - cdc-vdd-1p8-supply = <&L11A>; - qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; - qcom,cdc-vdd-1p8-current = <10000>; - qcom,cdc-static-supplies = "cdc-vdd-1p8"; - qcom,wsa-prefix = "SpkrMono"; - }; - - wsa881x_i2c_44: wsa881x-i2c-codec@44 { - status = "disabled"; - compatible = "qcom,wsa881x-i2c-codec"; - reg = <0x044>; - }; - - wsa881x_i2c_f: wsa881x-i2c-codec@f { - status = "disabled"; - compatible = "qcom,wsa881x-i2c-codec"; - reg = <0x0f>; - clock-names = "wsa_mclk"; - clocks = <&wsa881x_analog_clk 0>; - qcom,wsa-analog-clk-gpio = <&wsa881x_analog_clk_gpio>; - qcom,wsa-analog-reset-gpio = <&wsa881x_analog_reset_gpio>; - cdc-vdd-1p8-supply = <&L11A>; - qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; - qcom,cdc-vdd-1p8-current = <10000>; - qcom,cdc-static-supplies = "cdc-vdd-1p8"; - qcom,wsa-prefix = "SpkrMono"; - }; - - wsa881x_i2c_45: wsa881x-i2c-codec@45 { - status = "disabled"; - compatible = "qcom,wsa881x-i2c-codec"; - reg = <0x045>; - }; - + }; }; &va_cdc_dma_0_tx { @@ -461,24 +326,6 @@ pinctrl-1 = <&wcd937x_reset_sleep>; }; - wsa881x_analog_reset_gpio: wsa_reset_gpio { - status = "disabled"; - compatible = "qcom,msm-cdc-pinctrl"; - pinctrl-names = "aud_active", "aud_sleep"; - pinctrl-0 = <&spkr_2_sd_n_active>; - pinctrl-1 = <&spkr_2_sd_n_sleep>; - #gpio-cells = <0>; - }; - - wsa881x_analog_clk: wsa_ana_clk { - status = "disabled"; - compatible = "qcom,audio-ref-clk"; - qcom,codec-ext-clk-src = ; - qcom,codec-lpass-ext-clk-freq = <9600000>; - qcom,codec-lpass-clk-id = <0x301>; - #clock-cells = <1>; - }; - clock_audio_rx_1: rx_core_clk { compatible = "qcom,audio-ref-clk"; qcom,codec-ext-clk-src = ; diff --git a/qcom/holi-denver-common-overlay.dtsi b/qcom/holi-denver-common-overlay.dtsi index 8864519e358a..02cb3c7d2a8b 100644 --- a/qcom/holi-denver-common-overlay.dtsi +++ b/qcom/holi-denver-common-overlay.dtsi @@ -14,7 +14,7 @@ #include "denver-display.dtsi" #include "denver-touchscreen.dtsi" #include "camera/holi-camera-sensor-mot-denver-overlay.dtsi" -#include "holi-denver-audio-overlay.dtsi" +#include "holi-audio-wcd9370-aw882xx-overlay.dtsi" &tlmm { tps61280_en_default: tps61280_en_default { diff --git a/qcom/holi-ibiza-common-overlay.dtsi b/qcom/holi-ibiza-common-overlay.dtsi index aca2fe4a248f..0aa3d2ffeb13 100644 --- a/qcom/holi-ibiza-common-overlay.dtsi +++ b/qcom/holi-ibiza-common-overlay.dtsi @@ -14,6 +14,7 @@ #include "ibiza-display.dtsi" #include "ibiza-touchscreen.dtsi" #include "camera/holi-camera-sensor-mot-ibiza-overlay.dtsi" +#include "holi-audio-wcd9370-aw882xx-overlay.dtsi" &tlmm { tps61280_en_default: tps61280_en_default {