From fded148f66caaa50b608d2c4bad4d1ec8bb0d011 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Wed, 27 Nov 2024 16:55:49 +0530 Subject: [PATCH 1/5] ARM: dts: msm: Revert BOB and usbss This change reverts the commented section of BOB and wcd_usbss as they are depended on kernel change. Change-Id: I9fad7ce9732d7ec776ee3f14142129e406398c0f Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-mtp.dtsi | 2 +- kera-audio-overlay.dtsi | 4 ++-- kera-audio.dtsi | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kera-audio-mtp.dtsi b/kera-audio-mtp.dtsi index a7ec11dd..0c0647b0 100644 --- a/kera-audio-mtp.dtsi +++ b/kera-audio-mtp.dtsi @@ -156,7 +156,7 @@ swr-haptics-unsupported; qcom,pri_mi2s_gpios = <&cdc_pri_mi2s_gpios>; qcom,wcd-disable-legacy-surge; - //wcd939x-i2c-handle = <&wcd_usbss>; + wcd939x-i2c-handle = <&wcd_usbss>; qcom,msm-mbhc-usbc-audio-supported = <0>; qcom,msm-mbhc-hphl-swh = <1>; qcom,msm-mbhc-gnd-swh = <1>; diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index f5034250..e71a94f5 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -284,7 +284,7 @@ qcom,cdc-vdd-buck-current = <650000>; qcom,cdc-vdd-buck-lpm-supported = <1>; - //cdc-vdd-mic-bias-supply = <&BOB>; + cdc-vdd-mic-bias-supply = <&BOB>; qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>; qcom,cdc-vdd-mic-bias-current = <30000>; @@ -370,7 +370,7 @@ qcom,cdc-vdd-buck-current = <30070>; qcom,cdc-vdd-buck-lpm-supported = <1>; - // cdc-vdd-mic-bias-supply = <&BOB>; + cdc-vdd-mic-bias-supply = <&BOB>; qcom,cdc-vdd-mic-bias-voltage = <3296000 3296000>; qcom,cdc-vdd-mic-bias-current = <40550>; diff --git a/kera-audio.dtsi b/kera-audio.dtsi index e289da53..16d1110e 100644 --- a/kera-audio.dtsi +++ b/kera-audio.dtsi @@ -174,12 +174,12 @@ }; }; -//&aliases { -// wsa_swr = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master"; -// rx_swr = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master"; -// tx_swr = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master"; -// swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr"; -//}; +&aliases { + wsa_swr = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master"; + rx_swr = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master"; + tx_swr = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master"; + swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr"; +}; &adsp_loader { /delete-property/ qcom,adsp-state; From 8c9dc8e8bcf421de474949ebf6524d0e05841643 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Wed, 27 Nov 2024 18:44:26 +0530 Subject: [PATCH 2/5] ARM: dts: msm: Replace swr nodes Replace swr node with default as swr core does not detect. Change-Id: Ibe40453c70867c9687bd01ca9345dae8080bafac Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-atp.dtsi | 2 +- kera-audio-cdp.dtsi | 2 +- kera-audio-lpass-reg.dtsi | 6 +++--- kera-audio-mtp-qmp1000.dtsi | 4 ++-- kera-audio-mtp.dtsi | 4 ++-- kera-audio-overlay.dtsi | 6 +++--- kera-audio-qrd.dtsi | 2 +- kera-audio.dtsi | 12 ++++++------ 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/kera-audio-atp.dtsi b/kera-audio-atp.dtsi index 3d2cee82..4f193ac6 100644 --- a/kera-audio-atp.dtsi +++ b/kera-audio-atp.dtsi @@ -21,7 +21,7 @@ qcom,wsa-max-devs = <0>; }; -&wsa_swr { +&swr0 { qcom,swr-num-dev = <0>; }; diff --git a/kera-audio-cdp.dtsi b/kera-audio-cdp.dtsi index b14dcf5d..3bba2f68 100644 --- a/kera-audio-cdp.dtsi +++ b/kera-audio-cdp.dtsi @@ -58,7 +58,7 @@ status = "okay"; }; -&wsa_swr { +&swr0 { wsa884x_0220: wsa884x@02170220 { status = "okay"; }; diff --git a/kera-audio-lpass-reg.dtsi b/kera-audio-lpass-reg.dtsi index d42a3289..4485f758 100644 --- a/kera-audio-lpass-reg.dtsi +++ b/kera-audio-lpass-reg.dtsi @@ -6,7 +6,7 @@ reg = <0x6AC0000 0x0>; }; -&rx_swr { +&swr1 { swrm-io-base = <0x6AD0000 0x0>; interrupts = ; }; @@ -19,12 +19,12 @@ reg = <0x6B00000 0x0>; }; -&wsa_swr { +&swr0 { swrm-io-base = <0x6B10000 0x0>; interrupts = ; }; -&tx_swr { +&swr2 { reg = <0x7630000 0x0>; }; diff --git a/kera-audio-mtp-qmp1000.dtsi b/kera-audio-mtp-qmp1000.dtsi index 4d803fc7..902b1f00 100644 --- a/kera-audio-mtp-qmp1000.dtsi +++ b/kera-audio-mtp-qmp1000.dtsi @@ -5,7 +5,7 @@ #include "kera-audio-mtp.dtsi" -&rx_swr { +&swr1 { qcom,swr-num-dev = <2>; }; @@ -33,7 +33,7 @@ status = "disabled"; }; -&tx_swr { +&swr2 { qmp01: qmp@04170232 { /* * reg = ; }; -&wsa_swr { +&swr0 { qcom,swr-num-dev = <2>; }; diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index e71a94f5..8a88bbbc 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -37,7 +37,7 @@ qcom,use-clk-id = ; qcom,is-used-swr-gpio = <1>; qcom,va-swr-gpios = <&va_swr_gpios>; - tx_swr: va_swr_master { + swr2: va_swr_master { compatible = "qcom,swr-mstr"; #address-cells = <2>; #size-cells = <0>; @@ -93,7 +93,7 @@ qcom,default-clk-id = ; clock-names = "rx_mclk2_2x_clk"; clocks = <&clock_audio_rx_mclk2_2x_clk 0>; - rx_swr: rx_swr_master { + swr1: rx_swr_master { compatible = "qcom,swr-mstr"; #address-cells = <2>; #size-cells = <0>; @@ -152,7 +152,7 @@ qcom,thermal-max-state = <11>; qcom,noise-gate-mode = <2>; #cooling-cells = <2>; - wsa_swr: wsa_swr_master { + swr0: wsa_swr_master { compatible = "qcom,swr-mstr"; #address-cells = <2>; #size-cells = <0>; diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi index 9768b064..0afe6dc6 100644 --- a/kera-audio-qrd.dtsi +++ b/kera-audio-qrd.dtsi @@ -29,7 +29,7 @@ }; }; -&wsa_swr { +&swr0 { wsa884x_0220: wsa884x@02170220 { status = "disabled"; }; diff --git a/kera-audio.dtsi b/kera-audio.dtsi index 16d1110e..59d02973 100644 --- a/kera-audio.dtsi +++ b/kera-audio.dtsi @@ -135,7 +135,7 @@ }; va_macro: va-macro@7660000 { - tx_swr: va_swr_master { + swr2: va_swr_master { }; }; @@ -143,12 +143,12 @@ }; rx_macro: rx-macro@6AC0000 { - rx_swr: rx_swr_master { + swr1: rx_swr_master { }; }; wsa_macro: wsa-macro@6B00000 { - wsa_swr: wsa_swr_master { + swr0: wsa_swr_master { }; }; @@ -175,9 +175,9 @@ }; &aliases { - wsa_swr = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master"; - rx_swr = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master"; - tx_swr = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master"; + swr0 = "/soc/spf_core_platform/lpass-cdc/wsa-macro@6B00000/wsa_swr_master"; + swr1 = "/soc/spf_core_platform/lpass-cdc/rx-macro@6AC0000/rx_swr_master"; + swr2 = "/soc/spf_core_platform/lpass-cdc/va-macro@7660000/va_swr_master"; swr4 = "/soc/spf_core_platform/lpass_bt_swr@6CA0000/bt_swr_mstr"; }; From 6338ab11b7db5a6cff04879271b3ef734a80b4b8 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Wed, 27 Nov 2024 19:26:17 +0530 Subject: [PATCH 3/5] ARM: dts: msm: Change GIC and gpio Update GIC as per IPCAT the GIC number is incorrect. 722 will not get interrupts of HSJ and audio will be mute. Changing this to 721 as in tuna same issue was observing. correction of wrong gpio pin. Change-Id: Idb87af4d1438186ed29fc3227d447f1b6d189676 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-overlay.dtsi | 2 +- kera-lpi.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kera-audio-overlay.dtsi b/kera-audio-overlay.dtsi index 8a88bbbc..ea7d0954 100644 --- a/kera-audio-overlay.dtsi +++ b/kera-audio-overlay.dtsi @@ -48,7 +48,7 @@ qcom,swr_master_id = <3>; qcom,mipi-sdw-block-packing-mode = <1>; interrupts = - , + , ; interrupt-names = "swr_master_irq", "swr_wake_irq"; qcom,swr-wakeup-required = <1>; diff --git a/kera-lpi.dtsi b/kera-lpi.dtsi index ebf2e7b9..70127681 100644 --- a/kera-lpi.dtsi +++ b/kera-lpi.dtsi @@ -1804,7 +1804,7 @@ }; config { - pins = "gpio4"; + pins = "gpio14"; drive-strength = <2>; input-enable; bias-pull-down; From e8f6a16fb7824331dbc4d3136e14c201a00f2ad4 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Thu, 28 Nov 2024 11:30:18 +0530 Subject: [PATCH 4/5] ARM: dts: msm: disable haptics in QRD Haptics to be disabled. Change-Id: I5a2cc26c2732cac803cd38da7b0c21d0e6e8b7e1 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-qrd.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/kera-audio-qrd.dtsi b/kera-audio-qrd.dtsi index 0afe6dc6..a19f90b0 100644 --- a/kera-audio-qrd.dtsi +++ b/kera-audio-qrd.dtsi @@ -77,6 +77,7 @@ &kera_snd { qcom,model = "kera-qrd-snd-card"; + swr-haptics-unsupported; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd9378_codec>, <&wsa884x_0221>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", From 8ebc7e052262b1ae3405b8061974b43266b924be Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Fri, 29 Nov 2024 17:26:43 +0530 Subject: [PATCH 5/5] ARM: dts: msm: Update wcd codec for kera-qmp1000 Update correct wcd codec for kera qmp and its mic bias. Change-Id: I5c584401ff747f5ad801b93c0124eb00d1bc6965 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- kera-audio-mtp-qmp1000.dtsi | 41 +++++-------------------------------- 1 file changed, 5 insertions(+), 36 deletions(-) diff --git a/kera-audio-mtp-qmp1000.dtsi b/kera-audio-mtp-qmp1000.dtsi index 902b1f00..8f57194a 100644 --- a/kera-audio-mtp-qmp1000.dtsi +++ b/kera-audio-mtp-qmp1000.dtsi @@ -5,33 +5,6 @@ #include "kera-audio-mtp.dtsi" -&swr1 { - qcom,swr-num-dev = <2>; -}; - -&wcd9378_rx_slave { - status = "okay"; -}; - -&wcd9378_tx_slave { - status = "okay"; -}; - -&wcd9378_codec { - status = "okay"; -}; - -&wcd939x_rx_slave { - status = "disabled"; -}; - -&wcd939x_tx_slave { - status = "disabled"; -}; - -&wcd939x_codec { - status = "disabled"; -}; &swr2 { qmp01: qmp@04170232 { @@ -114,12 +87,12 @@ &kera_snd { qcom,model = "kera-mtp-qmp-snd-card"; asoc-codec = <&stub_codec>, <&lpass_cdc>, - <&wcd9378_codec>, + <&wcd939x_codec>, <&wsa884x_0220>, <&wsa884x_0221>, <&qmp01>, <&qmp02>, <&qmp03>, <&qmp04>; asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", - "wcd9378_codec", + "wcd939x_codec", "wsa-codec1", "wsa-codec2", "qmp-dmic.01", "qmp-dmic.02", "qmp-dmic.03", "qmp-dmic.04"; @@ -132,9 +105,7 @@ "AMIC3", "Analog Mic3", "AMIC3", "MIC BIAS3", "AMIC4", "Analog Mic4", - "AMIC4", "MIC BIAS3", - "AMIC5", "Analog Mic5", - "AMIC5", "MIC BIAS4", + "AMIC4", "MIC BIAS1", "VA AMIC1", "Analog Mic1", "VA AMIC1", "VA MIC BIAS1", "VA AMIC2", "Analog Mic2", @@ -142,9 +113,7 @@ "VA AMIC3", "Analog Mic3", "VA AMIC3", "VA MIC BIAS3", "VA AMIC4", "Analog Mic4", - "VA AMIC4", "VA MIC BIAS3", - "VA AMIC5", "Analog Mic5", - "VA AMIC5", "VA MIC BIAS4", + "VA AMIC4", "VA MIC BIAS1", "TX DMIC0", "Digital Mic0", "TX DMIC0", "MIC BIAS3", "TX DMIC1", "Digital Mic1", @@ -155,7 +124,7 @@ "TX DMIC3", "MIC BIAS1", "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", - "IN3_EAR", "AUX_OUT", + "IN3_AUX", "AUX_OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX",