From 850da8ba8bf5ac72a6a7241d346670dff1cb9181 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 19 Mar 2025 18:41:54 -0700 Subject: [PATCH 1/3] ARM: dts: qcom: Add load current in vote for L3K regulator for Canoe Add load current in vote for L3K regulator for Canoe. Change-Id: Ia93e58b9b9beb4c57277b0b30c4df280b6497359 CRs-Fixed: 4090262 --- canoe-kiwi-cnss.dtsi | 2 +- canoe-peach-cnss.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 4e2bb88f..671da36c 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -104,7 +104,7 @@ vdd-wlan-rfa2-supply = <&S7F>; qcom,vdd-wlan-rfa2-config = <1352000 1400000 0 0 1>; vdd-wlan-ant-share-supply = <&L3K>; - qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-ant-share-config = <1200000 1200000 25 0 1>; vdd-wlan-supply = <&S7G>; qcom,vdd-wlan-config = <952000 1100000 0 0 1>; diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 0b7d7c0f..e2c1c70e 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -121,7 +121,7 @@ vdd-wlan-rfa2-supply = <&S7F>; qcom,vdd-wlan-rfa2-config = <1328000 1340000 0 0 1>; vdd-wlan-ant-share-supply = <&L3K>; - qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-ant-share-config = <1200000 1200000 25 0 1>; interconnects = <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, From 30a7fa058e56763c746dd15aa4a810a709a5869d Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Fri, 21 Mar 2025 16:35:50 +0530 Subject: [PATCH 2/3] ARM: dts: msm: Add WLAN_EN GPIO Support through Linux pinctrl framework Add WLAN_EN GPIO definition to be supported through Linux pinctrl framework. Using Linux pinctrl framework API add support to control WLAN_EN GPIO: 1. Read WLAN_EN GPIO value 2. Change WLAN_EN GPIO value Change-Id: Ic205814b6b38d515b23879673afe76882ad0098b CRs-Fixed: 4093812 --- kera-wcn7750.dtsi | 33 ++++++++++++++++++++++++++++++++- tuna-wcn7750.dtsi | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 64 insertions(+), 2 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index c83a831f..7bde4c31 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -14,6 +14,34 @@ function = "wcn_sw_ctrl"; }; }; + + icnss_wlan_en_active: icnss_wlan_en_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + icnss_wlan_en_sleep: icnss_wlan_en_sleep { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; }; &soc { @@ -70,9 +98,12 @@ sw-ctrl-gpio = <81>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <81>; + pin_wlan-en-gpio = <&tlmm 35 0>; pin_sw-ctrl-gpio = <&tlmm 81 0>; - pinctrl-names = "sw_ctrl"; + pinctrl-names = "sw_ctrl", "wlan_en_active", "wlan_en_sleep"; pinctrl-0 = <&icnss_sw_ctrl>; + pinctrl-1 = <&icnss_wlan_en_active>; + pinctrl-2 = <&icnss_wlan_en_sleep>; interrupts = , , diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index e4ffa766..b2f61c14 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -14,6 +14,34 @@ function = "wcn_sw_ctrl"; }; }; + + icnss_wlan_en_active: icnss_wlan_en_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + icnss_wlan_en_sleep: icnss_wlan_en_sleep { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; }; &soc { @@ -66,9 +94,12 @@ sw-ctrl-gpio =<80>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <80>; + pin_wlan-en-gpio = <&tlmm 35 0>; pin_sw-ctrl-gpio = <&tlmm 80 0>; - pinctrl-names = "sw_ctrl"; + pinctrl-names = "sw_ctrl", "wlan_en_active", "wlan_en_sleep"; pinctrl-0 = <&icnss_sw_ctrl>; + pinctrl-1 = <&icnss_wlan_en_active>; + pinctrl-2 = <&icnss_wlan_en_sleep>; interrupts = , , From 60832f4ab09d14dd01619da1891000609c86c255 Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Tue, 4 Feb 2025 17:19:42 +0530 Subject: [PATCH 3/3] ARM: dts: msm: Enlarge cnss iommu dma memory pool range This change enlarges the iommu dma memory pool range for Milos Ganges wlan attach. Change-Id: I81f3db7d230c43d288725c89ac691ab7083fd8b5 CRs-Fixed: 4053659 --- volcano6i-peach-cnss.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/volcano6i-peach-cnss.dtsi b/volcano6i-peach-cnss.dtsi index 01f1468f..789128ad 100644 --- a/volcano6i-peach-cnss.dtsi +++ b/volcano6i-peach-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 @@ -185,8 +185,8 @@ cnss_pci_iommu_group0: cnss_pci_iommu_group0 { qcom,iommu-msi-size = <0x1000>; - qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; - qcom,iommu-geometry = <0xa0000000 0x10010000>; + qcom,iommu-dma-addr-pool = <0x98000000 0x18000000>; + qcom,iommu-geometry = <0x98000000 0x18001000>; qcom,iommu-dma = "fastmap"; qcom,iommu-pagetable = "coherent"; qcom,iommu-faults = "stall-disable", "HUPCF",