From 55c66550b6ad7de54cd430b59c713f4c91e7952e Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Thu, 7 Mar 2024 14:41:45 -0800 Subject: [PATCH 1/9] ARM: dts: qcom: update routing for QMP VA normal path Update QMP VA normal routing to VA soundwire to enable VA use-case from normal path. Change-Id: Ic29d99eefe65a90bf04fb38f88a29b8accb37e46 Signed-off-by: Phani Kumar Uppalapati --- sun-audio-mtp-qmp.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sun-audio-mtp-qmp.dtsi b/sun-audio-mtp-qmp.dtsi index 1c2894c5..44121ea9 100644 --- a/sun-audio-mtp-qmp.dtsi +++ b/sun-audio-mtp-qmp.dtsi @@ -128,10 +128,10 @@ "VA SWR_INPUT", "QMP_MIC02 LP_OUTPUT", "VA SWR_INPUT", "QMP_MIC03 LP_OUTPUT", "VA SWR_INPUT", "QMP_MIC04 LP_OUTPUT", - "VA SWR_INPUT", "QMP_MIC01 NORMAL_OUTPUT", - "VA SWR_INPUT", "QMP_MIC02 NORMAL_OUTPUT", - "VA SWR_INPUT", "QMP_MIC03 NORMAL_OUTPUT", - "VA SWR_INPUT", "QMP_MIC04 NORMAL_OUTPUT", + "VA SWR_INPUT", "QMP_MIC01 VA_NORMAL_OUTPUT", + "VA SWR_INPUT", "QMP_MIC02 VA_NORMAL_OUTPUT", + "VA SWR_INPUT", "QMP_MIC03 VA_NORMAL_OUTPUT", + "VA SWR_INPUT", "QMP_MIC04 VA_NORMAL_OUTPUT", "VA_AIF1 CAP", "VA_SWR_CLK", "VA_AIF2 CAP", "VA_SWR_CLK", "VA_AIF3 CAP", "VA_SWR_CLK", From a92abffab54c462f59678f1c054d7b91cb23f210 Mon Sep 17 00:00:00 2001 From: Faiz Nabi Kuchay Date: Tue, 12 Mar 2024 16:56:53 +0530 Subject: [PATCH 2/9] ARM: dts: qcom: Enable compilation for Sun MTP with qmp attach Enable compilation for Sun MTP with qmp attach. Use proper snd-card name. Change-Id: Ied5f977985d7e8c3ccfbfa7383bc43c9252beafa Signed-off-by: Faiz Nabi Kuchay --- Kbuild | 1 + sun-audio-mtp-qmp.dtsi | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Kbuild b/Kbuild index ec9f9945..5ee885bb 100644 --- a/Kbuild +++ b/Kbuild @@ -21,6 +21,7 @@ dtbo-y += sun-audio.dtbo \ sun-audio-mtp.dtbo \ sun-audio-mtp-3.5mm.dtbo \ sun-audio-mtp-nfc.dtbo \ + sun-audio-mtp-qmp.dtbo \ sun-audio-qrd.dtbo \ sun-audio-qrd-sku2.dtbo \ sun-audio-atp.dtbo \ diff --git a/sun-audio-mtp-qmp.dtsi b/sun-audio-mtp-qmp.dtsi index 44121ea9..bf53f3cf 100644 --- a/sun-audio-mtp-qmp.dtsi +++ b/sun-audio-mtp-qmp.dtsi @@ -64,7 +64,7 @@ }; &sun_snd { - qcom,model = "sun-mtp-wsa883x-qmp-snd-card"; + qcom,model = "sun-mtp-wsa883x_qmp-snd-card"; asoc-codec = <&stub_codec>, <&lpass_cdc>, <&wcd939x_codec>, <&swr_haptics>, <&wsa883x_0221>, <&wsa883x_0222>, From fc84ad4eff0f8214d14feaac17aedac54216a2b1 Mon Sep 17 00:00:00 2001 From: Kunlei Zhang Date: Tue, 27 Feb 2024 15:14:43 +0800 Subject: [PATCH 3/9] audio dts: add device tree for sun HDK Add device tree for Sun HDK. Change-Id: Idc87879371447a5e11c10d7a9b52aaf7d651e707 --- Kbuild | 1 + sun-audio-hdk.dts | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 sun-audio-hdk.dts diff --git a/Kbuild b/Kbuild index ec9f9945..a7a740b9 100644 --- a/Kbuild +++ b/Kbuild @@ -22,6 +22,7 @@ dtbo-y += sun-audio.dtbo \ sun-audio-mtp-3.5mm.dtbo \ sun-audio-mtp-nfc.dtbo \ sun-audio-qrd.dtbo \ + sun-audio-hdk.dtbo \ sun-audio-qrd-sku2.dtbo \ sun-audio-atp.dtbo \ sun-audio-rcm.dtbo \ diff --git a/sun-audio-hdk.dts b/sun-audio-hdk.dts new file mode 100644 index 00000000..49502bef --- /dev/null +++ b/sun-audio-hdk.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-audio-qrd.dtsi" + / { + model = "Qualcomm Technologies, Inc. SunP QRD HDK"; + compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; + qcom,msm-id = <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x1001f 0>; +}; From a08ed244f3ea3a256879f21abefac83bfd7cfbd2 Mon Sep 17 00:00:00 2001 From: Ravulapati Vishnu Vardhan Rao Date: Wed, 20 Mar 2024 11:04:40 +0530 Subject: [PATCH 4/9] ARM: dts: qcom: Add package ID to msm-IDs for sun SoC Add additional msm-IDs to support an additional package ID. Change-Id: If5b8d5c63a0e13c573e76518fe4999b932413e26 Signed-off-by: Ravulapati Vishnu Vardhan Rao --- sun-audio-atp.dts | 4 +++- sun-audio-cdp-nfc.dts | 4 +++- sun-audio-cdp.dts | 4 +++- sun-audio-hamilton-cdp.dts | 4 +++- sun-audio-hamilton-mtp.dts | 4 +++- sun-audio-hamilton-rcm.dts | 4 +++- sun-audio-hdk.dts | 4 +++- sun-audio-mtp-3.5mm.dts | 4 +++- sun-audio-mtp-nfc.dts | 4 +++- sun-audio-mtp-qmp.dts | 4 +++- sun-audio-mtp.dts | 4 +++- sun-audio-qrd-sku2.dts | 4 +++- sun-audio-qrd.dts | 4 +++- sun-audio-rcm.dts | 4 +++- sun-audio-rumi.dts | 4 +++- sun-audio.dts | 4 +++- 16 files changed, 48 insertions(+), 16 deletions(-) diff --git a/sun-audio-atp.dts b/sun-audio-atp.dts index 575dbb4a..37f3e975 100644 --- a/sun-audio-atp.dts +++ b/sun-audio-atp.dts @@ -11,6 +11,8 @@ model = "Qualcomm Technologies, Inc. Sun ATP"; compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp", "qcom,atp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x10021 0>; }; diff --git a/sun-audio-cdp-nfc.dts b/sun-audio-cdp-nfc.dts index c307a023..80d5e254 100644 --- a/sun-audio-cdp-nfc.dts +++ b/sun-audio-cdp-nfc.dts @@ -11,6 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP ST54L NFC"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x50001 0>; }; diff --git a/sun-audio-cdp.dts b/sun-audio-cdp.dts index 65782f6a..f3960ba9 100644 --- a/sun-audio-cdp.dts +++ b/sun-audio-cdp.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <1 0>, <0x50001 0>; }; diff --git a/sun-audio-hamilton-cdp.dts b/sun-audio-hamilton-cdp.dts index df15e4bd..392b4a19 100644 --- a/sun-audio-hamilton-cdp.dts +++ b/sun-audio-hamilton-cdp.dts @@ -13,7 +13,9 @@ / { model = "Qualcomm Technologies, Inc. Sun CDP"; compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x20001 0>, <0x60001 0>; }; diff --git a/sun-audio-hamilton-mtp.dts b/sun-audio-hamilton-mtp.dts index a4db1f54..56cdbfea 100644 --- a/sun-audio-hamilton-mtp.dts +++ b/sun-audio-hamilton-mtp.dts @@ -13,7 +13,9 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x20008 0>, <0x50008 0>; }; diff --git a/sun-audio-hamilton-rcm.dts b/sun-audio-hamilton-rcm.dts index c1de3779..b36404fd 100644 --- a/sun-audio-hamilton-rcm.dts +++ b/sun-audio-hamilton-rcm.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun RCM"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x20015 0>, <0x40015 0>; }; diff --git a/sun-audio-hdk.dts b/sun-audio-hdk.dts index 49502bef..1d1de25b 100644 --- a/sun-audio-hdk.dts +++ b/sun-audio-hdk.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. SunP QRD HDK"; compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; - qcom,msm-id = <639 0x10000>, <639 0x20000>; + qcom,msm-id = <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x1001f 0>; }; diff --git a/sun-audio-mtp-3.5mm.dts b/sun-audio-mtp-3.5mm.dts index 8148cf7a..00c8b934 100644 --- a/sun-audio-mtp-3.5mm.dts +++ b/sun-audio-mtp-3.5mm.dts @@ -19,6 +19,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP with 3.5mm"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x60008 0>; }; diff --git a/sun-audio-mtp-nfc.dts b/sun-audio-mtp-nfc.dts index 674406b5..de023590 100644 --- a/sun-audio-mtp-nfc.dts +++ b/sun-audio-mtp-nfc.dts @@ -13,6 +13,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x30008 0>, <0x40008 0>; }; diff --git a/sun-audio-mtp-qmp.dts b/sun-audio-mtp-qmp.dts index 6bd0e533..ef00d6c8 100644 --- a/sun-audio-mtp-qmp.dts +++ b/sun-audio-mtp-qmp.dts @@ -11,6 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP QMP1000"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp", "qcom,sunp-mtp", "qcom,sunp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x10108 0>, <0x40108 0>; }; diff --git a/sun-audio-mtp.dts b/sun-audio-mtp.dts index 323b7b9a..80e2f9be 100644 --- a/sun-audio-mtp.dts +++ b/sun-audio-mtp.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun MTP"; compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <8 0>; }; diff --git a/sun-audio-qrd-sku2.dts b/sun-audio-qrd-sku2.dts index 914ec927..af418d34 100644 --- a/sun-audio-qrd-sku2.dts +++ b/sun-audio-qrd-sku2.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun QRD"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x2000B 0>; }; diff --git a/sun-audio-qrd.dts b/sun-audio-qrd.dts index 711a5fad..8d0b0a20 100644 --- a/sun-audio-qrd.dts +++ b/sun-audio-qrd.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun QRD"; compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x1000B 0>, <0x3000B 0>; }; diff --git a/sun-audio-rcm.dts b/sun-audio-rcm.dts index e7841ce8..d4d47c70 100644 --- a/sun-audio-rcm.dts +++ b/sun-audio-rcm.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun RCM"; compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x15 0>, <0x30015 0>; }; diff --git a/sun-audio-rumi.dts b/sun-audio-rumi.dts index 2db458a0..9a1b2107 100644 --- a/sun-audio-rumi.dts +++ b/sun-audio-rumi.dts @@ -10,6 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Sun RUMI"; compatible = "qcom,sun-rumi", "qcom,sun", "qcom,rumi"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <15 0>; }; diff --git a/sun-audio.dts b/sun-audio.dts index fc743327..e9362b0b 100644 --- a/sun-audio.dts +++ b/sun-audio.dts @@ -16,6 +16,8 @@ / { model = "Qualcomm Technologies, Inc. Sun"; compatible = "qcom,sun"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0 0>; }; From 5476140d1f8b191687a09d4926b5850725b6827e Mon Sep 17 00:00:00 2001 From: Faiz Nabi Kuchay Date: Thu, 28 Mar 2024 15:26:23 +0530 Subject: [PATCH 5/9] ARM: dts: qcom: Use proper board-id for mtp with qmp Use proper board-id for Sun MTP with qmp attach. Change-Id: I1143c67e78c164fd83b330f9a8d2618433c33293 Signed-off-by: Faiz Nabi Kuchay --- sun-audio-mtp-qmp.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-audio-mtp-qmp.dts b/sun-audio-mtp-qmp.dts index ef00d6c8..35111fb1 100644 --- a/sun-audio-mtp-qmp.dts +++ b/sun-audio-mtp-qmp.dts @@ -14,5 +14,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <0x10108 0>, <0x40108 0>; + qcom,board-id = <0x108 0>, <0x40108 0>; }; From 74eb22dad0580a7e0cca1e57c5f69be590c47080 Mon Sep 17 00:00:00 2001 From: "Vangala, Amarnath" Date: Fri, 22 Mar 2024 14:55:29 +0530 Subject: [PATCH 6/9] ARM: dts: qcom: enable lpm mode for wsa883x supplies Enable low power mode vote for wsa883x supplies. Change-Id: If86407095e35918a7235d3051e121393bb1521fc Signed-off-by: Vangala, Amarnath --- sun-audio-mtp.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sun-audio-mtp.dtsi b/sun-audio-mtp.dtsi index 4b08fb38..82af8e21 100644 --- a/sun-audio-mtp.dtsi +++ b/sun-audio-mtp.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "sun-audio-overlay.dtsi" @@ -120,6 +120,7 @@ cdc-vdd-1p8-supply = <&L15B>; qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; qcom,cdc-static-supplies = "cdc-vdd-1p8"; sound-name-prefix = "SpkrLeft"; }; @@ -132,6 +133,7 @@ cdc-vdd-1p8-supply = <&L15B>; qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; qcom,cdc-static-supplies = "cdc-vdd-1p8"; sound-name-prefix = "SpkrRight"; }; @@ -146,6 +148,7 @@ cdc-vdd-1p8-supply = <&L15B>; qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; qcom,cdc-static-supplies = "cdc-vdd-1p8"; sound-name-prefix = "Spkr2Left"; status = "disabled"; @@ -159,6 +162,7 @@ cdc-vdd-1p8-supply = <&L15B>; qcom,cdc-vdd-1p8-voltage = <1800000 1800000>; qcom,cdc-vdd-1p8-current = <20000>; + qcom,cdc-vdd-1p8-lpm-supported = <1>; qcom,cdc-static-supplies = "cdc-vdd-1p8"; sound-name-prefix = "Spkr2Right"; status = "disabled"; From ed2e451318db2ec63b206a297f871c4898bb4eb0 Mon Sep 17 00:00:00 2001 From: Prasad Kumpatla Date: Thu, 28 Mar 2024 23:42:23 +0530 Subject: [PATCH 7/9] ARM: dts: qcom: enable WCN BT for pineapple Enable BT on pineapple. Change-Id: Id83b9593379f6046cd9e37164ba89ae170614217 Signed-off-by: Prasad Kumpatla --- pineapple-audio-overlay.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pineapple-audio-overlay.dtsi b/pineapple-audio-overlay.dtsi index 9842d780..42e31c80 100644 --- a/pineapple-audio-overlay.dtsi +++ b/pineapple-audio-overlay.dtsi @@ -409,7 +409,7 @@ qcom,model = "pineapple-mtp-snd-card"; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>; qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>; - qcom,wcn-bt = <0>; + qcom,wcn-bt = <1>; qcom,ext-disp-audio-rx = <0>; qcom,tdm-max-slots = <8>; qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; From 96eadb60982736fd2a1431102164095871befa4e Mon Sep 17 00:00:00 2001 From: Kunlei Zhang Date: Fri, 29 Mar 2024 10:56:21 +0800 Subject: [PATCH 8/9] ARM: dts: qcom: add msm id support for sun HDK Add msm id support for sun HDK. Change-Id: I01caed1ccfe565abd5c4ef51f464f4438c08d756 Signed-off-by: Kunlei Zhang --- sun-audio-hdk.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sun-audio-hdk.dts b/sun-audio-hdk.dts index 1d1de25b..d78bb014 100644 --- a/sun-audio-hdk.dts +++ b/sun-audio-hdk.dts @@ -12,6 +12,7 @@ compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; qcom,msm-id = <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; + <0x100027f 0x10000>, <0x100027f 0x20000>, + <618 0x10000>, <618 0x20000>; qcom,board-id = <0x1001f 0>; }; From bd9838ea24e2c292e9c1f4b2f34c2023b259705c Mon Sep 17 00:00:00 2001 From: Deepali Jindal Date: Thu, 21 Mar 2024 10:01:23 +0530 Subject: [PATCH 9/9] dt-bindings: Add support for OPCM port for swr haptics Add support for OPCM port for swr haptics. Change-Id: I96837390282aefb7c2f2542c8e194d9a9954b1df Signed-off-by: Deepali Jindal --- sun-audio-overlay.dtsi | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sun-audio-overlay.dtsi b/sun-audio-overlay.dtsi index 0f0cc03e..4b193856 100644 --- a/sun-audio-overlay.dtsi +++ b/sun-audio-overlay.dtsi @@ -238,7 +238,7 @@ <2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>, <4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>, <6 SPKR_R_BOOST 0x3>, <7 PBR 0x3>, - <8 SPKR_HAPT 0x1>, <9 OCPM 0x3>, + <8 SPKR_HAPT 0x1>, <9 OCPM 0x1>, <10 SPKR_L_VI 0x3>, <11 SPKR_R_VI 0x3>, <12 SPKR_IPCM 0x3>, <13 CPS 0x3>; qcom,swr-num-dev = <3>; @@ -287,7 +287,7 @@ compatible = "qcom,pmih010x-swr-haptics"; reg = <0x03 0xf0170220>; swr-slave-supply = <&hap_swr_slave_reg>; - qcom,rx_swr_ch_map = <0 0x01 0x01 0 SPKR_HAPT>; + qcom,rx_swr_ch_map = <0 0x01 0x01 0 OCPM>; }; }; }; @@ -417,6 +417,12 @@ qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; qcom,audio-core-list = <0>, <1>; + /* + * Add this property, + * To Enable swr haptics through OPCM port. + * This will include wsa2 dailinks. + */ + qcom,dedicated-wsa2; qcom,audio-routing = "AMIC1", "Analog Mic1", "AMIC1", "MIC BIAS1", @@ -449,7 +455,7 @@ "IN1_HPHL", "HPHL_OUT", "IN2_HPHR", "HPHR_OUT", "IN3_EAR", "AUX_OUT", - "HAP_IN", "WSA_HAPT OUT", + "HAP_IN", "WSA2_HAPT OUT", "WSA SRC0_INP", "SRC0", "WSA_TX DEC0_INP", "TX DEC0 MUX", "WSA_TX DEC1_INP", "TX DEC1 MUX",