From 32049a7d631df561864b6ec212e59d08beed4320 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 26 Dec 2024 14:28:56 +0530 Subject: [PATCH 01/10] ARM: dts: msm: Add 1.2 io rail voting for wcn7750 This change adds 1.2 io rail voting for wcn7750. Change-Id: I97bcc835af2f6b248db5633a8c030aa218ef893b CRs-Fixed: 4019711 --- tuna-wcn7750.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 968519f2..75108cd3 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -103,6 +103,8 @@ 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>; + vdd-1.2-io-supply = <&L2G>; + qcom,vdd-1.2-io-config = <1200000 1200000 30000 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, From 34cdb7bf468ea03ff501c544c16114e68e97817a Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Fri, 27 Dec 2024 15:39:53 +0530 Subject: [PATCH 02/10] ARM: dts: msm: Add support to set FUNC_SEL & wake set for GPIO Add support to set function to "wcn_sw_ctrl" & set mpm_wake_set for SW_CTRL GPIO so that, when this GPIO goes high, PDC get interrupted and TCS sequence (which enables RF_CLK) can be started. Change-Id: Ifdff31f6ad6286a32c3a6f8b500cb6b55b97eb42 CRs-Fixed: 4020424 --- bindings/icnss-wlan.yaml | 3 +++ kera-qca6750.dtsi | 17 ++++++++++++++++- kera-wcn7750.dtsi | 17 ++++++++++++++++- tuna-wcn7750.dtsi | 17 ++++++++++++++++- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/bindings/icnss-wlan.yaml b/bindings/icnss-wlan.yaml index 9801cf83..89a9ea41 100644 --- a/bindings/icnss-wlan.yaml +++ b/bindings/icnss-wlan.yaml @@ -86,6 +86,9 @@ properties: qcom,smp2p_map_wlan_1_in: description: Represents the in smp2p to wlan driver from modem. + pin-ctrl-support: + description: Represents pin_ctrl support is present or not. + required: - compatible - reg diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 30d254f0..f3b43633 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -6,6 +6,15 @@ #include +&tlmm { + icnss_sw_ctrl: icnss_sw_ctrl { + mux { + pins = "gpio81"; + function = "wcn_sw_ctrl"; + }; + }; +}; + &soc { qcom,smp2p-wpss { smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { @@ -46,7 +55,12 @@ wlan-en-gpio = <35>; host-sol-gpio = <33>; dev-sol-gpio = <32>; - wlan-sw-ctrl-gpio = <81>; + sw-ctrl-gpio = <81>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <81>; + pinctrl-names = "sw_ctrl"; + pinctrl-0 = <&icnss_sw_ctrl>; + interrupts = , , , @@ -85,6 +99,7 @@ qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; qcom,iommu-geometry = <0xb0000000 0x10010000>; dma-coherent; + pin-ctrl-support; qcom,fw-prefix; qcom,wlan; tsens = "sys-therm-3"; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 4ab7aeaa..c7706585 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -7,6 +7,15 @@ #include #include +&tlmm { + icnss_sw_ctrl: icnss_sw_ctrl { + mux { + pins = "gpio81"; + function = "wcn_sw_ctrl"; + }; + }; +}; + &soc { qcom,smp2p-wpss { smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { @@ -58,7 +67,12 @@ wlan-en-gpio = <35>; host-sol-gpio = <33>; dev-sol-gpio = <32>; - wlan-sw-ctrl-gpio = <81>; + sw-ctrl-gpio = <81>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <81>; + pinctrl-names = "sw_ctrl"; + pinctrl-0 = <&icnss_sw_ctrl>; + interrupts = , , , @@ -94,6 +108,7 @@ qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; dma-coherent; + pin-ctrl-support; qcom,fw-prefix; qcom,wlan; tsens = "sys-therm-3"; diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index c0c276c3..554c04cc 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -7,6 +7,15 @@ #include #include +&tlmm { + icnss_sw_ctrl: icnss_sw_ctrl { + mux { + pins = "gpio80"; + function = "wcn_sw_ctrl"; + }; + }; +}; + &soc { qcom,smp2p-wpss { smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { @@ -54,7 +63,12 @@ wlan-en-gpio =<35>; host-sol-gpio =<132>; dev-sol-gpio =<32>; - wlan-sw-ctrl-gpio =<80>; + sw-ctrl-gpio =<80>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <80>; + pinctrl-names = "sw_ctrl"; + pinctrl-0 = <&icnss_sw_ctrl>; + interrupts = , , , @@ -90,6 +104,7 @@ qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; dma-coherent; + pin-ctrl-support; qcom,fw-prefix; qcom,wlan; tsens = "sys-therm-3"; From ce029761937392b446f5a10c0a2ec58f71332d10 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 10 Jan 2025 17:12:56 +0530 Subject: [PATCH 03/10] ARM: dts: msm: Update 1.2 io rail voting for wcn7750 This change updates 1.2 io rail voting config to set load_ua to 0 for wcn7750. Change-Id: Icb75e904a342825787363fd2182ffe90e65d3a0a CRs-Fixed: 4022821 --- tuna-wcn7750.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 5c1417a7..f01d6ff0 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -119,7 +119,7 @@ vdd-1.8-io-supply = <&L3G>; qcom,vdd-1.8-io-config = <1800000 1800000 0 0 0>; vdd-1.2-io-supply = <&L2G>; - qcom,vdd-1.2-io-config = <1200000 1200000 30000 0 0>; + qcom,vdd-1.2-io-config = <1200000 1200000 0 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, From 6fecf46ae74c3701b19d82d2e9c8596c17ada1f5 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 10 Jan 2025 17:36:40 +0530 Subject: [PATCH 04/10] ARM: dts: msm: Add 1.8 io rail voting for qca6750 This change adds 1.8 io rail voting for qca6750. Change-Id: I786331ba394de843202425d6c72849619329712a CRs-Fixed: 4026861 --- kera-qca6750.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index f3b43633..b2c757cc 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -111,6 +111,8 @@ qcom,vdd-1.8-xo-config = <1856000 2040000 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 = <&L11B>; + 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 1e9937d14b4882a4f15317ae2ec5d9c0c5ed5233 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Wed, 15 Jan 2025 12:55:21 +0530 Subject: [PATCH 05/10] ARM: dts: msm: Add support for wcn_hw_version for wcn7750 This change adds support for wcn_hw_version for wcn7750 target. Change-Id: I520533a008173c2013d7f53b84a62fc3e3836901 CRs-Fixed: 4027114 --- tuna-wcn7750.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index f01d6ff0..9e58aa47 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -108,6 +108,7 @@ qcom,fw-prefix; qcom,wlan; tsens = "sys-therm-3"; + wcn-hw-version = "wcn7750"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; From 27f0d25e518b59922ea45f7c3bee6a86a72c477d Mon Sep 17 00:00:00 2001 From: Rohit Bhatia Date: Thu, 16 Jan 2025 18:39:54 +0530 Subject: [PATCH 06/10] ARM: dts: msm: Add support for wcn_hw_version for kera This change adds support for wcn_hw_version for kera target. Change-Id: I63974149bcdbeaa798880a81f9152b319b60989f CRs-Fixed: 4027509 --- kera-qca6750.dtsi | 3 ++- kera-wcn7750.dtsi | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index f3b43633..07bc84a5 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -103,6 +103,7 @@ qcom,fw-prefix; qcom,wlan; tsens = "sys-therm-3"; + wcn-hw-version = "qca6750"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index c7706585..e043257f 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -112,6 +112,7 @@ qcom,fw-prefix; qcom,wlan; tsens = "sys-therm-3"; + wcn-hw-version = "wcn7750"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; From dd35131642deec6c23387b7f6449d72473f8c068 Mon Sep 17 00:00:00 2001 From: Bhasker Reddy Komatireddy Date: Tue, 7 Jan 2025 15:41:15 +0530 Subject: [PATCH 07/10] ARM: dts: msm: add kera-iot board support for kera CDP platform add wlan dts support for kera-iot board on kera CDP platform. Change-Id: I81ee9c55970967139d32aa0ca9305ce0e9c5c941 --- kera-cdp-qca6750.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kera-cdp-qca6750.dts b/kera-cdp-qca6750.dts index bae28946..3af64591 100644 --- a/kera-cdp-qca6750.dts +++ b/kera-cdp-qca6750.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ /dts-v1/; @@ -12,5 +12,5 @@ model = "Qualcomm Technologies, Inc. Kera CDP"; compatible = "qcom,kera-cdp", "qcom,kera", "qcom,cdp"; qcom,msm-id = <686 0x10000>, <659 0x10000>; - qcom,board-id = <0x010001 0>, <0x020001 0>, <0x030001 0>, <0x040001 0>; + qcom,board-id = <0x010001 0>, <0x020001 0>, <0x030001 0>, <0x040001 0>, <0x50001 0>; }; From f9bf590c6d454dbbc92c74fd51ca7db808d99058 Mon Sep 17 00:00:00 2001 From: Manikanta Pubbisetty Date: Thu, 16 Jan 2025 16:12:24 +0530 Subject: [PATCH 08/10] ARM: dts: msm: Reduce WLAN IB voting for tuna Reduce WLAN IB voting for certain high bandwidth throughput cases for tuna. Change-Id: I61fd950c757d25f6fa0c77827fcd26c5e0441662 CRs-Fixed: 4038103 --- tuna-wcn7750.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 9e58aa47..6ac6322c 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -150,12 +150,12 @@ <30000 400000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ <100000 400000>, - /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 1612000>, - /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 1612000>, - /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 2171000>, + /* very high: > 1200 Mbps snoc/anoc: 200 Mhz */ + <175000 800000>, + /* ultra high: DBS mode snoc/anoc: 200 Mhz */ + <312500 800000>, + /* super high: DBS mode snoc/anoc: 403 Mhz */ + <587500 1612000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ <7500 800000>, From d60893d7960a06ca7a972d8504e13e2b3d185391 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Thu, 23 Jan 2025 16:32:22 +0530 Subject: [PATCH 09/10] ARM: dts: msm: Reduce regulator voltage vote for tuna-wcn7750 This change reduces regulator voltage vote for tuna-wcn7750 due to AHC feature enablement. The AHC algorithm adds an offset voltage of 16mV on top of the voltage voted on each buck. Change-Id: I1caf2d670927fe7cd4be2904d979c0ab8ca6505a CRs-Fixed: 4040677 --- tuna-wcn7750.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index f01d6ff0..0fe3c7e6 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -111,11 +111,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; + qcom,vdd-cx-mx-config = <864000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2104000 0 0 0>; + qcom,vdd-1.8-xo-config = <1840000 2104000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; + qcom,vdd-1.3-rfa-config = <1240000 1408000 0 0 0>; vdd-1.8-io-supply = <&L3G>; qcom,vdd-1.8-io-config = <1800000 1800000 0 0 0>; vdd-1.2-io-supply = <&L2G>; From 1e834e90700e7cc13efd3b2dd2a133193e3058a1 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Thu, 30 Jan 2025 11:01:08 +0530 Subject: [PATCH 10/10] ARM: dts: msm: Update load value for L2G/L3G regulator Add 30000 uA load for L2G/L3G regulator voting during boot up before WLAN HW is brought out of reset. Change-Id: Iff34b9cd735d42d8ee1c8bd5eee0bcd534fc3aee CRs-Fixed: 4040675 --- canoe-kiwi-cnss.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 1068fdcc..7f6bc1d1 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause /* - * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-aon-supply = <&L2G>; - qcom,vdd-wlan-aon-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-aon-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L3G>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-cx-supply = <&S1J>; qcom,vdd-wlan-cx-config = <968000 1000000 0 0 1>; vdd-wlan-dig-supply = <&S2J>;