From 5bbeb99ed4d7b670d6079285612fe96f7c14f98b Mon Sep 17 00:00:00 2001 From: Satish Babu Patakokila Date: Fri, 7 Oct 2022 16:09:38 +0530 Subject: [PATCH] ARM: dts: msm: clean up of sdxpinn dts files Remove not needed nodes from dtsi files of sdxpinn. Change-Id: I2dd3aab01b1a01c5302bf60f006b5bf12ee3b9c8 --- sdx-audio-lpass.dtsi | 254 ------------------------------------------- sdxpinn-audio.dtsi | 31 ------ 2 files changed, 285 deletions(-) diff --git a/sdx-audio-lpass.dtsi b/sdx-audio-lpass.dtsi index fdbf5d95..1c72f79c 100644 --- a/sdx-audio-lpass.dtsi +++ b/sdx-audio-lpass.dtsi @@ -19,264 +19,10 @@ memory-region = <&audio_heap_mem>; }; - pcm0: qcom,msm-pcm { - compatible = "qcom,msm-pcm-dsp"; - qcom,msm-pcm-dsp-id = <0>; - }; - - routing: qcom,msm-pcm-routing { - compatible = "qcom,msm-pcm-routing"; - }; - - pcm1: qcom,msm-pcm-low-latency { - compatible = "qcom,msm-pcm-dsp"; - qcom,msm-pcm-dsp-id = <1>; - qcom,msm-pcm-low-latency; - qcom,latency-level = "ultra"; - }; - - qcom,msm-compr-dsp { - compatible = "qcom,msm-compr-dsp"; - }; - - voip: qcom,msm-voip-dsp { - compatible = "qcom,msm-voip-dsp"; - }; - - voice: qcom,msm-pcm-voice { - compatible = "qcom,msm-pcm-voice"; - qcom,destroy-cvd; - }; - stub_codec: qcom,msm-stub-codec { compatible = "qcom,msm-stub-codec"; }; - qcom,msm-dai-fe { - compatible = "qcom,msm-dai-fe"; - }; - - afe: qcom,msm-pcm-afe { - compatible = "qcom,msm-pcm-afe"; - }; - - hostless: qcom,msm-pcm-hostless { - compatible = "qcom,msm-pcm-hostless"; - }; - - audio_apr: qcom,msm-audio-apr { - compatible = "qcom,msm-audio-apr"; - qcom,subsys-name = "apr_modem"; - }; - - host_pcm: qcom,msm-voice-host-pcm { - compatible = "qcom,msm-voice-host-pcm"; - }; - - loopback: qcom,msm-pcm-loopback { - compatible = "qcom,msm-pcm-loopback"; - }; - - compress: qcom,msm-compress-dsp { - compatible = "qcom,msm-compress-dsp"; - qcom,adsp-version = "MDSP 1.2"; - }; - - qcom,msm-dai-stub { - compatible = "qcom,msm-dai-stub"; - dtmf_tx: qcom,msm-dai-stub-dtmf-tx { - compatible = "qcom,msm-dai-stub-dev"; - qcom,msm-dai-stub-dev-id = <4>; - }; - - rx_capture_tx: qcom,msm-dai-stub-host-rx-capture-tx { - compatible = "qcom,msm-dai-stub-dev"; - qcom,msm-dai-stub-dev-id = <5>; - }; - - rx_playback_rx: qcom,msm-dai-stub-host-rx-playback-rx { - compatible = "qcom,msm-dai-stub-dev"; - qcom,msm-dai-stub-dev-id = <6>; - }; - - tx_capture_tx: qcom,msm-dai-stub-host-tx-capture-tx { - compatible = "qcom,msm-dai-stub-dev"; - qcom,msm-dai-stub-dev-id = <7>; - }; - - tx_playback_rx: qcom,msm-dai-stub-host-tx-playback-rx { - compatible = "qcom,msm-dai-stub-dev"; - qcom,msm-dai-stub-dev-id = <8>; - }; - }; - - qcom,msm-dai-q6 { - compatible = "qcom,msm-dai-q6"; - afe_pcm_rx: qcom,msm-dai-q6-be-afe-pcm-rx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <224>; - }; - - afe_pcm_tx: qcom,msm-dai-q6-be-afe-pcm-tx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <225>; - }; - - afe_proxy_rx: qcom,msm-dai-q6-afe-proxy-rx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <241>; - }; - - afe_proxy_tx: qcom,msm-dai-q6-afe-proxy-tx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <240>; - }; - - incall_record_rx: qcom,msm-dai-q6-incall-record-rx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <32771>; - }; - - incall_record_tx: qcom,msm-dai-q6-incall-record-tx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <32772>; - }; - - incall_music_rx: qcom,msm-dai-q6-incall-music-rx { - compatible = "qcom,msm-dai-q6-dev"; - qcom,msm-dai-q6-dev-id = <32773>; - }; - }; - - pcm_dtmf: qcom,msm-pcm-dtmf { - compatible = "qcom,msm-pcm-dtmf"; - }; - - dai_pri_auxpcm: qcom,msm-pri-auxpcm { - compatible = "qcom,msm-auxpcm-dev"; - qcom,msm-cpudai-auxpcm-mode = <0>, <0>; - qcom,msm-cpudai-auxpcm-sync = <1>, <1>; - qcom,msm-cpudai-auxpcm-frame = <5>, <4>; - qcom,msm-cpudai-auxpcm-quant = <2>, <2>; - qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>; - qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>; - qcom,msm-cpudai-auxpcm-data = <0>, <0>; - qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>; - qcom,msm-auxpcm-interface = "primary"; - qcom,msm-cpudai-afe-clk-ver = <2>; - }; - - dai_sec_auxpcm: qcom,msm-sec-auxpcm { - compatible = "qcom,msm-auxpcm-dev"; - qcom,msm-cpudai-auxpcm-mode = <0>, <0>; - qcom,msm-cpudai-auxpcm-sync = <1>, <1>; - qcom,msm-cpudai-auxpcm-frame = <5>, <4>; - qcom,msm-cpudai-auxpcm-quant = <2>, <2>; - qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>; - qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>; - qcom,msm-cpudai-auxpcm-data = <0>, <0>; - qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>; - qcom,msm-auxpcm-interface = "secondary"; - qcom,msm-cpudai-afe-clk-ver = <2>; - }; - - qcom,msm-dai-tdm-pri-rx { - compatible = "qcom,msm-dai-tdm"; - qcom,msm-cpudai-tdm-group-id = <37120>; - qcom,msm-cpudai-tdm-group-num-ports = <1>; - qcom,msm-cpudai-tdm-group-port-id = <36864>; - qcom,msm-cpudai-tdm-clk-rate = <12288000>; - qcom,msm-cpudai-tdm-clk-internal = <1>; - qcom,msm-cpudai-tdm-sync-mode = <0>; - qcom,msm-cpudai-tdm-sync-src = <1>; - qcom,msm-cpudai-tdm-data-out = <0>; - qcom,msm-cpudai-tdm-invert-sync = <0>; - qcom,msm-cpudai-tdm-data-delay = <1>; - qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>; - dai_pri_tdm_rx_0: qcom,msm-dai-q6-tdm-pri-rx-0 { - compatible = "qcom,msm-dai-q6-tdm"; - qcom,msm-cpudai-tdm-dev-id = <36864>; - qcom,msm-cpudai-tdm-data-align = <0>; - }; - - }; - - qcom,msm-dai-tdm-pri-tx { - compatible = "qcom,msm-dai-tdm"; - qcom,msm-cpudai-tdm-group-id = <37121>; - qcom,msm-cpudai-tdm-group-num-ports = <1>; - qcom,msm-cpudai-tdm-group-port-id = <36865>; - qcom,msm-cpudai-tdm-clk-rate = <12288000>; - qcom,msm-cpudai-tdm-clk-internal = <1>; - qcom,msm-cpudai-tdm-sync-mode = <0>; - qcom,msm-cpudai-tdm-sync-src = <1>; - qcom,msm-cpudai-tdm-data-out = <0>; - qcom,msm-cpudai-tdm-invert-sync = <0>; - qcom,msm-cpudai-tdm-data-delay = <1>; - qcom,msm-cpudai-tdm-clk-attribute = /bits/ 16 <1>; - dai_pri_tdm_tx_0: qcom,msm-dai-q6-tdm-pri-tx-0 { - compatible = "qcom,msm-dai-q6-tdm"; - qcom,msm-cpudai-tdm-dev-id = <36865>; - qcom,msm-cpudai-tdm-data-align = <0>; - }; - }; - - qcom,msm-dai-tdm-sec-rx { - compatible = "qcom,msm-dai-tdm"; - qcom,msm-cpudai-tdm-group-id = <37136>; - qcom,msm-cpudai-tdm-group-num-ports = <1>; - qcom,msm-cpudai-tdm-group-port-id = <36880>; - qcom,msm-cpudai-tdm-clk-rate = <12288000>; - qcom,msm-cpudai-tdm-clk-internal = <1>; - qcom,msm-cpudai-tdm-sync-mode = <1>; - qcom,msm-cpudai-tdm-sync-src = <0>; - qcom,msm-cpudai-tdm-data-out = <0>; - qcom,msm-cpudai-tdm-invert-sync = <0>; - qcom,msm-cpudai-tdm-data-delay = <0>; - dai_sec_tdm_rx_0: qcom,msm-dai-q6-tdm-sec-rx-0 { - compatible = "qcom,msm-dai-q6-tdm"; - qcom,msm-cpudai-tdm-dev-id = <36880>; - qcom,msm-cpudai-tdm-data-align = <0>; - }; - }; - - qcom,msm-dai-tdm-sec-tx { - compatible = "qcom,msm-dai-tdm"; - qcom,msm-cpudai-tdm-group-id = <37137>; - qcom,msm-cpudai-tdm-group-num-ports = <1>; - qcom,msm-cpudai-tdm-group-port-id = <36881>; - qcom,msm-cpudai-tdm-clk-rate = <12288000>; - qcom,msm-cpudai-tdm-clk-internal = <1>; - qcom,msm-cpudai-tdm-sync-mode = <1>; - qcom,msm-cpudai-tdm-sync-src = <0>; - qcom,msm-cpudai-tdm-data-out = <0>; - qcom,msm-cpudai-tdm-invert-sync = <0>; - qcom,msm-cpudai-tdm-data-delay = <0>; - dai_sec_tdm_tx_0: qcom,msm-dai-q6-tdm-sec-tx-0 { - compatible = "qcom,msm-dai-q6-tdm"; - qcom,msm-cpudai-tdm-dev-id = <36881>; - qcom,msm-cpudai-tdm-data-align = <0>; - }; - }; - - qcom,msm-dai-mi2s { - compatible = "qcom,msm-dai-mi2s"; - mi2s_prim: qcom,msm-dai-q6-mi2s-prim { - compatible = "qcom,msm-dai-q6-mi2s"; - qcom,msm-dai-q6-mi2s-dev-id = <0>; - qcom,msm-mi2s-rx-lines = <2>; - qcom,msm-mi2s-tx-lines = <1>; - }; - - mi2s_sec: qcom,msm-dai-q6-mi2s-sec { - compatible = "qcom,msm-dai-q6-mi2s"; - qcom,msm-dai-q6-mi2s-dev-id = <1>; - qcom,msm-mi2s-rx-lines = <2>; - qcom,msm-mi2s-tx-lines = <1>; - }; - - }; - prim_master: prim_master_pinctrl { compatible = "qcom,msm-cdc-pinctrl"; pinctrl-names = "aud_active", "aud_sleep"; diff --git a/sdxpinn-audio.dtsi b/sdxpinn-audio.dtsi index 189ec72a..7d9098d1 100644 --- a/sdxpinn-audio.dtsi +++ b/sdxpinn-audio.dtsi @@ -5,37 +5,6 @@ compatible = "qcom,sdx-asoc-snd-tavil"; qcom,model = "sdx-tavil-i2s-snd-card"; qcom,prim_mi2s_master = <&prim_master>; - - asoc-platform = <&pcm0>, <&pcm1>, <&voip>, <&voice>, - <&loopback>, <&hostless>, <&afe>, <&routing>, - <&pcm_dtmf>, <&host_pcm>, <&compress>; - asoc-platform-names = "msm-pcm-dsp.0", "msm-pcm-dsp.1", - "msm-voip-dsp", "msm-pcm-voice", - "msm-pcm-loopback", "msm-pcm-hostless", - "msm-pcm-afe", "msm-pcm-routing", - "msm-pcm-dtmf", "msm-voice-host-pcm", - "msm-compress-dsp"; - asoc-cpu = <&dai_pri_auxpcm>, <&mi2s_prim>, <&mi2s_sec>, - <&dtmf_tx>, - <&rx_capture_tx>, <&rx_playback_rx>, - <&tx_capture_tx>, <&tx_playback_rx>, - <&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>, - <&afe_proxy_tx>, <&incall_record_rx>, - <&incall_record_tx>, <&incall_music_rx>, - <&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>, - <&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>, - <&dai_sec_auxpcm>; - asoc-cpu-names = "msm-dai-q6-auxpcm.1", - "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1", - "msm-dai-stub-dev.4", "msm-dai-stub-dev.5", - "msm-dai-stub-dev.6", "msm-dai-stub-dev.7", - "msm-dai-stub-dev.8", "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-tdm.36864", "msm-dai-q6-tdm.36865", - "msm-dai-q6-tdm.36880", "msm-dai-q6-tdm.36881", - "msm-dai-q6-auxpcm.2"; }; };