From bcff7851c923f7edbffcd7145bc0624888f2d846 Mon Sep 17 00:00:00 2001 From: Yuhui Zhao Date: Mon, 9 Dec 2024 18:33:37 +0800 Subject: [PATCH 1/2] ARM: dts: msm: correct the config of tx_swr_data0 Correct the config of tx_swr_data0, the bias type should be same with tx_swr_data1. Change-Id: Id871ed15c0bf21ab68c4d3341f2761e451a9aa03 Signed-off-by: Yuhui Zhao --- tuna-lpi.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tuna-lpi.dtsi b/tuna-lpi.dtsi index 70127681..459930e0 100644 --- a/tuna-lpi.dtsi +++ b/tuna-lpi.dtsi @@ -1735,7 +1735,7 @@ pins = "gpio1"; drive-strength = <4>; slew-rate = <1>; - bias-disable; + bias-bus-hold; }; }; @@ -1750,7 +1750,7 @@ pins = "gpio1"; drive-strength = <2>; input-enable; - bias-bus-hold; + bias-pull-down; }; }; From 8853cd728ba6e36baaf063d8404e1f3cb70e0f73 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Mon, 23 Dec 2024 10:28:13 +0530 Subject: [PATCH 2/2] ARM: dts: msm: Enable swr-haptics for tuna QRD Enable swr-haptics in tuna QRD. Change-Id: I44be2af48d04c28e094df6f3a6bcff26c906dc25 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- tuna-audio-cdp.dtsi | 1 - tuna-audio-mtp.dtsi | 1 - tuna-audio-overlay.dtsi | 1 - tuna-audio-qrd.dtsi | 10 +++++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tuna-audio-cdp.dtsi b/tuna-audio-cdp.dtsi index 31e7cff7..0fba8c7b 100644 --- a/tuna-audio-cdp.dtsi +++ b/tuna-audio-cdp.dtsi @@ -65,7 +65,6 @@ &tuna_snd { qcom,model = "tuna-cdp-snd-card"; - swr-haptics-unsupported; qcom,audio-routing = "AMIC1", "Analog Mic1", "AMIC1", "MIC BIAS1", diff --git a/tuna-audio-mtp.dtsi b/tuna-audio-mtp.dtsi index 996187eb..343c2d49 100644 --- a/tuna-audio-mtp.dtsi +++ b/tuna-audio-mtp.dtsi @@ -11,6 +11,5 @@ &tuna_snd { qcom,model = "tuna-mtp-snd-card"; - swr-haptics-unsupported; qcom,sec-mi2s-gpios = <&fm_i2s1_gpios>; }; diff --git a/tuna-audio-overlay.dtsi b/tuna-audio-overlay.dtsi index 1af02067..66bcccf9 100644 --- a/tuna-audio-overlay.dtsi +++ b/tuna-audio-overlay.dtsi @@ -127,7 +127,6 @@ swr_haptics: swr_haptics@f0170220 { compatible = "qcom,pmih010x-swr-haptics"; reg = <0x03 0xf0170220>; - //swr-slave-supply = <&hap_swr_slave_reg>; qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>; status = "disabled"; }; diff --git a/tuna-audio-qrd.dtsi b/tuna-audio-qrd.dtsi index 880b49be..87ed7cf6 100644 --- a/tuna-audio-qrd.dtsi +++ b/tuna-audio-qrd.dtsi @@ -63,6 +63,11 @@ qcom,wsa-bat-cfgs = <1>, <1>; }; +&swr_haptics { + status = "okay"; + swr-slave-supply = <&hap_swr_slave_reg>; +}; + &wcd939x_codec { status = "okay"; /* 0 for digital crosstalk disabled, @@ -91,7 +96,6 @@ &tuna_snd { qcom,model = "tuna-qrd-snd-card"; - swr-haptics-unsupported; qcom,audio-routing = "AMIC1", "Analog Mic1", "AMIC1", "MIC BIAS1", @@ -126,9 +130,9 @@ "VA_AIF1 CAP", "VA_SWR_CLK", "VA_AIF2 CAP", "VA_SWR_CLK", "VA_AIF3 CAP", "VA_SWR_CLK"; - asoc-codec = <&stub_codec>, <&lpass_cdc>, + asoc-codec = <&stub_codec>, <&lpass_cdc>, <&swr_haptics>, <&wcd939x_codec>, <&wsa884x_0220>; - asoc-codec-names = "msm-stub-codec.1", "lpass-cdc", + asoc-codec-names = "msm-stub-codec.1", "lpass-cdc","swr_haptics", "wcd939x_codec", "wsa-codec1"; qcom,ext-disp-audio-rx = <1>; qcom,wsa-max-devs = <1>;