From c54bf768ce127f68e78aa6e64ad2a33b27f25065 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 4 Nov 2024 17:24:11 +0530 Subject: [PATCH 1/8] ARM: dts: msm: Add Kbuild change for kera-wcn7750 This change adds dtbo entry in Kbuild file for kera-wcn7750 dts files. Change-Id: I3f36835bc6b42a3b5daba6bbe9048f6213b4c186 CRs-Fixed: 3966013 --- Kbuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Kbuild b/Kbuild index 3bf79516..f11d6541 100644 --- a/Kbuild +++ b/Kbuild @@ -53,6 +53,9 @@ dtbo-y += kera-atp-qca6750.dtbo dtbo-y += kera-cdp-qca6750.dtbo dtbo-y += kera-mtp-qca6750.dtbo dtbo-y += kera-rcm-qca6750.dtbo +dtbo-y += kera-mtp-wcn7750.dtbo +dtbo-y += kera-qrd-wcn7750.dtbo +dtbo-y += kera-rcm-wcn7750.dtbo endif always-y := $(dtb-y) $(dtbo-y) From 1ea2e7be92929ed393eb030e3c9432d5d6df7403 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 5 Nov 2024 17:40:28 +0530 Subject: [PATCH 2/8] ARM: dts: msm: Update board id for canoe According to latest CDT updates, major version no. is being used to differentiate between different boards instead of subtype. Hence update board-ids to reflect these new CDTs. Change-Id: Ia5440ebafe4c272a9df3b8e89aa02e1b8bce2347 CRs-Fixed: 3967186 --- canoe-kiwi-cnss.dts | 2 +- canoe-peach-cnss.dts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts index 8848ff2a..8f8d5e5c 100644 --- a/canoe-kiwi-cnss.dts +++ b/canoe-kiwi-cnss.dts @@ -15,5 +15,5 @@ qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <0x1000295 0x20000>; - qcom,board-id = <0x1000001 0>, <0x1000008 0>, <0x1000015 0>; + qcom,board-id = <0x30001 0>, <0x20008 0>, <0x30015 0>; }; diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index be41a1ac..37059bc1 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -15,5 +15,7 @@ qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <0x1000295 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x10021 0>, <11 0>, <0x15 0>, <0x208 0>, <0x108 0>; + qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>, + <0x50008 0>, <0x60008 0>, <0x70008 0>, <0x21 0>, <11 0>, + <0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>; }; From be3ada53c722f29bd8fdcb21224a7436c97fb523 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 7 Nov 2024 16:17:55 +0530 Subject: [PATCH 3/8] ARM: dts: msm: Add msm-id for TunaP SoC This change updates msm-id in dt file for TunaP SoC. Change-Id: Ie7a89ab9aaa1547257f1f39cb4a56ed50779da61 CRs-Fixed: 3969241 --- tuna-atp-kiwi.dts | 5 +++-- tuna-cdp-wcn7750.dts | 5 +++-- tuna-mtp-kiwi.dts | 5 +++-- tuna-mtp-qmp1000-wcn7750.dts | 5 +++-- tuna-mtp-wcn7750.dts | 5 +++-- tuna-qrd-wcn7750.dts | 5 +++-- tuna-rcm-kiwi.dts | 5 +++-- tuna-rcm-wcn7750.dts | 5 +++-- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/tuna-atp-kiwi.dts b/tuna-atp-kiwi.dts index f0384004..8592d5d0 100644 --- a/tuna-atp-kiwi.dts +++ b/tuna-atp-kiwi.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna ATP + kiwi WLAN"; - compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp", "qcom,tunap-atp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <33 0>; }; diff --git a/tuna-cdp-wcn7750.dts b/tuna-cdp-wcn7750.dts index 429f4fdc..4bd9ce24 100644 --- a/tuna-cdp-wcn7750.dts +++ b/tuna-cdp-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna CDP"; - compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp", "qcom,tunap-cdp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <1 0>; }; diff --git a/tuna-mtp-kiwi.dts b/tuna-mtp-kiwi.dts index 4930b69c..9312da4e 100644 --- a/tuna-mtp-kiwi.dts +++ b/tuna-mtp-kiwi.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN"; - compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <8 2>, <8 3>; }; diff --git a/tuna-mtp-qmp1000-wcn7750.dts b/tuna-mtp-qmp1000-wcn7750.dts index aca592ef..483dd0a8 100644 --- a/tuna-mtp-qmp1000-wcn7750.dts +++ b/tuna-mtp-qmp1000-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna MTP QMP1000"; - compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <8 1>; }; diff --git a/tuna-mtp-wcn7750.dts b/tuna-mtp-wcn7750.dts index 78379e2f..bace5da0 100644 --- a/tuna-mtp-wcn7750.dts +++ b/tuna-mtp-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna MTP"; - compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp", "qcom,tunap-mtp", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <8 0>, <8 4>; }; diff --git a/tuna-qrd-wcn7750.dts b/tuna-qrd-wcn7750.dts index dfd9ea29..f4df9fe5 100644 --- a/tuna-qrd-wcn7750.dts +++ b/tuna-qrd-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna QRD"; - compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd", "qcom,tunap-qrd", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <11 0>; }; diff --git a/tuna-rcm-kiwi.dts b/tuna-rcm-kiwi.dts index ab921bac..4d432b0e 100644 --- a/tuna-rcm-kiwi.dts +++ b/tuna-rcm-kiwi.dts @@ -10,7 +10,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna RCM + kiwi WLAN"; - compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm", "qcom,tunap-rcm", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <21 1>; }; diff --git a/tuna-rcm-wcn7750.dts b/tuna-rcm-wcn7750.dts index c2796916..8647ad3e 100644 --- a/tuna-rcm-wcn7750.dts +++ b/tuna-rcm-wcn7750.dts @@ -11,7 +11,8 @@ / { model = "Qualcomm Technologies, Inc. Tuna RCM"; - compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; - qcom,msm-id = <655 0x10000>, <681 0x10000>; + compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm", "qcom,tunap-rcm", + "qcom,tunap"; + qcom,msm-id = <655 0x10000>, <681 0x10000>, <694 0x10000>; qcom,board-id = <21 0>; }; From 8bec94f16fc623c3634ee442606e3381669c64fa Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Wed, 13 Nov 2024 14:58:34 +0530 Subject: [PATCH 4/8] ARM: dts: msm: Add UFS2.2 board-id support for kera This change adds UFS2.2 board-id support for kera in wlan device tree. Change-Id: I0352b4a60431dbfff5e007ffe50307c64b006c6b CRs-Fixed: 3973754 --- kera-rcm-qca6750.dts | 2 +- kera-rcm-wcn7750.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kera-rcm-qca6750.dts b/kera-rcm-qca6750.dts index c2f8023d..2d85e58a 100644 --- a/kera-rcm-qca6750.dts +++ b/kera-rcm-qca6750.dts @@ -12,5 +12,5 @@ model = "Qualcomm Technologies, Inc. Kera RCM"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm"; qcom,msm-id = <686 0x10000>, <659 0x10000>; - qcom,board-id = <0x010015 0>, <0x020015 0>; + qcom,board-id = <0x010015 0>, <0x020015 0>, <0x030015 0>; }; diff --git a/kera-rcm-wcn7750.dts b/kera-rcm-wcn7750.dts index a9932d75..8fac3c24 100644 --- a/kera-rcm-wcn7750.dts +++ b/kera-rcm-wcn7750.dts @@ -12,5 +12,5 @@ model = "Qualcomm Technologies, Inc. Kera RCM"; compatible = "qcom,kera-rcm", "qcom,kera", "qcom,rcm"; qcom,msm-id = <686 0x10000>, <659 0x10000>; - qcom,board-id = <0x010015 1>, <0x020015 1>; + qcom,board-id = <0x010015 1>, <0x020015 1>, <0x030015 1>; }; From c363c6f81f09af2ce46a8c52ce11f72c44cda313 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Tue, 19 Nov 2024 20:47:21 +0530 Subject: [PATCH 5/8] ARM: dts: msm: Update iommu sid to the correct value This change updates the iommu sid to the correct value. Change-Id: I0e18e2e3137aec8ad26f3cb781e0cd321da84c2c CRs-Fixed: 3979551 --- tuna-wcn7750.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 2369b84e..d4f57563 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -43,7 +43,7 @@ <0xc0000000 0x10000>; reg-names = "msi_addr", "smmu_iova_ipa"; qcom,rproc-handle = <&wpss_pas>; - iommus = <&apps_smmu 0x1480 0x1>; + iommus = <&apps_smmu 0x1400 0x1>; wlan-en-gpio =<35>; host-sol-gpio =<132>; dev-sol-gpio =<32>; From cf34e162b555177ba7554fb8fa85f0313d98334b Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Wed, 23 Oct 2024 10:30:38 +0530 Subject: [PATCH 6/8] ARM: dts: msm: Add board id for wcn6750 in Milos target Add board id IDP3/4 with wcn6750 and enable icnss2 node for Milos target. Change-Id: I22b260d938a712923bbc847b72843fd4cf02e330 CRs-Fixed: 3956703 --- volcano-qca6750.dts | 2 +- volcano-qca6750.dtsi | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/volcano-qca6750.dts b/volcano-qca6750.dts index 385ad760..66f08a9b 100644 --- a/volcano-qca6750.dts +++ b/volcano-qca6750.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Volcano SoC"; compatible = "qcom,volcano"; qcom,msm-id = <636 0x10000>, <640 0x10000>, <0x4000291 0x10000>, <0x8000291 0x10000>, <0xc000291 0x10000>, <0x10000291 0x10000>, <0x4000292 0x10000>, <0x8000292 0x10000>, <0xc000292 0x10000>, <0x10000292 0x10000>; - qcom,board-id = <0 0>; + qcom,board-id = <33 0>, <34 0>, <34 1>, <8 0>, <8 1>, <8 7>, <8 8>, <11 0>, <11 1>; }; diff --git a/volcano-qca6750.dtsi b/volcano-qca6750.dtsi index f0755dec..e1b2faf3 100644 --- a/volcano-qca6750.dtsi +++ b/volcano-qca6750.dtsi @@ -43,7 +43,6 @@ reg-names = "msi_addr", "smmu_iova_ipa"; qcom,rproc-handle = <&wpss_pas>; iommus = <&apps_smmu 0x1400 0x1>; - status = "disabled"; interrupts = , , , From 26e91776a99932d79f5a854dfb03b3335900ed19 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Fri, 22 Nov 2024 15:13:11 +0530 Subject: [PATCH 7/8] ARM: dts: msm: Add L3G regulator config in tuna-wcn7750.dtsi This change adds L3G regulator config in tuna-wcn7750.dtsi. Change-Id: I7262d0c507217cf5ef6e56929015bda8438048f7 CRs-Fixed: 3982014 --- tuna-wcn7750.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 2369b84e..58d399ba 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -97,6 +97,8 @@ qcom,vdd-1.8-xo-config = <1856000 2104000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; + vdd-1.8-io-supply = <&L3G>; + qcom,vdd-1.8-io-config = <1800000 1800000 0 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, From f1f051017cdc274ccff337b2d55e59f4304c3821 Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Thu, 21 Nov 2024 17:32:10 +0530 Subject: [PATCH 8/8] ARM: dts: msm: Do not unvote S1L and S1K regulator in volcano AON and Digital supply regulator needs to be always voted if wlan is on, so remove need_unvote bit for S1K and S1L for volcano IOT (Brahma) target. Change-Id: I156a8e7c7dcbeecbfd8c27bf0cb738b6e0b9300b CRs-Fixed: 3984342 --- volcano6i-peach-cnss.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volcano6i-peach-cnss.dtsi b/volcano6i-peach-cnss.dtsi index b5444e2c..7ef1b8e5 100644 --- a/volcano6i-peach-cnss.dtsi +++ b/volcano6i-peach-cnss.dtsi @@ -96,9 +96,9 @@ vdd-wlan-io12-supply = <&L5B>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-aon-supply = <&S1K>; - qcom,vdd-wlan-aon-config = <876000 1004000 0 0 1>; + qcom,vdd-wlan-aon-config = <876000 1004000 0 0 0>; vdd-wlan-dig-supply = <&S1L>; - qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; + qcom,vdd-wlan-dig-config = <876000 1000000 0 0 0>; vdd-wlan-rfa1-supply = <&S1B>; qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S2B>;