From 911a93d2fe95b3abd820b30b35b7bd9565d5fb7e Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Thu, 17 Oct 2024 14:20:03 +0530 Subject: [PATCH] ARM: dts: msm: Correction of i2s nodes in overlay Correction of i2s nodes in overlay and lpi files in Tuna platform. Change-Id: I4195ce95a8d871f4a5bc5e8ab6ddf0286d14aec4 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- Kbuild | 1 + tuna-audio-mtp-qmp1000.dtsi | 4 ++-- tuna-audio-overlay.dtsi | 14 +++++++------- tuna-audio.dts | 4 ++-- tuna-audio.dtsi | 1 - tuna-lpi.dtsi | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Kbuild b/Kbuild index b50df40c..4dee0ac9 100644 --- a/Kbuild +++ b/Kbuild @@ -33,6 +33,7 @@ dtbo-y += sun-audio.dtbo \ sun-audio-hamilton-mtp.dtbo \ sun-audio-hamilton-mtp-3.5mm.dtbo \ tuna-audio-atp.dtbo \ + tuna-audio.dtbo \ tuna-audio-cdp.dtbo \ tuna-audio-hamilton-mtp.dtbo \ tuna-audio-hamilton-rcm.dtbo \ diff --git a/tuna-audio-mtp-qmp1000.dtsi b/tuna-audio-mtp-qmp1000.dtsi index 164a1dcb..0535db34 100644 --- a/tuna-audio-mtp-qmp1000.dtsi +++ b/tuna-audio-mtp-qmp1000.dtsi @@ -83,11 +83,11 @@ }; }; -&sun_snd { +&tuna_snd { qcom,model = "tuna-mtp-qmp-snd-card"; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd9378_codec>, - <&wsa884x_0221>, <&wsa884x_0222>, + <&wsa884x_0220>, <&wsa884x_0221>, <&qmp01>, <&qmp02>, <&qmp03>, <&qmp04>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", diff --git a/tuna-audio-overlay.dtsi b/tuna-audio-overlay.dtsi index f691bcd1..1d146e13 100644 --- a/tuna-audio-overlay.dtsi +++ b/tuna-audio-overlay.dtsi @@ -127,7 +127,7 @@ swr_haptics: swr_haptics@f0170220 { compatible = "qcom,pmih010x-swr-haptics"; reg = <0x03 0xf0170220>; - swr-slave-supply = <&hap_swr_slave_reg>; + //swr-slave-supply = <&hap_swr_slave_reg>; qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>; status = "disabled"; }; @@ -542,9 +542,9 @@ 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>; + &lpi_i2s1_data0_active &lpi_i2s1_data1_active>; pinctrl-1 = <&lpi_i2s1_sck_sleep &lpi_i2s1_ws_sleep - &lpi_i2s1_sd0_sleep &lpi_i2s1_sd1_sleep>; + &lpi_i2s1_data0_sleep &lpi_i2s1_data1_sleep>; qcom,lpi-gpios; qcom,tlmm-pins = <144 147>; #gpio-cells = <0>; @@ -555,9 +555,9 @@ compatible = "qcom,msm-cdc-pinctrl"; pinctrl-names = "aud_active", "aud_sleep"; pinctrl-0 = <&lpi_i2s2_sck_active &lpi_i2s2_ws_active - &lpi_i2s2_sd0_active &lpi_i2s2_sd1_active>; + &lpi_i2s2_data0_active &lpi_i2s2_data1_active>; pinctrl-1 = <&lpi_i2s2_sck_sleep &lpi_i2s2_ws_sleep - &lpi_i2s2_sd0_sleep &lpi_i2s2_sd1_sleep>; + &lpi_i2s2_data0_sleep &lpi_i2s2_data1_sleep>; qcom,lpi-gpios; qcom,tlmm-pins = <148 151>; #gpio-cells = <0>; @@ -568,9 +568,9 @@ compatible = "qcom,msm-cdc-pinctrl"; pinctrl-names = "aud_active", "aud_sleep"; pinctrl-0 = <&lpi_i2s3_sck_active &lpi_i2s3_ws_active - &lpi_i2s3_sd0_active &lpi_i2s3_sd1_active>; + &lpi_i2s3_data0_active &lpi_i2s3_data1_active>; pinctrl-1 = <&lpi_i2s3_sck_sleep &lpi_i2s3_ws_sleep - &lpi_i2s3_sd0_sleep &lpi_i2s3_sd1_sleep>; + &lpi_i2s3_data0_sleep &lpi_i2s3_data1_sleep>; qcom,lpi-gpios; qcom,tlmm-pins = <153 156>; #gpio-cells = <0>; diff --git a/tuna-audio.dts b/tuna-audio.dts index 3291558f..a56067d5 100644 --- a/tuna-audio.dts +++ b/tuna-audio.dts @@ -6,9 +6,9 @@ /dts-v1/; /plugin/; -#include +#include #include -#include +#include #include #include "tuna-audio.dtsi" diff --git a/tuna-audio.dtsi b/tuna-audio.dtsi index be4356bc..dfe2a8b0 100644 --- a/tuna-audio.dtsi +++ b/tuna-audio.dtsi @@ -59,7 +59,6 @@ qcom,smmu-enabled; iommus = <&apps_smmu 0x1001 0x0080>, <&apps_smmu 0x1041 0x20>; memory-region = <&audio_cnss_resv_region>; - qcom,iommu-group = <&cnss_audio_iommu_group0>; qcom,smmu-sid-mask = /bits/ 64 <0xf>; dma-coherent; diff --git a/tuna-lpi.dtsi b/tuna-lpi.dtsi index e8a8f2c6..ebf2e7b9 100644 --- a/tuna-lpi.dtsi +++ b/tuna-lpi.dtsi @@ -245,7 +245,7 @@ }; lpi_i2s1_sd0 { - lpi_i2s1_sd0_sleep: lpi_i2s1_sd0_sleep { + lpi_i2s1_data0_sleep: lpi_i2s1_data0_sleep { mux { pins = "gpio8"; function = "func2"; @@ -259,7 +259,7 @@ }; }; - lpi_i2s1_sd0_active: lpi_i2s1_sd0_active { + lpi_i2s1_data0_active: lpi_i2s1_data0_active { mux { pins = "gpio8"; function = "func2";