Merge f7e9e51aa9 on remote branch

Change-Id: Id5f86c7718bdadd0a6efca3f42b4bcadbf4884df
This commit is contained in:
Linux Build Service Account
2025-04-17 03:00:41 -07:00
5 changed files with 69 additions and 7 deletions

View File

@@ -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>;

View File

@@ -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>,

View File

@@ -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 = <GIC_SPI 768 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 769 IRQ_TYPE_EDGE_RISING>,

View File

@@ -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 = <GIC_SPI 768 IRQ_TYPE_EDGE_RISING>,
<GIC_SPI 769 IRQ_TYPE_EDGE_RISING>,

View File

@@ -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 <dt-bindings/interconnect/qcom,volcano.h>
@@ -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",