From fbd0264524796080033c5433aa3f106255456e1e Mon Sep 17 00:00:00 2001 From: Gerrit SelfHelp Service Account Date: Wed, 18 Oct 2023 23:12:26 -0700 Subject: [PATCH 001/120] Initial empty repository From 671e79bb924e53c59851ae282585fe6af2d86aed Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Thu, 28 Dec 2023 15:20:50 +0530 Subject: [PATCH 002/120] ARM: dts: msm: Add opensource wlan device tree support for Sun Add wlan opensource device tree support for Sun SOC. Change-Id: I1e7d46f5724ded66a0165ff4858b2238c94d58e2 --- Kbuild | 10 ++ Makefile | 10 ++ bindings/cnss-wlan.yaml | 357 +++++++++++++++++++++++++++++++++++++++ bindings/icnss-wlan.yaml | 138 +++++++++++++++ sun-kiwi-cnss-v8.dts | 18 ++ sun-kiwi-cnss-v8.dtsi | 169 ++++++++++++++++++ sun-kiwi-cnss.dts | 17 ++ sun-kiwi-cnss.dtsi | 171 +++++++++++++++++++ sun-peach-cnss-v8.dts | 18 ++ sun-peach-cnss-v8.dtsi | 140 +++++++++++++++ sun-peach-cnss.dts | 18 ++ sun-peach-cnss.dtsi | 133 +++++++++++++++ 12 files changed, 1199 insertions(+) create mode 100644 Kbuild create mode 100644 Makefile create mode 100644 bindings/cnss-wlan.yaml create mode 100644 bindings/icnss-wlan.yaml create mode 100644 sun-kiwi-cnss-v8.dts create mode 100644 sun-kiwi-cnss-v8.dtsi create mode 100644 sun-kiwi-cnss.dts create mode 100644 sun-kiwi-cnss.dtsi create mode 100644 sun-peach-cnss-v8.dts create mode 100644 sun-peach-cnss-v8.dtsi create mode 100644 sun-peach-cnss.dts create mode 100644 sun-peach-cnss.dtsi diff --git a/Kbuild b/Kbuild new file mode 100644 index 00000000..c145349b --- /dev/null +++ b/Kbuild @@ -0,0 +1,10 @@ +ifeq ($(CONFIG_ARCH_SUN),y) +dtbo-y += sun-kiwi-cnss.dtbo +dtbo-y += sun-kiwi-cnss-v8.dtbo +dtbo-y += sun-peach-cnss.dtbo +dtbo-y += sun-peach-cnss-v8.dtbo +endif + +always-y := $(dtb-y) $(dtbo-y) +subdir-y := $(dts-dirs) +clean-files := *.dtb *.dtbo diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..4b03b08a --- /dev/null +++ b/Makefile @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0 +KBUILD_OPTIONS += KBUILD_EXTMOD_DTS=. + +all: dtbs + +clean: + $(MAKE) -C $(KERNEL_SRC) M=$(M) clean + +%: + $(MAKE) -C $(KERNEL_SRC) M=$(M) $@ $(KBUILD_OPTIONS) diff --git a/bindings/cnss-wlan.yaml b/bindings/cnss-wlan.yaml new file mode 100644 index 00000000..e2ef1e30 --- /dev/null +++ b/bindings/cnss-wlan.yaml @@ -0,0 +1,357 @@ +# Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- + +title: Connectivity SubSystem Platform Driver + +description: + Connectivity SubSystem platform driver adds support for the CNSS subsystem + used for PCIe based Wi-Fi devices. It also adds support to integrate PCIe + WLAN module to subsystem restart framework. Apart from that, it also manages + the 3.3V voltage regulator, WLAN Enable GPIO signal and PCIe link dynamically + with support for suspend and resume by retaining the PCI config space + states when PCIe link is shutdown. The main purpose of this device tree + entry below is to invoke the CNSS platform driver and provide handle to + the WLAN enable GPIO, 3.3V fixed voltage regulator resources. It also + provides the reserved RAM dump memory location and size. + +properties: + compatible: + enum: + - qcom,cnss #for QCA6174 device + - qcom,cnss-qca6290 #for QCA6290 device + - qcom,cnss-qca6390 #for QCA6390 device + - qcom,cnss-qca6490 #for QCA6490 device + - qcom,cnss-kiwi #for KIWI device + - qcom,cnss-qca-converged #for converged QCA devices + + wlan-en-gpio: + description: WLAN_EN GPIO signal specified by the chip specifications. + + vdd-wlan-supply: + description: phandle to the regulator device tree node. + + pinctrl-names: + description: Names corresponding to the numbered pinctrl states. + + pinctrl-: + description: | + Pinctrl states as described in + bindings/pinctrl/pinctrl-bindings.txt. + + qcom,wlan-rc-num: + description: | + List of PCIe root complex numbers which WLAN device may + attach to. + + qcom,wlan: + description: | + Signature string for WLAN devices which all CNSS family drivers + are able to search for. + + mpm_wake_set_gpios: + description: | + U32 array of GPIOs which need to be setup for + interrupt wakeup capable. + + qcom,notify-modem-status: + description: | + Boolean property to decide whether modem + notification should be enabled or not in this + platform. + + wlan-soc-swreg-supply: + description: phandle to the external 1.15V regulator for QCA6174. + + wlan-ant-switch-supply: + description: | + phandle to the 2.7V regulator for the antenna + switch of QCA6174. + + qcom,wlan-uart-access: + description: | + Boolean property to decide whether QCA6174 + has exclusive access to UART. + + vdd-wlan-io-supply: + description: phandle to the 1.8V IO regulator for QCA6174. + + vdd-wlan-io12-supply: + description: phandle to the 1.2V IO regulator for Kiwi. + + vdd-wlan-ant-share-supply: + description: phandle to the Antenna Sharing regulator. + + vdd-wlan-xtal-supply: + description: phandle to the 1.8V XTAL regulator for QCA6174. + + vdd-wlan-xtal-aon-supply: + description: | + phandle to the LDO-4 regulator. This is needed + on platforms where XTAL regulator depends on + always on regulator in VDDmin. + + vdd-wlan-ctrl1-supply: + description: | + phandle to the DBU1 - 1.8V for QCA6595 or 3.3V for + QCA6174 on auto platform. + + vdd-wlan-ctrl2-supply: + description: | + phandle to the DBU4 - 2.2V for QCA6595 or 3.85V for + QCA6696 on auto platform. + + vdd-wlan-core-supply: + description: phandle to the 1.3V CORE regulator for QCA6174. + + vdd-wlan-sp2t-supply: + description: phandle to the 2.7V SP2T regulator for QCA6174. + + -supply: + description: | + phandle to the regulator device tree node. + optional "supply-name" is "vdd-wlan-rfa". + + qcom,-config: + description: | + Specifies voltage levels for supply. Should specified + in pairs (min, max), units uV. There can be optional + load in uA and Regulator settle delay in us. + + qcom,smmu-s1-enable: + description: | + Boolean property to decide whether to enable SMMU + S1 stage or not. + + qcom,wlan-smmu-iova-address: + description: | + I/O virtual address range as + format to be used for allocations associated + between WLAN/PCIe and SMMU. + + qcom,wlan-ramdump-dynamic: + description: | + To enable CNSS RAMDUMP collection + by providing the size of CNSS DUMP. + + qcom,cmd_db_name: + description: | + CommandDB name indicating the PMIC rail used for open + loop CPR. + + reg: + description: Memory regions defined as starting address and size. + + reg-names: + description: Names of the memory regions defined in reg entry. + + wlan-bootstrap-gpio: + description: | + WLAN_BOOTSTRAP GPIO signal specified by QCA6174 + which should be drived depending on platforms. + + qcom,is-dual-wifi-enabled: + description: | + Boolean property to control wlan enable(wlan-en) + gpio on dual-wifi platforms. + + vdd-wlan-en-supply: + description: | + WLAN_EN fixed regulator specified by QCA6174 + specifications. + + qcom,wlan-en-vreg-support: + description: | + Boolean property to decide the whether the + WLAN_EN pin is a gpio or fixed regulator. + + qcom,mhi: + description: phandle to indicate the device which needs MHI support. + + qcom,cap-tsf-gpio: + description: | + WLAN_TSF_CAPTURED GPIO signal specified by the chip + specifications, should be drived depending on products. + + cnss-daemon-support: + description: | + Boolean property to decide whether cnss_daemon + userspace QMI client is supported. + + use-nv-mac: + description: Boolean property to indicate whether NV MAC is used or not. + + qcom,set-wlaon-pwr-ctrl: + description: | + Boolean property to indicate if set + WLAON_QFPROM_PWR_CTRL_REG register during power on + and off sequences. + + use-pm-domain: + description: | + Boolean property to indicate if driver needs to use PM + domain or not. + + qcom,wlan-cbc-enabled: + description: boolean property to control cold boot calibration. + + interconnects: + description: Interconnect framework setup for bus configuration. + + interconnect-names: + description: Interconnect path names as strings. + + qcom,icc-path-count: + description: Number of Interconnect paths for this platform. + + qcom,bus-bw-cfg-count: + description: Number of bus bandwidth voting cases. + + qcom,bus-bw-cfg: + description: Bus bandwidth voting data. + + qcom,tcs_offset_int_pow_amp_vreg: + description: | + TCS CMD register offset for Voltage + regulator used in internal power amplifier for QCA6490. + + cnss-enable-self-recovery: + description: | + Boolean property to enable self recovery when + recovery is trigeered with reason link down. + + qcom,bt-en-gpio: + description: | + QCA6490 requires synchronization for BT and WLAN GPIO + enable to resolve PMU power up issues. Provide BT GPIO using + this config param. + + qcom,same-dt-multi-dev: + description: | + Boolean property to decide whether it supports + multiple WLAN devices using the same DT node + without sub-nodes. + + qcom,converged-dt: + description: | + Boolean property to decide whether it supports multiple + WLAN devices using the same DT node with sub-nodes. + + mboxes: + description: Specifies mbox channel data for AOP messaging. + + qcom,vreg_ipa: + description: | + Specifies voltage regulator used for WLAN device internal + power amp config. + + qcom,xo-clk-gpio: + description: Added for QCA6490 XO CLK selection leakage prevention. + + platform-name-required: + description: | + Boolean property to decide whether + platform name required. + + chip_cfg@X: + description: represent chip specific configurations + enum: + -supported-ids #U32 array to decide which device ids are supported by sub node. + +required: + - compatible + - wlan-en-gpio + - vdd-wlan-supply + - pinctrl-names + - pinctrl- + - qcom,wlan-rc-num + - qcom,wlan + +examples: + - | + qcom,cnss@0d400000 { + compatible = "qcom,cnss"; + reg = <0x0d400000 0x200000>; + reg-names = "ramdump"; + qcom,wlan-ramdump-dynamic = <0x200000>; + wlan-en-gpio = <&msmgpio 82 0>; + vdd-wlan-supply = <&wlan_vreg>; + qcom,notify-modem-status; + wlan-soc-swreg-supply = <&pma8084_l27>; + pinctrl-names = "default"; + pinctrl-0 = <&cnss_default>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-smmu-iova-address = <0 0x10000000>; + qcom,mhi = <&mhi_wlan>; + qcom,cap-tsf-gpio = <&tlmm 126 1>; + }; + + wlan: qcom,cnss-qca6490@b0000000 { + compatible = "qcom,cnss-qca6490"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + wlan-en-gpio = <&tlmm 80 0>; + qcom,bt-en-gpio = <&tlmm 81 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x420000>; + qcom,wlan-cbc-enabled; + use-pm-domain; + cnss-enable-self-recovery; + qcom,same-dt-multi-dev; + mboxes = <&qmp_aop 0>; + qcom,vreg_ipa="s3e"; + qcom,xo-clk-gpio = <&tlmm 204 0>; + vdd-wlan-aon-supply = <&S2E>; + qcom,vdd-wlan-aon-config = <1012000 1012000 0 0 1>; + vdd-wlan-dig-supply = <&S11B>; + qcom,vdd-wlan-dig-config = <966000 966000 0 0 1>; + vdd-wlan-io-supply = <&S10B>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-rfa1-supply = <&S1C>; + qcom,vdd-wlan-rfa1-config = <1900000 2100000 0 0 1>; + vdd-wlan-rfa2-supply = <&S12B>; + qcom,vdd-wlan-rfa2-config = <1350000 1350000 0 0 1>; + wlan-ant-switch-supply = <&L7E>; + qcom,wlan-ant-switch-config = <2800000 2800000 0 0 1>; + }; + + wlan: qcom,cnss-qca-converged { + compatible = "qcom,cnss-qca-converged"; + qcom,converged-dt; + qcom,wlan-sw-ctrl-gpio = <&tlmm 83 0>; + chip_cfg@0 { + supported-ids = <0x1103>; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + wlan-en-gpio = <&tlmm 80 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + qcom,wlan-cbc-enabled; + use-pm-domain; + mboxes = <&qmp_aop 0>; + vdd-wlan-io-supply = <&L15B>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-supply = <&S5G>; + qcom,vdd-wlan-config = <1000000 1000000 0 0 1>; + vdd-wlan-aon-supply = <&S2G>; + qcom,vdd-wlan-aon-config = <980000 980000 0 0 1>; + vdd-wlan-dig-supply = <&S4E>; + qcom,vdd-wlan-dig-config = <950000 950000 0 0 1>; + vdd-wlan-rfa1-supply = <&S6G>; + qcom,vdd-wlan-rfa1-config = <1900000 1900000 0 0 1>; + vdd-wlan-rfa2-supply = <&S4G>; + qcom,vdd-wlan-rfa2-config = <1350000 1350000 0 0 1>; + }; + }; +... + diff --git a/bindings/icnss-wlan.yaml b/bindings/icnss-wlan.yaml new file mode 100644 index 00000000..1d8903fe --- /dev/null +++ b/bindings/icnss-wlan.yaml @@ -0,0 +1,138 @@ +# Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- + +title: Integrated connectivity Platform Driver + +description: + Integrated connectivity platform driver adds support for the Integrated WLAN + that runs on Q6 based platforms. WLAN FW on these architecture runs on Q6. This + platform driver communicates with WLAN FW over QMI, WLAN on/off messages + to FW are communicated thru this interface. This driver also listens to + WLAN PD restart notifications. + +properties: + compatible: + enum: + - qcom,icnss #for ADRASTEA architecture + - qcom,wcn6750 #for iWCN architecture + - qcom,wcn6450 #for evros architecture + + reg: + description: Memory regions defined as starting address and size. + + reg-names: + description: Names of the memory regions defined in reg entry. + + interrupts: + description: Copy engine interrupt table. + + qcom,wlan-msa-memory: + description: MSA memory size. + + clocks: + description: List of clock phandles. + + clock-names: + description: List of clock names corresponding to the "clocks" property. + + iommus: + description: SMMUs and corresponding Stream IDs needed by WLAN. + + qcom,wlan-smmu-iova-address: + description: | + I/O virtual address range as + format to be used for allocations associated between WLAN and SMMU. + + qcom,wlan: + description: | + Signature string for WLAN devices which all CNSS family drivers + are able to search for. + + -supply: + description: | + phandle to the regulator device tree node + optional "supply-name" is "vdd-0.8-cx-mx". + + qcom,-config: + description: | + Specifies voltage levels for supply. Should be + specified in pairs (min, max), units uV. There can + be optional load in uA and Regulator settle delay in + uS. + qcom,icnss-vadc: + description: VADC handle for vph_pwr read APIs. + + qcom,icnss-adc_tm: + description: VADC handle for vph_pwr notification APIs. + + io-channels: + description: IIO channel to monitor for vph_pwr power. + + io-channel-names: + description: IIO channel name as per the client name. + + qcom,smmu-s1-bypass: + description: Boolean context flag to set SMMU to S1 bypass. + + qcom,wlan-msa-fixed-region: + description: phandle, specifier pairs to children of /reserved-memory. + + qcom,hyp_disabled: + description: Boolean context flag to disable hyperviser. + + qcom,smp2p_map_wlan_1_in: + description: Represents the in smp2p to wlan driver from modem. + +required: + - compatible + - reg + - reg-names + - interrupts + - qcom,wlan-msa-memory + - clocks + - clock-names + - iommus + - qcom,wlan-smmu-iova-address + - qcom,wlan + +examples: + - | + qcom,icnss@0a000000 { + compatible = "qcom,icnss"; + reg = <0x0a000000 0x1000000>; + reg-names = "membase"; + clocks = <&clock_gcc clk_aggre2_noc_clk>; + clock-names = "smmu_aggre2_noc_clk"; + iommus = <&anoc2_smmu 0x1900>, + <&anoc2_smmu 0x1901>; + qcom,wlan-smmu-iova-address = <0 0x10000000>; + qcom,wlan; + interrupts = <0 130 0 /* CE0 */ >, + <0 131 0 /* CE1 */ >, + <0 132 0 /* CE2 */ >, + <0 133 0 /* CE3 */ >, + <0 134 0 /* CE4 */ >, + <0 135 0 /* CE5 */ >, + <0 136 0 /* CE6 */ >, + <0 137 0 /* CE7 */ >, + <0 138 0 /* CE8 */ >, + <0 139 0 /* CE9 */ >, + <0 140 0 /* CE10 */ >, + <0 141 0 /* CE11 */ >; + qcom,wlan-msa-memory = <0x200000>; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + qcom,smmu-s1-bypass; + vdd-0.8-cx-mx-supply = <&pm8998_l5>; + qcom,vdd-0.8-cx-mx-config = <800000 800000 2400 1000>; + qcom,hyp_disabled; + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + }; +... + diff --git a/sun-kiwi-cnss-v8.dts b/sun-kiwi-cnss-v8.dts new file mode 100644 index 00000000..a8c61576 --- /dev/null +++ b/sun-kiwi-cnss-v8.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-kiwi-cnss-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x60001 0>, <0x50008 0>; +}; diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi new file mode 100644 index 00000000..7b29ccf7 --- /dev/null +++ b/sun-kiwi-cnss-v8.dtsi @@ -0,0 +1,169 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550ve_f 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + vdd-wlan-io-supply = <&L3F>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>; + vdd-wlan-io12-supply = <&L2F>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 0>; + vdd-wlan-supply = <&S5F>; + qcom,vdd-wlan-config = <932000 1000000 0 0 0>; + vdd-wlan-aon-supply = <&S4D>; + qcom,vdd-wlan-aon-config = <976000 1036000 0 0 0>; + vdd-wlan-dig-supply = <&S1D>; + qcom,vdd-wlan-dig-config = <916000 1100000 0 0 0>; + vdd-wlan-rfa1-supply = <&S3G>; + qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 0>; + vdd-wlan-rfa2-supply = <&S7I>; + qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 0>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 0>; + + qcom,vreg_pdc_map = + "s5f", "bb", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf", + "s1d", "rf"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "s4d", + "VDD095_PMU", "s5f", + "VDD_PMU_AON_I", "s1d", + "VDD095_PMU_BT", "s1d", + "VDD09_PMU_RFA_I", "s1d", + "VDD13_PMU_PCIE_I", "s7i", + "VDD13_PMU_RFA_I", "s7i", + "VDD19_PMU_PCIE_I", "s3g", + "VDD19_PMU_RFA_I", "s3g"; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 1844}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval: 972}", + "{class: wlan_pdc, ss: rf, res: s1d.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s1d.v, dwnval: 880}", + "{class: wlan_pdc, ss: bb, res: s4d.v, upval: 976}", + "{class: wlan_pdc, ss: bb, res: s4d.v, dwnval: 536}", + "{class: wlan_pdc, ss: bb, res: s5f.m, enable: 1}", + "{class: wlan_pdc, ss: bb, res: s5f.v, enable: 1}", + "{class: wlan_pdc, ss: bb, res: s5f.v, upval: 932}", + "{class: wlan_pdc, ss: bb, res: s5f.v, dwnval: 444}"; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + 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 = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/sun-kiwi-cnss.dts b/sun-kiwi-cnss.dts new file mode 100644 index 00000000..9613ce97 --- /dev/null +++ b/sun-kiwi-cnss.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp", "qcom,sun-mtp", "qcom,sun-cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x20001 0>, <0x20008 0>; +}; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi new file mode 100644 index 00000000..f3261e33 --- /dev/null +++ b/sun-kiwi-cnss.dtsi @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550vs_f 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + vdd-wlan-io-supply = <&L3F>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-io12-supply = <&L2F>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + vdd-wlan-supply = <&S4J>; + qcom,vdd-wlan-config = <932000 1000000 0 0 0>; + vdd-wlan-aon-supply = <&S4D>; + qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>; + vdd-wlan-dig-supply = <&S1D>; + qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; + vdd-wlan-rfa1-supply = <&S3G>; + qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7I>; + qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; + + qcom,vreg_pdc_map = + "s4j", "bb", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf", + "s1d", "rf"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "s4d", + "VDD095_PMU", "s4j", + "VDD_PMU_AON_I", "s1d", + "VDD095_PMU_BT", "s1d", + "VDD09_PMU_RFA_I", "s1d", + "VDD13_PMU_PCIE_I", "s7i", + "VDD13_PMU_RFA_I", "s7i", + "VDD19_PMU_PCIE_I", "s3g", + "VDD19_PMU_RFA_I", "s3g"; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 1844}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval: 972}", + "{class: wlan_pdc, ss: rf, res: s1d.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s1d.v, dwnval: 880}", + "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 0}", + "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 0}", + "{class: wlan_pdc, ss: bb, res: s4d.v, upval: 976}", + "{class: wlan_pdc, ss: bb, res: s4d.v, dwnval: 536}", + "{class: wlan_pdc, ss: bb, res: s4j.m, enable: 1}", + "{class: wlan_pdc, ss: bb, res: s4j.v, enable: 1}", + "{class: wlan_pdc, ss: bb, res: s4j.v, upval: 932}", + "{class: wlan_pdc, ss: bb, res: s4j.v, dwnval: 444}"; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + 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 = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts new file mode 100644 index 00000000..bb2addf3 --- /dev/null +++ b/sun-peach-cnss-v8.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-peach-cnss-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <639 0x10000>, <639 0x20000>; + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>; +}; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi new file mode 100644 index 00000000..8c83796e --- /dev/null +++ b/sun-peach-cnss-v8.dtsi @@ -0,0 +1,140 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_peach: qcom,cnss-peach@b0000000 { + compatible = "qcom,cnss-peach"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x110E>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550ve_f 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + msix-match-addr = <0x3000>; + + vdd-wlan-io-supply = <&L3F>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-io12-supply = <&L2F>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + vdd-wlan-aon-supply = <&S4D>; + qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; + vdd-wlan-dig-supply = <&S5F>; + qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; + vdd-wlan-rfa1-supply = <&S3G>; + qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7I>; + qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", + "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval: 796}"; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + 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 = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/sun-peach-cnss.dts b/sun-peach-cnss.dts new file mode 100644 index 00000000..5c8fbfb5 --- /dev/null +++ b/sun-peach-cnss.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sun-peach-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,sun", "qcom,sunp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <639 0x10000>, <639 0x20000>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>; +}; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi new file mode 100644 index 00000000..01eb6f80 --- /dev/null +++ b/sun-peach-cnss.dtsi @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_peach: qcom,cnss-peach@b0000000 { + compatible = "qcom,cnss-peach"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x110E>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550vs_f 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + msix-match-addr = <0x3000>; + + vdd-wlan-io-supply = <&L3F>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-io12-supply = <&L2F>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + vdd-wlan-aon-supply = <&S4D>; + qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; + vdd-wlan-dig-supply = <&S4J>; + qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; + vdd-wlan-rfa1-supply = <&S3G>; + qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7I>; + qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + 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 = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; From 2e06f2f81854644d32cd96d3a29c3a6ad7621dc0 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Tue, 16 Jan 2024 16:20:48 -0800 Subject: [PATCH 003/120] wlan: dts: msm: Add NFC board IDs to V8 Peach dtsi Add NFC board IDs for MTP and CDP support for V8 Peach dtsi. Change-Id: I7bc2b599b5061f11512d5f6009d986e2f19a777f CRs-Fixed: 3701475 --- sun-peach-cnss-v8.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index bb2addf3..1e7d5b1d 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -14,5 +14,6 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>; + qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, + <0x30008 0>, <0x40001 0>; }; From 2b766ec51bc2fc12733e64c5fcf3fc4d54064346 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Thu, 18 Jan 2024 11:22:56 -0800 Subject: [PATCH 004/120] wlan: dts: Add correct name for BT_EN_GPIO for Peach Change name for BT_EN_GPIO to pm8550vs_f_gpios for V6 power grid and pm8550ve_f_gpios for V8 power grid for Peach. Change-Id: If81656daaa83ed0be838a2c376383723e071184f CRs-Fixed: 3709949 --- sun-kiwi-cnss-v8.dtsi | 2 +- sun-kiwi-cnss.dtsi | 2 +- sun-peach-cnss-v8.dtsi | 2 +- sun-peach-cnss.dtsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index 7b29ccf7..f70de1e6 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -71,7 +71,7 @@ supported-ids = <0x1107>; wlan-en-gpio = <&tlmm 16 0>; - qcom,bt-en-gpio = <&pm8550ve_f 3 0>; + qcom,bt-en-gpio = <&pm8550ve_f_gpios 3 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index f3261e33..10fb204e 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -71,7 +71,7 @@ supported-ids = <0x1107>; wlan-en-gpio = <&tlmm 16 0>; - qcom,bt-en-gpio = <&pm8550vs_f 3 0>; + qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 8c83796e..d9e6cfa1 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -72,7 +72,7 @@ supported-ids = <0x110E>; wlan-en-gpio = <&tlmm 16 0>; - qcom,bt-en-gpio = <&pm8550ve_f 3 0>; + qcom,bt-en-gpio = <&pm8550ve_f_gpios 3 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 01eb6f80..62e6bfa5 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -71,7 +71,7 @@ supported-ids = <0x110E>; wlan-en-gpio = <&tlmm 16 0>; - qcom,bt-en-gpio = <&pm8550vs_f 3 0>; + qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; From 0a093a810588df12b219799ec5d48d57a84a2058 Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Wed, 17 Jan 2024 20:47:53 +0530 Subject: [PATCH 005/120] wlan: dts: msm: Add support for Sun RCM board Add RCM board ID in device tree files to enable all WLAN attach with Sun RCM board. Change-Id: I0d0c4f3d10aaace7b1ee80dfccc93386b75a45a6 CRs-Fixed: 3708605 --- sun-kiwi-cnss-v8.dts | 2 +- sun-kiwi-cnss.dts | 2 +- sun-peach-cnss-v8.dts | 2 +- sun-peach-cnss.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sun-kiwi-cnss-v8.dts b/sun-kiwi-cnss-v8.dts index a8c61576..7835a955 100644 --- a/sun-kiwi-cnss-v8.dts +++ b/sun-kiwi-cnss-v8.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x60001 0>, <0x50008 0>; + qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>; }; diff --git a/sun-kiwi-cnss.dts b/sun-kiwi-cnss.dts index 9613ce97..f6dbcccc 100644 --- a/sun-kiwi-cnss.dts +++ b/sun-kiwi-cnss.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp", "qcom,sun-mtp", "qcom,sun-cdp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <0x20001 0>, <0x20008 0>; + qcom,board-id = <0x20001 0>, <0x20008 0>, <0x40015 0>; }; diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index 1e7d5b1d..7ccf9533 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30008 0>, <0x40001 0>; + <0x30008 0>, <0x40001 0>, <0x30015 0>; }; diff --git a/sun-peach-cnss.dts b/sun-peach-cnss.dts index 5c8fbfb5..0719d84c 100644 --- a/sun-peach-cnss.dts +++ b/sun-peach-cnss.dts @@ -14,5 +14,5 @@ compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; }; From 33a716df43efde8171ce5da49936ce9cdc9ce7b2 Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Wed, 24 Jan 2024 18:13:03 +0530 Subject: [PATCH 006/120] ARM: DTS: msm: Enable Sign Of Life(SOL) for Sun + Peach SOL is side band mechanism to communicate with device and reset device from the bad state. Enable SOL for sun to recover from device hung issue during PCIe link down cases. HOST_SOL -------> Host to Device GPIO DEV_SOL --------> Device to Host GPIO Change-Id: Ib4bf76fa60692acf85546dca7a7148f9c4062ca6 CRs-Fixed: 3715142 --- sun-peach-cnss-v8.dtsi | 31 ++++++++++++++++++++++++++++++- sun-peach-cnss.dtsi | 31 ++++++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index d9e6cfa1..44f7fe1a 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -50,6 +50,32 @@ function = "wcn_sw"; }; }; + + cnss_host_sol_default: cnss_host_sol_default { + mux { + pins = "gpio202"; + function = "gpio"; + }; + + config { + pins = "gpio202"; + drive-strength = <4>; + bias-pull-down; + }; + }; + + cnss_dev_sol_default: cnss_dev_sol_default { + mux { + pins = "gpio203"; + function = "gpio"; + }; + + config { + pins = "gpio203"; + drive-strength = <4>; + bias-pull-down; + }; + }; }; }; @@ -74,14 +100,17 @@ wlan-en-gpio = <&tlmm 16 0>; qcom,bt-en-gpio = <&pm8550ve_f_gpios 3 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; + wlan-host-sol-gpio = <&tlmm 202 0>; + wlan-dev-sol-gpio = <&tlmm 203 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", - "sw_ctrl_wl_cx"; + "sw_ctrl_wl_cx", "sol_default"; pinctrl-0 = <&cnss_wlan_en_active>; pinctrl-1 = <&cnss_wlan_en_sleep>; pinctrl-2 = <&cnss_wlan_sw_ctrl>; pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + pinctrl-4 = <&cnss_host_sol_default &cnss_dev_sol_default>; qcom,wlan; qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 62e6bfa5..da2d3bc4 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -49,6 +49,32 @@ function = "wcn_sw"; }; }; + + cnss_host_sol_default: cnss_host_sol_default { + mux { + pins = "gpio202"; + function = "gpio"; + }; + + config { + pins = "gpio202"; + drive-strength = <4>; + bias-pull-down; + }; + }; + + cnss_dev_sol_default: cnss_dev_sol_default { + mux { + pins = "gpio203"; + function = "gpio"; + }; + + config { + pins = "gpio203"; + drive-strength = <4>; + bias-pull-down; + }; + }; }; }; @@ -73,14 +99,17 @@ wlan-en-gpio = <&tlmm 16 0>; qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; + wlan-host-sol-gpio = <&tlmm 202 0>; + wlan-dev-sol-gpio = <&tlmm 203 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", - "sw_ctrl_wl_cx"; + "sw_ctrl_wl_cx", "sol_default"; pinctrl-0 = <&cnss_wlan_en_active>; pinctrl-1 = <&cnss_wlan_en_sleep>; pinctrl-2 = <&cnss_wlan_sw_ctrl>; pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + pinctrl-4 = <&cnss_host_sol_default &cnss_dev_sol_default>; qcom,wlan; qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; From 1670b51be0a90ec2577973fc5227d4970e890dde Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Wed, 24 Jan 2024 23:39:12 -0800 Subject: [PATCH 007/120] ARM: dts: msm: Add qcom,wlan-cbc-enabled Add qcom,wlan-cbc-enabled, then don't register wlan driver in charger mode. Change-Id: I7f8e0b06da75ebc5ba92fe2b2fd4c798e0e0e7f3 CRs-Fixed: 3699116 --- sun-peach-cnss-v8.dtsi | 1 + sun-peach-cnss.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index d9e6cfa1..32c44da8 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -86,6 +86,7 @@ qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; use-pm-domain; qcom,same-dt-multi-dev; /* For AOP communication, use direct QMP instead of mailbox */ diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 62e6bfa5..6a29c664 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -85,6 +85,7 @@ qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; use-pm-domain; qcom,same-dt-multi-dev; /* For AOP communication, use direct QMP instead of mailbox */ From 95a624ea96fa27ec6b6098afc93ce2350ed0f114 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Wed, 31 Jan 2024 16:00:59 +0530 Subject: [PATCH 008/120] ARM: dts: msm: Add opensource wlan device tree support for Pineapple V Add opensource wlan device tree support for Pineapple V for devSP. Change-Id: I37690bd79b857ed51462efe57849fb3c28b58505 CRs-Fixed: 3721702 --- Kbuild | 5 + pineapple-kiwi-cnss.dts | 17 +++ pineapple-kiwi-cnss.dtsi | 196 ++++++++++++++++++++++++++++++++++ pineapplep-hdk-kiwi-cnss.dts | 17 +++ pineapplep-hdk-kiwi-cnss.dtsi | 194 +++++++++++++++++++++++++++++++++ 5 files changed, 429 insertions(+) create mode 100644 pineapple-kiwi-cnss.dts create mode 100644 pineapple-kiwi-cnss.dtsi create mode 100644 pineapplep-hdk-kiwi-cnss.dts create mode 100644 pineapplep-hdk-kiwi-cnss.dtsi diff --git a/Kbuild b/Kbuild index c145349b..08eef20b 100644 --- a/Kbuild +++ b/Kbuild @@ -5,6 +5,11 @@ dtbo-y += sun-peach-cnss.dtbo dtbo-y += sun-peach-cnss-v8.dtbo endif +ifeq ($(CONFIG_ARCH_PINEAPPLE),y) +dtbo-y += pineapple-kiwi-cnss.dtbo +dtbo-y += pineapplep-hdk-kiwi-cnss.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/pineapple-kiwi-cnss.dts b/pineapple-kiwi-cnss.dts new file mode 100644 index 00000000..3cd0355a --- /dev/null +++ b/pineapple-kiwi-cnss.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "pineapple-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Pineapple SoCs"; + compatible = "qcom,pineapple", "qcom,pineapplep"; + qcom,msm-id = <557 0x10000>, <577 0x10000>, <557 0x20000>, <577 0x20000>; + qcom,board-id = <1 0>, <8 0>, <11 0>, <0x15 0>, <0x1000B 0>, <0x10021 0>, <0x50001 0>, <0x50008 0>, <0x5000B 0>; +}; diff --git a/pineapple-kiwi-cnss.dtsi b/pineapple-kiwi-cnss.dtsi new file mode 100644 index 00000000..33e0ac1f --- /dev/null +++ b/pineapple-kiwi-cnss.dtsi @@ -0,0 +1,196 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&tlmm 17 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + qcom,wlan-cbc-enabled; + cnss-enable-self-recovery; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + vdd-wlan-io-supply = <&L15B>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-io12-supply = <&L3C>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + vdd-wlan-supply = <&S4I>; + qcom,vdd-wlan-config = <940000 940000 0 0 1>; + vdd-wlan-aon-supply = <&S2C>; + qcom,vdd-wlan-aon-config = <976000 976000 0 0 1>; + vdd-wlan-dig-supply = <&S3C>; + qcom,vdd-wlan-dig-config = <916000 916000 0 0 1>; + vdd-wlan-rfa1-supply = <&S6C>; + qcom,vdd-wlan-rfa1-config = <1864000 1864000 0 0 1>; + vdd-wlan-rfa2-supply = <&S1C>; + qcom,vdd-wlan-rfa2-config = <1316000 1316000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; + + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1600000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1600000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1600000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1600000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 6448000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 6448000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 8528000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 3200000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + + qcom,vreg_pdc_map = + "s3c", "rf", + "l15B", "rf", + "l3c", "rf", + "s1c", "rf", + "s6c", "rf", + "s2c", "bb", + "s4i", "bb"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "s2c", + "VDD095_PMU", "s4i", + "VDD_PMU_AON_I", "s3c", + "VDD095_PMU_BT", "s3c", + "VDD09_PMU_RFA_I", "s3c", + "VDD13_PMU_PCIE_I", "s1c", + "VDD13_PMU_RFA_I", "s1c", + "VDD19_PMU_PCIE_I", "s6c", + "VDD19_PMU_RFA_I", "s6c"; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3c.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s3c.v, dwnval: 612}", + "{class: wlan_pdc, ss: rf, res: s1c.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s1c.v, dwnval: 944}", + "{class: wlan_pdc, ss: rf, res: s6c.v, upval: 1864}", + "{class: wlan_pdc, ss: rf, res: s6c.v, dwnval: 1820}", + "{class: wlan_pdc, ss: bb, res: s2c.v, upval: 976}", + "{class: wlan_pdc, ss: bb, res: s2c.v, dwnval: 512}", + "{class: wlan_pdc, ss: bb, res: s4i.v, upval: 940}", + "{class: wlan_pdc, ss: bb, res: s4i.v, dwnval: 420}"; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + cnss_pci_iommu_group0: cnss_pci_iommu_group0 { + qcom,iommu-msi-size = <0x1000>; + qcom,iommu-dma-addr-pool = <0x98000000 0x18000000>; + qcom,iommu-geometry = <0x98000000 0x18010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/pineapplep-hdk-kiwi-cnss.dts b/pineapplep-hdk-kiwi-cnss.dts new file mode 100644 index 00000000..f7f5c2ba --- /dev/null +++ b/pineapplep-hdk-kiwi-cnss.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "pineapplep-hdk-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. PineappleP HDK"; + compatible = "qcom,pineapplep-hdk", "qcom,pineapplep", "qcom,hdk"; + qcom,msm-id = <577 0x10000>, <577 0x20000>; + qcom,board-id = <0x1f 0>; +}; diff --git a/pineapplep-hdk-kiwi-cnss.dtsi b/pineapplep-hdk-kiwi-cnss.dtsi new file mode 100644 index 00000000..b4cd6219 --- /dev/null +++ b/pineapplep-hdk-kiwi-cnss.dtsi @@ -0,0 +1,194 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&tlmm 17 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + qcom,wlan-cbc-enabled; + cnss-enable-self-recovery; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + vdd-wlan-io-supply = <&L15B>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + vdd-wlan-io12-supply = <&L3C>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + vdd-wlan-supply = <&S4I>; + qcom,vdd-wlan-config = <940000 940000 0 0 1>; + vdd-wlan-aon-supply = <&S2C>; + qcom,vdd-wlan-aon-config = <976000 976000 0 0 1>; + vdd-wlan-dig-supply = <&S3C>; + qcom,vdd-wlan-dig-config = <916000 916000 0 0 1>; + vdd-wlan-rfa1-supply = <&S6C>; + qcom,vdd-wlan-rfa1-config = <1864000 1864000 0 0 1>; + vdd-wlan-rfa2-supply = <&S1C>; + qcom,vdd-wlan-rfa2-config = <1316000 1316000 0 0 1>; + + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1600000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1600000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1600000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1600000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 6448000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 6448000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 8528000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 3200000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + + qcom,vreg_pdc_map = + "s3c", "rf", + "l15B", "rf", + "l3c", "rf", + "s1c", "rf", + "s6c", "rf", + "s2c", "bb", + "s4i", "bb"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "s2c", + "VDD095_PMU", "s4i", + "VDD_PMU_AON_I", "s3c", + "VDD095_PMU_BT", "s3c", + "VDD09_PMU_RFA_I", "s3c", + "VDD13_PMU_PCIE_I", "s1c", + "VDD13_PMU_RFA_I", "s1c", + "VDD19_PMU_PCIE_I", "s6c", + "VDD19_PMU_RFA_I", "s6c"; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3c.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s3c.v, dwnval: 612}", + "{class: wlan_pdc, ss: rf, res: s1c.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s1c.v, dwnval: 944}", + "{class: wlan_pdc, ss: rf, res: s6c.v, upval: 1864}", + "{class: wlan_pdc, ss: rf, res: s6c.v, dwnval: 1820}", + "{class: wlan_pdc, ss: bb, res: s2c.v, upval: 976}", + "{class: wlan_pdc, ss: bb, res: s2c.v, dwnval: 512}", + "{class: wlan_pdc, ss: bb, res: s4i.v, upval: 940}", + "{class: wlan_pdc, ss: bb, res: s4i.v, dwnval: 420}"; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + 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 = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", "no-CFRE", + "non-fatal"; + }; + }; +}; From 5d47bd95def275eca1c8d4ca51ea7da17c97a729 Mon Sep 17 00:00:00 2001 From: Namita Nair Date: Wed, 17 Jan 2024 22:24:23 -0800 Subject: [PATCH 009/120] ARM: dts: msm: Add upstream compatible iommu-addresses property Upstream Linux kernel has added a new devicetree property "iommu-addresses", to replace "qcom,iommu-dma-addr-pool". The new property defines the address range the device cannot use, in contrast to the older property which defines the address range the device can use. Change-Id: I8fc13e27593193af7be5ca1bcc03c04a25f36c91 CRs-Fixed: 3724373 --- sun-kiwi-cnss-v8.dtsi | 11 +++++++---- sun-kiwi-cnss.dtsi | 11 +++++++---- sun-peach-cnss-v8.dtsi | 11 +++++++---- sun-peach-cnss.dtsi | 11 +++++++---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index f70de1e6..7af34953 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -145,20 +145,23 @@ }; &pcie0_rp { - #address-cells = <5>; - #size-cells = <0>; cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_pci_iommu_group0>; - memory-region = <&cnss_wlan_mem>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; #address-cells = <1>; #size-cells = <1>; + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + 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 = "fastmap"; qcom,iommu-pagetable = "coherent"; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 10fb204e..07bf898f 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -147,20 +147,23 @@ }; &pcie0_rp { - #address-cells = <5>; - #size-cells = <0>; cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_pci_iommu_group0>; - memory-region = <&cnss_wlan_mem>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; #address-cells = <1>; #size-cells = <1>; + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + 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 = "fastmap"; qcom,iommu-pagetable = "coherent"; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index da71a3a9..a7fabba0 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -146,20 +146,23 @@ }; &pcie0_rp { - #address-cells = <5>; - #size-cells = <0>; cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_pci_iommu_group0>; - memory-region = <&cnss_wlan_mem>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; #address-cells = <1>; #size-cells = <1>; + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + 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 = "fastmap"; qcom,iommu-pagetable = "coherent"; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 4f432360..7a1010e0 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -139,20 +139,23 @@ }; &pcie0_rp { - #address-cells = <5>; - #size-cells = <0>; cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_pci_iommu_group0>; - memory-region = <&cnss_wlan_mem>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; #address-cells = <1>; #size-cells = <1>; + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + 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 = "fastmap"; qcom,iommu-pagetable = "coherent"; From 4c849f35a03fa38b0c30172d14696d0d27b172b5 Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Fri, 2 Feb 2024 17:01:14 +0530 Subject: [PATCH 010/120] ARM: dts: msm: Remove default configuration of DEV_SOL DEV_SOL GPIO is side-band GPIO from discrete WLAN chip to APPS. Default setting for DEV_SOL has to be done by WLAN_FW in WLAN chip. Remove default GPIO configuration from CNSS driver running in APPS. Change-Id: I10a65bd007a6bcf00a358f1e60c925ad316ec3ab CRs-Fixed: 3727394 --- sun-peach-cnss-v8.dtsi | 15 +-------------- sun-peach-cnss.dtsi | 15 +-------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index da71a3a9..04a40d9b 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -63,19 +63,6 @@ bias-pull-down; }; }; - - cnss_dev_sol_default: cnss_dev_sol_default { - mux { - pins = "gpio203"; - function = "gpio"; - }; - - config { - pins = "gpio203"; - drive-strength = <4>; - bias-pull-down; - }; - }; }; }; @@ -110,7 +97,7 @@ pinctrl-1 = <&cnss_wlan_en_sleep>; pinctrl-2 = <&cnss_wlan_sw_ctrl>; pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; - pinctrl-4 = <&cnss_host_sol_default &cnss_dev_sol_default>; + pinctrl-4 = <&cnss_host_sol_default>; qcom,wlan; qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 4f432360..aee331ab 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -62,19 +62,6 @@ bias-pull-down; }; }; - - cnss_dev_sol_default: cnss_dev_sol_default { - mux { - pins = "gpio203"; - function = "gpio"; - }; - - config { - pins = "gpio203"; - drive-strength = <4>; - bias-pull-down; - }; - }; }; }; @@ -109,7 +96,7 @@ pinctrl-1 = <&cnss_wlan_en_sleep>; pinctrl-2 = <&cnss_wlan_sw_ctrl>; pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; - pinctrl-4 = <&cnss_host_sol_default &cnss_dev_sol_default>; + pinctrl-4 = <&cnss_host_sol_default>; qcom,wlan; qcom,wlan-rc-num = <0>; qcom,wlan-ramdump-dynamic = <0x780000>; From 2678eeb8f664e1e929d53af72abeacd5a1278f4f Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Tue, 30 Jan 2024 16:08:24 -0800 Subject: [PATCH 011/120] wlan: dts: msm: Add vote for S4J regulator in V6 PDC init table Having S4J enabled in the TCS by default will cause TCS address to be populated with the wrong address on V8 and will cause TCS ACK hang. Thus, AOP will keep S4J and S5F regulators disabled by default and host will vote to enable S4J and S5F regulators based on V6 or V8 power grid, respectively. Change-Id: I852ca4aa80ef0e6bd5c802e6032f876fb53c9670 CRs-Fixed: 3709995 --- sun-peach-cnss-v8.dtsi | 2 +- sun-peach-cnss.dtsi | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index da71a3a9..d7a204b2 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -141,7 +141,7 @@ "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", - "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval: 796}"; + "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval: 876}"; }; }; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 4f432360..10db3133 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -135,6 +135,12 @@ qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; vdd-wlan-ant-share-supply = <&L6K>; qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s4j.v, upval: 876}", + "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval: 876}"; }; }; From 5d9d8cec46189c74c07177d24765b84a3f75adb5 Mon Sep 17 00:00:00 2001 From: Yeshwanth Sriram Guntuka Date: Tue, 6 Feb 2024 15:59:30 +0530 Subject: [PATCH 012/120] ARM: dts: msm: Use shared iommu group for WLAN to support direct link Use shared iommu group for WLAN on sun to support direct link on Ganges. CRs-Fixed: 3714880 Change-Id: Id04d281542260c5ca07d104880dd2ec5a197f7f8 --- sun-peach-cnss-v8.dtsi | 17 ++--------------- sun-peach-cnss.dtsi | 17 ++--------------- 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 8d9a480c..071997af 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -133,28 +133,15 @@ }; &pcie0_rp { - cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; - qcom,iommu-group = <&cnss_pci_iommu_group0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; - #address-cells = <1>; - #size-cells = <1>; - cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ - iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x88000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; - - cnss_pci_iommu_group0: cnss_pci_iommu_group0 { - qcom,iommu-msi-size = <0x1000>; - qcom,iommu-geometry = <0xa0000000 0x10010000>; - qcom,iommu-dma = "fastmap"; - qcom,iommu-pagetable = "coherent"; - qcom,iommu-faults = "stall-disable", "HUPCF", - "non-fatal"; - }; }; }; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 5b9a2536..bf259961 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -132,28 +132,15 @@ }; &pcie0_rp { - cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; - qcom,iommu-group = <&cnss_pci_iommu_group0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; - #address-cells = <1>; - #size-cells = <1>; - cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ - iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x88000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; - - cnss_pci_iommu_group0: cnss_pci_iommu_group0 { - qcom,iommu-msi-size = <0x1000>; - qcom,iommu-geometry = <0xa0000000 0x10010000>; - qcom,iommu-dma = "fastmap"; - qcom,iommu-pagetable = "coherent"; - qcom,iommu-faults = "stall-disable", "HUPCF", - "non-fatal"; - }; }; }; From ba2f9850b93b11837b24fc713ba3906a0c0f174b Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Mon, 12 Feb 2024 20:41:20 +0530 Subject: [PATCH 013/120] ARM: dts: msm: Unvote regulators after bootup Remove APPS vote for all the regulators except S5F(WLAN CX) after FW_READY during device bootup with V8 board. Change-Id: Ic9510af45b7f637e5900d03be041cc66e4351bb6 CRs-Fixed: 3731688 --- sun-kiwi-cnss-v8.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index 7af34953..c7da8623 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -92,21 +92,21 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 0>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-supply = <&S5F>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; - qcom,vdd-wlan-aon-config = <976000 1036000 0 0 0>; + qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S1D>; - qcom,vdd-wlan-dig-config = <916000 1100000 0 0 0>; + qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; vdd-wlan-rfa1-supply = <&S3G>; - qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 0>; + qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S7I>; - qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 0>; + qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 1>; vdd-wlan-ant-share-supply = <&L6K>; - qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 0>; + qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; qcom,vreg_pdc_map = "s5f", "bb", From 9e58275cdd3ab73a4ebe3d76be51f3cbaeb624b4 Mon Sep 17 00:00:00 2001 From: Namita Nair Date: Tue, 13 Feb 2024 10:53:07 -0800 Subject: [PATCH 014/120] ARM: dts: msm: Add upstream compatible iommu-addresses property Upstream Linux kernel has added a new devicetree property "iommu-addresses", to replace "qcom,iommu-dma-addr-pool". The new property defines the address range the device cannot use, in contrast to the older property which defines the address range the device can use. Change-Id: I73166b20ff8ef0415cfa56e649b4792f03c94cad CRs-Fixed: 3732156 --- pineapple-kiwi-cnss.dtsi | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pineapple-kiwi-cnss.dtsi b/pineapple-kiwi-cnss.dtsi index 33e0ac1f..1eebf296 100644 --- a/pineapple-kiwi-cnss.dtsi +++ b/pineapple-kiwi-cnss.dtsi @@ -172,20 +172,23 @@ }; &pcie0_rp { - #address-cells = <5>; - #size-cells = <0>; cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_pci_iommu_group0>; - memory-region = <&cnss_wlan_mem>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; #address-cells = <1>; #size-cells = <1>; + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from pineapple-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + cnss_pci_iommu_group0: cnss_pci_iommu_group0 { qcom,iommu-msi-size = <0x1000>; - qcom,iommu-dma-addr-pool = <0x98000000 0x18000000>; qcom,iommu-geometry = <0x98000000 0x18010000>; qcom,iommu-dma = "fastmap"; qcom,iommu-pagetable = "coherent"; From 7356f111f51c2293dcdfb8faae7a77fd921937bf Mon Sep 17 00:00:00 2001 From: Rakesh Pillai Date: Tue, 20 Feb 2024 06:52:27 -0800 Subject: [PATCH 015/120] ARM: dts: msm: Add interconnect voting node for sun kiwi/peach Add the interconnect voting node for sun kiwi/peach, used for bus bandwidth voting. Change-Id: I623ab5c0e3def9c0a357713867564b6a2db55107 CRs-Fixed: 3736681 --- sun-kiwi-cnss-v8.dtsi | 46 ++++++++++++++++++++++++++++++++++++++++++ sun-kiwi-cnss.dtsi | 46 ++++++++++++++++++++++++++++++++++++++++++ sun-peach-cnss-v8.dtsi | 46 ++++++++++++++++++++++++++++++++++++++++++ sun-peach-cnss.dtsi | 46 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 184 insertions(+) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index c7da8623..24ac36f4 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -108,6 +108,52 @@ vdd-wlan-ant-share-supply = <&L6K>; qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1600000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1600000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1600000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1600000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 6448000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 6448000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 8528000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 3200000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + qcom,vreg_pdc_map = "s5f", "bb", "s4d", "bb", diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 07bf898f..95700676 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -108,6 +108,52 @@ vdd-wlan-ant-share-supply = <&L6K>; qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1600000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1600000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1600000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1600000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 6448000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 6448000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 8528000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 3200000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + qcom,vreg_pdc_map = "s4j", "bb", "s4d", "bb", diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 8d9a480c..5e88ed5a 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -124,6 +124,52 @@ vdd-wlan-ant-share-supply = <&L6K>; qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1600000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1600000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1600000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1600000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 6448000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 6448000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 8528000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 3200000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 5b9a2536..af2a1b90 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -123,6 +123,52 @@ vdd-wlan-ant-share-supply = <&L6K>; qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1600000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1600000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1600000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1600000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 6448000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 6448000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 8528000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 3200000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", From 0dac8fe2b00c90f778999b49b9771682e4eb4d37 Mon Sep 17 00:00:00 2001 From: Sandeep Singh Date: Tue, 27 Feb 2024 14:17:53 +0530 Subject: [PATCH 016/120] dt-bindings: Add documentation qcom,wcn7750 node Add documentation qcom,wcn7750 node for wlan platform driver. Change-Id: I9cfbddf5c23847857ca6e0d4cbe6f81b42ad0f71 CRs-Fixed: 3743815 --- bindings/icnss-wlan.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/bindings/icnss-wlan.yaml b/bindings/icnss-wlan.yaml index 1d8903fe..9801cf83 100644 --- a/bindings/icnss-wlan.yaml +++ b/bindings/icnss-wlan.yaml @@ -18,6 +18,7 @@ properties: - qcom,icnss #for ADRASTEA architecture - qcom,wcn6750 #for iWCN architecture - qcom,wcn6450 #for evros architecture + - qcom,wcn7750 #for wcn7750 architecture reg: description: Memory regions defined as starting address and size. From a96e57b9f9d14741ce2cb1f16a3184ac6d54fdfb Mon Sep 17 00:00:00 2001 From: Naman Padhiar Date: Fri, 8 Mar 2024 17:52:32 +0530 Subject: [PATCH 017/120] ARM: dts: msm: Add WLAN support for MTP with 3.5mm audio MTP with 3.5mm support has specific major version in board ID. Add that board ID in WLAN Peach V8 DTS file to enable WLAN support for devices which has 3.5mm audio jack, V8 power grid and Peach as WLAN attachment. Change-Id: Id5ae07b7e560cc7997bd133bff6bc32a637900bb CRs-Fixed: 3759656 --- sun-peach-cnss-v8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index 7ccf9533..353c2270 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30008 0>, <0x40001 0>, <0x30015 0>; + <0x30008 0>, <0x40001 0>, <0x30015 0>, <0x60008 0>; }; From a0bd041f652d10f9154f922b9948a53aaa0dbb76 Mon Sep 17 00:00:00 2001 From: Xhoendi Collaku Date: Fri, 8 Mar 2024 17:52:32 +0530 Subject: [PATCH 018/120] ARM: dts: msm: Add WLAN support for MTP with 3.5mm audio MTP with 3.5mm support has specific major version in board ID. Add that board ID in WLAN Peach V8 DTS file to enable WLAN support for devices which has 3.5mm audio jack, V8 power grid and Peach as WLAN attachment. Change-Id: Id5ae07b7e560cc7997bd133bff6bc32a637900bb CRs-Fixed: 3759656 Signed-off-by: Xhoendi Collaku --- sun-peach-cnss-v8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index 7ccf9533..353c2270 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30008 0>, <0x40001 0>, <0x30015 0>; + <0x30008 0>, <0x40001 0>, <0x30015 0>, <0x60008 0>; }; From 89ec859030ec6c96f702f59a226a16b056214226 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 3 Apr 2024 09:44:43 -0700 Subject: [PATCH 019/120] ARM: dts: msm: Add VREG Map and PDC Map Tables for Sun+Peach Add VREG Map and PDC Map Tables for Sun+Peach Change-Id: Iac272de930c67bdf90746356c232e7cabaca5171 CRs-Fixed: 3778916 --- sun-peach-cnss-v8.dtsi | 18 ++++++++++++++++++ sun-peach-cnss.dtsi | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index ae7e212f..ee869973 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -170,6 +170,24 @@ /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ <7500 2188800>; + qcom,vreg_pdc_map = + "s5f", "rf", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf"; + + qcom,pmu_vreg_map = + "VDDD_AON_0P9", "s5f", + "VDDA_RFA_1P9", "s3g", + "VDDA_RFA_1P3", "s7i", + "VDDA_RFA_0P9", "s5f", + "VDDD_WLMX_0P9", "s4d", + "VDDD_WLCX_0P9", "s5f", + "VDDD_BTCX_0P9", "s5f", + "VDDD_BTCMX_0P9", "s5f", + "VDDA_PCIE_1P2", "s7i", + "VDDA_PCIE_0P9", "s7i"; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 3b6cf455..6150f417 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -169,6 +169,24 @@ /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ <7500 2188800>; + qcom,vreg_pdc_map = + "s4j", "rf", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf"; + + qcom,pmu_vreg_map = + "VDDD_AON_0P9", "s4j", + "VDDA_RFA_1P9", "s3g", + "VDDA_RFA_1P3", "s7i", + "VDDA_RFA_0P9", "s4j", + "VDDD_WLMX_0P9", "s4d", + "VDDD_WLCX_0P9", "s4j", + "VDDD_BTCX_0P9", "s4j", + "VDDD_BTCMX_0P9", "s4j", + "VDDA_PCIE_1P2", "s7i", + "VDDA_PCIE_0P9", "s7i"; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", From 14aa024938dce3372994f924bfb767df80b1330f Mon Sep 17 00:00:00 2001 From: Namita Nair Date: Mon, 8 Apr 2024 13:51:09 -0700 Subject: [PATCH 020/120] ARM: dts: msm: Update WLAN SNOC voting Currently the WLAN SNOC voting is set based on PCIe SN4 BCM width as 16.The PCIe port width has been updated to 8 for sun devices. Hence, this change will bring in the corresponding WLAN SNOC voting to support the new width. Change-Id: I6129bff9067d9654b7eb08777bb19d5a9e05c450 CRs-Fixed: 3775975 --- sun-kiwi-cnss-v8.dtsi | 16 ++++++++-------- sun-kiwi-cnss.dtsi | 16 ++++++++-------- sun-peach-cnss-v8.dtsi | 16 ++++++++-------- sun-peach-cnss.dtsi | 16 ++++++++-------- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index 24ac36f4..562a418e 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -119,21 +119,21 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1600000>, + <2250 800000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1600000>, + <7500 800000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1600000>, + <30000 800000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1600000>, + <100000 800000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 6448000>, + <175000 3224000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 6448000>, + <312500 3224000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 8528000>, + <587500 4264000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 3200000>, + <7500 1600000>, /** ICC Path 2 **/ <0 0>, diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 95700676..0398fda9 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -119,21 +119,21 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1600000>, + <2250 800000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1600000>, + <7500 800000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1600000>, + <30000 800000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1600000>, + <100000 800000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 6448000>, + <175000 3224000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 6448000>, + <312500 3224000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 8528000>, + <587500 4264000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 3200000>, + <7500 1600000>, /** ICC Path 2 **/ <0 0>, diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index ae7e212f..5b719d7f 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -135,21 +135,21 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1600000>, + <2250 800000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1600000>, + <7500 800000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1600000>, + <30000 800000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1600000>, + <100000 800000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 6448000>, + <175000 3224000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 6448000>, + <312500 3224000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 8528000>, + <587500 4264000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 3200000>, + <7500 1600000>, /** ICC Path 2 **/ <0 0>, diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 3b6cf455..7f625f18 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -134,21 +134,21 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1600000>, + <2250 800000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1600000>, + <7500 800000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1600000>, + <30000 800000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1600000>, + <100000 800000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 6448000>, + <175000 3224000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 6448000>, + <312500 3224000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 8528000>, + <587500 4264000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 3200000>, + <7500 1600000>, /** ICC Path 2 **/ <0 0>, From 5a546e7a752a037eb0610fb9f7a9178ecca6b68b Mon Sep 17 00:00:00 2001 From: VijayaRamarao Mellempudi Date: Thu, 4 Apr 2024 16:16:15 -0700 Subject: [PATCH 021/120] ARM: dts: msm: new MSM-ID to support for different packagings Add new MSM-ID for SUN target Change-Id: I389a71bebb380d7670565ee76f950bcaed2f6b46 CRs-Fixed: 3782806 --- sun-kiwi-cnss-v8.dts | 4 +++- sun-kiwi-cnss.dts | 4 +++- sun-peach-cnss-v8.dts | 4 +++- sun-peach-cnss.dts | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sun-kiwi-cnss-v8.dts b/sun-kiwi-cnss-v8.dts index 7835a955..c82ec0c3 100644 --- a/sun-kiwi-cnss-v8.dts +++ b/sun-kiwi-cnss-v8.dts @@ -13,6 +13,8 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, - <639 0x10000>, <639 0x20000>; + <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>; }; diff --git a/sun-kiwi-cnss.dts b/sun-kiwi-cnss.dts index f6dbcccc..988a317a 100644 --- a/sun-kiwi-cnss.dts +++ b/sun-kiwi-cnss.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp", "qcom,sun-mtp", "qcom,sun-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>, <0x20008 0>, <0x40015 0>; }; diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index 353c2270..523e3ca8 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -13,7 +13,9 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, - <639 0x10000>, <639 0x20000>; + <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, <0x30008 0>, <0x40001 0>, <0x30015 0>, <0x60008 0>; }; diff --git a/sun-peach-cnss.dts b/sun-peach-cnss.dts index 0719d84c..9a61c4bb 100644 --- a/sun-peach-cnss.dts +++ b/sun-peach-cnss.dts @@ -13,6 +13,8 @@ model = "Qualcomm Technologies, Inc. Sun SoCs"; compatible = "qcom,sun", "qcom,sunp"; qcom,msm-id = <618 0x10000>, <618 0x20000>, - <639 0x10000>, <639 0x20000>; + <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; }; From 4c9bb0b34f9ba2b826e4697ed811b20cc6bccc15 Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Mon, 1 Apr 2024 22:18:15 -0700 Subject: [PATCH 022/120] ARM: dts: msm: Add support for SunP HDK Add wlan support for SunP HDK. Add new board major/minor device id. Remove vdd-wlan-ant-share-supply since no modem in HDK. Change-Id: I7f5a74bcce67b40653e9ca2cc37c13589533065b CRs-Fixed: 3755710 --- Kbuild | 1 + sunp-hdk-peach-cnss-v8.dts | 17 +++++++++++++++++ sunp-hdk-peach-cnss-v8.dtsi | 12 ++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 sunp-hdk-peach-cnss-v8.dts create mode 100644 sunp-hdk-peach-cnss-v8.dtsi diff --git a/Kbuild b/Kbuild index 08eef20b..7b651b7c 100644 --- a/Kbuild +++ b/Kbuild @@ -3,6 +3,7 @@ dtbo-y += sun-kiwi-cnss.dtbo dtbo-y += sun-kiwi-cnss-v8.dtbo dtbo-y += sun-peach-cnss.dtbo dtbo-y += sun-peach-cnss-v8.dtbo +dtbo-y += sunp-hdk-peach-cnss-v8.dtbo endif ifeq ($(CONFIG_ARCH_PINEAPPLE),y) diff --git a/sunp-hdk-peach-cnss-v8.dts b/sunp-hdk-peach-cnss-v8.dts new file mode 100644 index 00000000..1bdf3114 --- /dev/null +++ b/sunp-hdk-peach-cnss-v8.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "sunp-hdk-peach-cnss-v8.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs HDK"; + compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; + qcom,msm-id = <639 0x10000>, <639 0x20000>, <618 0x10000>, <618 0x20000>; + qcom,board-id = <0x1001f 0>; +}; diff --git a/sunp-hdk-peach-cnss-v8.dtsi b/sunp-hdk-peach-cnss-v8.dtsi new file mode 100644 index 00000000..db375158 --- /dev/null +++ b/sunp-hdk-peach-cnss-v8.dtsi @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include "sun-peach-cnss-v8.dtsi" + +&wlan_peach { + /delete-property/ vdd-wlan-ant-share-supply; + /delete-property/ qcom,vdd-wlan-ant-share-config; +}; From 92cc69e05a9f4c5fc726601842401b82080c68f3 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Thu, 11 Apr 2024 22:54:59 -0700 Subject: [PATCH 023/120] ARM: dts: msm: Set Load on L3F/L2F regulators for NPM Mode Set load on L3F/L2F regulators for NPM mode. Change-Id: If415e4c238b810ae6fca551aebd7be321d51ee41 CRs-Fixed: 3788078 --- sun-kiwi-cnss-v8.dtsi | 4 ++-- sun-kiwi-cnss.dtsi | 4 ++-- sun-peach-cnss-v8.dtsi | 4 ++-- sun-peach-cnss.dtsi | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index 562a418e..bd28a0cd 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-supply = <&S5F>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 0398fda9..185769f5 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-supply = <&S4J>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 5b719d7f..4d1c73ac 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -110,9 +110,9 @@ msix-match-addr = <0x3000>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S5F>; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 7f625f18..4c34611f 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -109,9 +109,9 @@ msix-match-addr = <0x3000>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S4J>; From 99c6f32b9d3b7d85dbd3b088091270b2b80d7d89 Mon Sep 17 00:00:00 2001 From: Bruce Levy Date: Mon, 15 Apr 2024 22:00:23 -0700 Subject: [PATCH 024/120] Revert "ARM: dts: msm: Add WLAN support for MTP with 3.5mm audio" This reverts commit a0bd041f652d10f9154f922b9948a53aaa0dbb76. Signed-off-by: Bruce Levy Change-Id: I1565c0d8208e3594d5928a5975fe05214f9fe7bc --- sun-peach-cnss-v8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index 353c2270..7ccf9533 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -15,5 +15,5 @@ qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30008 0>, <0x40001 0>, <0x30015 0>, <0x60008 0>; + <0x30008 0>, <0x40001 0>, <0x30015 0>; }; From aa27a5821e70d43694a6ac52f59f74b41d11d144 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 3 Apr 2024 09:44:43 -0700 Subject: [PATCH 025/120] ARM: dts: msm: Add VREG Map and PDC Map Tables for Sun+Peach Add VREG Map and PDC Map Tables for Sun+Peach Change-Id: Iac272de930c67bdf90746356c232e7cabaca5171 CRs-Fixed: 3778916 Signed-off-by: Bruce Levy --- sun-peach-cnss-v8.dtsi | 18 ++++++++++++++++++ sun-peach-cnss.dtsi | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 5b719d7f..d63eddb7 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -170,6 +170,24 @@ /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ <7500 2188800>; + qcom,vreg_pdc_map = + "s5f", "rf", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf"; + + qcom,pmu_vreg_map = + "VDDD_AON_0P9", "s5f", + "VDDA_RFA_1P9", "s3g", + "VDDA_RFA_1P3", "s7i", + "VDDA_RFA_0P9", "s5f", + "VDDD_WLMX_0P9", "s4d", + "VDDD_WLCX_0P9", "s5f", + "VDDD_BTCX_0P9", "s5f", + "VDDD_BTCMX_0P9", "s5f", + "VDDA_PCIE_1P2", "s7i", + "VDDA_PCIE_0P9", "s7i"; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 7f625f18..0a8ac5bb 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -169,6 +169,24 @@ /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ <7500 2188800>; + qcom,vreg_pdc_map = + "s4j", "rf", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf"; + + qcom,pmu_vreg_map = + "VDDD_AON_0P9", "s4j", + "VDDA_RFA_1P9", "s3g", + "VDDA_RFA_1P3", "s7i", + "VDDA_RFA_0P9", "s4j", + "VDDD_WLMX_0P9", "s4d", + "VDDD_WLCX_0P9", "s4j", + "VDDD_BTCX_0P9", "s4j", + "VDDD_BTCMX_0P9", "s4j", + "VDDA_PCIE_1P2", "s7i", + "VDDA_PCIE_0P9", "s7i"; + qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", From 3ef4e9112cf73989b6a1279cc1e816aaab106e65 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Thu, 11 Apr 2024 22:54:59 -0700 Subject: [PATCH 026/120] ARM: dts: msm: Set Load on L3F/L2F regulators for NPM Mode Set load on L3F/L2F regulators for NPM mode. Change-Id: If415e4c238b810ae6fca551aebd7be321d51ee41 CRs-Fixed: 3788078 Signed-off-by: Bruce Levy --- sun-kiwi-cnss-v8.dtsi | 4 ++-- sun-kiwi-cnss.dtsi | 4 ++-- sun-peach-cnss-v8.dtsi | 4 ++-- sun-peach-cnss.dtsi | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index 562a418e..bd28a0cd 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-supply = <&S5F>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 0398fda9..185769f5 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-supply = <&S4J>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index d63eddb7..c51b6b36 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -110,9 +110,9 @@ msix-match-addr = <0x3000>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S5F>; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 0a8ac5bb..38520f13 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -109,9 +109,9 @@ msix-match-addr = <0x3000>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S4J>; From 8ef99d091eac485e46dff15f71c2a306582b6e0a Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Thu, 25 Apr 2024 21:08:07 -0700 Subject: [PATCH 027/120] ARM: dts: msm: Add package ID to msm-IDs for SunP HDK Add package ID to msm-IDs for sun hdk SoC to support different hardware settings for WLAN. Change-Id: I9a93cdb4144fd66ebc51e3683f5ebbe32458b033 CRs-Fixed: 3798698 --- sunp-hdk-peach-cnss-v8.dts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sunp-hdk-peach-cnss-v8.dts b/sunp-hdk-peach-cnss-v8.dts index 1bdf3114..cee68fca 100644 --- a/sunp-hdk-peach-cnss-v8.dts +++ b/sunp-hdk-peach-cnss-v8.dts @@ -12,6 +12,9 @@ / { model = "Qualcomm Technologies, Inc. Sun SoCs HDK"; compatible = "qcom,sunp-hdk", "qcom,sunp", "qcom,hdk"; - qcom,msm-id = <639 0x10000>, <639 0x20000>, <618 0x10000>, <618 0x20000>; + qcom,msm-id = <639 0x10000>, <639 0x20000>, <618 0x10000>, <618 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,board-id = <0x1001f 0>; }; From 17012f8fedb30e5b0f0ca1674eb1b73589adffd7 Mon Sep 17 00:00:00 2001 From: Linux Image Build Automation Date: Tue, 14 May 2024 01:57:02 -0700 Subject: [PATCH 028/120] Revert "ARM: dts: msm: Set Load on L3F/L2F regulators for NPM Mode" This reverts commit 3ef4e9112cf73989b6a1279cc1e816aaab106e65. Change-Id: Ib047d8408b0d53f7e0df1cb5bd81306e7743bee8 Signed-off-by: Linux Image Build Automation --- sun-kiwi-cnss-v8.dtsi | 4 ++-- sun-kiwi-cnss.dtsi | 4 ++-- sun-peach-cnss-v8.dtsi | 4 ++-- sun-peach-cnss.dtsi | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index bd28a0cd..562a418e 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-supply = <&S5F>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 185769f5..0398fda9 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -92,9 +92,9 @@ qcom,qmp = <&aoss_qmp>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-supply = <&S4J>; qcom,vdd-wlan-config = <932000 1000000 0 0 0>; vdd-wlan-aon-supply = <&S4D>; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index c51b6b36..d63eddb7 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -110,9 +110,9 @@ msix-match-addr = <0x3000>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S5F>; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 38520f13..0a8ac5bb 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -109,9 +109,9 @@ msix-match-addr = <0x3000>; vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S4J>; From fdf8c8eb482713f73c7a2c177b218221eb62adf3 Mon Sep 17 00:00:00 2001 From: Linux Image Build Automation Date: Tue, 14 May 2024 01:57:14 -0700 Subject: [PATCH 029/120] Revert "ARM: dts: msm: Add VREG Map and PDC Map Tables for Sun+Peach" This reverts commit aa27a5821e70d43694a6ac52f59f74b41d11d144. Change-Id: Ic3a4e4e711de802ea5e9ebec1afd2262d9c423af Signed-off-by: Linux Image Build Automation --- sun-peach-cnss-v8.dtsi | 18 ------------------ sun-peach-cnss.dtsi | 18 ------------------ 2 files changed, 36 deletions(-) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index d63eddb7..5b719d7f 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -170,24 +170,6 @@ /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ <7500 2188800>; - qcom,vreg_pdc_map = - "s5f", "rf", - "s4d", "bb", - "s3g", "rf", - "s7i", "rf"; - - qcom,pmu_vreg_map = - "VDDD_AON_0P9", "s5f", - "VDDA_RFA_1P9", "s3g", - "VDDA_RFA_1P3", "s7i", - "VDDA_RFA_0P9", "s5f", - "VDDD_WLMX_0P9", "s4d", - "VDDD_WLCX_0P9", "s5f", - "VDDD_BTCX_0P9", "s5f", - "VDDD_BTCMX_0P9", "s5f", - "VDDA_PCIE_1P2", "s7i", - "VDDA_PCIE_0P9", "s7i"; - qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 0a8ac5bb..7f625f18 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -169,24 +169,6 @@ /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ <7500 2188800>; - qcom,vreg_pdc_map = - "s4j", "rf", - "s4d", "bb", - "s3g", "rf", - "s7i", "rf"; - - qcom,pmu_vreg_map = - "VDDD_AON_0P9", "s4j", - "VDDA_RFA_1P9", "s3g", - "VDDA_RFA_1P3", "s7i", - "VDDA_RFA_0P9", "s4j", - "VDDD_WLMX_0P9", "s4d", - "VDDD_WLCX_0P9", "s4j", - "VDDD_BTCX_0P9", "s4j", - "VDDD_BTCMX_0P9", "s4j", - "VDDA_PCIE_1P2", "s7i", - "VDDA_PCIE_0P9", "s7i"; - qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", From e8ae4bcce1dcb75d68ccb44f1c8e4c596acd5a49 Mon Sep 17 00:00:00 2001 From: Ananya Gupta Date: Tue, 14 May 2024 17:46:03 +0530 Subject: [PATCH 030/120] ARM: dts: msm: Enlarge cnss dma memory pool range Enlarge the range of DMA memory pool for hamilton attachment in pakala module. CRs-Fixed: 3809569 Change-Id: I9fdd1147653fabc5f1bc501365145debc50189e4 --- sun-kiwi-cnss.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 185769f5..1b99a6f8 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -210,7 +210,7 @@ cnss_pci_iommu_group0: cnss_pci_iommu_group0 { qcom,iommu-msi-size = <0x1000>; - qcom,iommu-geometry = <0xa0000000 0x10010000>; + qcom,iommu-geometry = <0x98000000 0x18010000>; qcom,iommu-dma = "fastmap"; qcom,iommu-pagetable = "coherent"; qcom,iommu-faults = "stall-disable", "HUPCF", From 9fbff65f08a92d1ea7ad41adcfd8b3eb9d3de6e7 Mon Sep 17 00:00:00 2001 From: Ravindra Konda Date: Wed, 29 May 2024 11:00:55 +0530 Subject: [PATCH 031/120] ARM: dts: msm: Set iommu address range for kiwi Set correct iommu address range correspoding to iommu geometry Change-Id: Icbcf15bd7ad702c5140f0f8234b4933cfee3acf7 CRs-Fixed: 3826647 --- sun-kiwi-cnss.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 1b99a6f8..0ad47060 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -204,7 +204,7 @@ cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ - iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; From 4e2a22db6092559f380649bd5c3159ca66c3e81e Mon Sep 17 00:00:00 2001 From: Yu Wang Date: Tue, 30 Apr 2024 00:09:09 -0700 Subject: [PATCH 032/120] ARM: dts: msm: Add WLAN support for X1E80100 Add DTS for KIWI on X1E80100. Change-Id: I806f4b960b149c05d8728d1c6a654c120b459117 CRs-Fixed: 3828027 --- Kbuild | 4 ++ x1e80100-kiwi-cnss.dts | 17 +++++++ x1e80100-kiwi-cnss.dtsi | 105 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 x1e80100-kiwi-cnss.dts create mode 100644 x1e80100-kiwi-cnss.dtsi diff --git a/Kbuild b/Kbuild index 7b651b7c..da428956 100644 --- a/Kbuild +++ b/Kbuild @@ -11,6 +11,10 @@ dtbo-y += pineapple-kiwi-cnss.dtbo dtbo-y += pineapplep-hdk-kiwi-cnss.dtbo endif +ifeq ($(CONFIG_ARCH_X1E80100),y) +dtbo-y += x1e80100-kiwi-cnss.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/x1e80100-kiwi-cnss.dts b/x1e80100-kiwi-cnss.dts new file mode 100644 index 00000000..87cb03c8 --- /dev/null +++ b/x1e80100-kiwi-cnss.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "x1e80100-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. X1E80100 SoC"; + compatible = "qcom,x1e80100"; + qcom,msm-id = <0x22b 0x10000>, <0x22b 0x20000>; + qcom,board-id = <0x28 0x0>; +}; diff --git a/x1e80100-kiwi-cnss.dtsi b/x1e80100-kiwi-cnss.dtsi new file mode 100644 index 00000000..2d72d395 --- /dev/null +++ b/x1e80100-kiwi-cnss.dtsi @@ -0,0 +1,105 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio117"; + function = "gpio"; + }; + + config { + pins = "gpio117"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio117"; + function = "gpio"; + }; + + config { + pins = "gpio117"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x4000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-cbc-enabled; + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 117 0>; + qcom,bt-en-gpio = <&tlmm 116 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan; + qcom,wlan-rc-num = <4>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + use-pm-domain; + qcom,same-dt-multi-dev; + qcom,qmp = <&aoss_qmp>; + vdd-wlan-m2-supply = <&vreg_wlan_3p3>; + qcom,vdd-wlan-m2-config = <3300000 3300000 0 0 0>; + vdd-wlan-io-supply = <&L15B>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 0>; + /* interconnect is not set */ + }; +}; + +&pcie4_rp { + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = + <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; + + #address-cells = <1>; + #size-cells = <1>; + + cnss_pci0_iommu_region_partition: + cnss_pci0_iommu_region_partition { + iommu-addresses = + <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + + cnss_pci_iommu_group0: cnss_pci_iommu_group0 { + qcom,iommu-msi-size = <0x1000>; + qcom,iommu-geometry = <0xa0000000 0x10010000>; + /* bypass due to SMMU V3 is NOT well supported yet */ + qcom,iommu-dma = "bypass"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = + "stall-disable", "HUPCF", "non-fatal"; + }; + }; +}; From efbcc0ee08fffabf5eca92f34b2a09d40adb48e4 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 6 Jun 2024 01:21:47 +0530 Subject: [PATCH 033/120] ARM: dts: msm: Add wlan node for qca6755 parrot66 Add dtsi entries for wlan node for qca6755 parrot66. Change-Id: Iee797f54d7ee12d8eb2c65ff117e1f1b4629db86 --- parrot-idp-wcn6755.dts | 17 +++++ parrot-qrd-wcn6755.dts | 17 +++++ parrot-wcn6755.dtsi | 164 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 198 insertions(+) create mode 100644 parrot-idp-wcn6755.dts create mode 100644 parrot-qrd-wcn6755.dts create mode 100644 parrot-wcn6755.dtsi diff --git a/parrot-idp-wcn6755.dts b/parrot-idp-wcn6755.dts new file mode 100644 index 00000000..53e06a57 --- /dev/null +++ b/parrot-idp-wcn6755.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP"; + compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <34 5>, <34 6>; +}; diff --git a/parrot-qrd-wcn6755.dts b/parrot-qrd-wcn6755.dts new file mode 100644 index 00000000..b0796f4f --- /dev/null +++ b/parrot-qrd-wcn6755.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn6755.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot QRD"; + compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <0x1000B 2>; +}; diff --git a/parrot-wcn6755.dtsi b/parrot-wcn6755.dtsi new file mode 100644 index 00000000..e0249a16 --- /dev/null +++ b/parrot-wcn6755.dtsi @@ -0,0 +1,164 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&soc { + bluetooth: bt_wcn6750 { + compatible = "qcom,wcn6750-bt"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_sleep>; + qcom,bt-reset-gpio = <&tlmm 35 0>; /* BT_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 61 0>; /* SW_CTRL */ + qcom,wl-reset-gpio = <&tlmm 36 0>; /* WL_EN */ + tsens = "quiet-therm"; + + qcom,bt-vdd-io-supply = <&L22B>; /* IO */ + qcom,bt-vdd-aon-supply = <&S7B>; + qcom,bt-vdd-dig-supply = <&S7B>; /* BT_CX_MX */ + qcom,bt-vdd-rfacmn-supply = <&S7B>; + qcom,bt-vdd-rfa-0p8-supply = <&S7B>; + qcom,bt-vdd-rfa1-supply = <&S8E>; /*RFA 1p7*/ + qcom,bt-vdd-rfa2-supply = <&S8B>; /*RFA 1p2*/ + qcom,bt-vdd-ipa-2p2-supply = <&S9B>; /*IPA 2p2*/ + //qcom,bt-vdd-asd-supply = <&L11C>; + + /* max voltage are set to regulator max voltage supported */ + qcom,bt-vdd-io-config = <1800000 2000000 0 1>; + qcom,bt-vdd-aon-config = <824000 1174000 0 1>; + qcom,bt-vdd-dig-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfacmn-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa-0p8-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa1-config = <1872000 2040000 0 1>; + qcom,bt-vdd-rfa2-config = <1256000 1654000 0 1>; + qcom,bt-vdd-ipa-2p2-config = <2200000 2208000 0 1>; + //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; + }; + + qcom,smp2p-wpss { + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + wpss_pas: remoteproc-wpss@8a00000 { + firmware-name = "qca6755/wpss.mdt"; + }; + + icnss2: qcom,wcn6750 { + compatible = "qcom,wcn6750"; + reg = <0x17210040 0x0>, + <0xb0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1c00 0x1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-geometry = <0xa0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "quiet-therm"; + wcn-hw-version = "qca6755"; + qcom,wlan-msa-fixed-region = <&wlan_fw_mem>; + vdd-cx-mx-supply = <&S7B>; + qcom,vdd-cx-mx-config = <880000 1120000 0 0 1>; + vdd-1.8-xo-supply = <&S8E>; + qcom,vdd-1.8-xo-config = <1872000 2040000 0 0 0>; + vdd-1.3-rfa-supply = <&S8B>; + qcom,vdd-1.3-rfa-config = <1256000 1500000 0 0 0>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + mboxes = <&qmp_aop 0>; + qcom,vreg_ol_cpr ="s7b"; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; + +&qupv3_se2_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 105 0>; + vdd-supply = <&L5E>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L22B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; From 8ef6a82f1f550cce999d6e2773caba81f25a6893 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 20 May 2024 13:01:28 +0530 Subject: [PATCH 034/120] ARM: dts: msm: Add opensource wlan device tree support for Netrani Add wcn6750 and wcn3990 parrot dtsi from kernel devicetree to vendor wlan-devicetree and corresponding dts files as part of new wlan teckpack for kernel-6.6 upgrade. Change-Id: I9a48a0731209216800151f21a46727a033cf62cb --- Kbuild | 11 +++ parrot-atp-wcn3990.dts | 17 +++++ parrot-idp-wcn3990.dts | 17 +++++ parrot-idp-wcn6750.dts | 17 +++++ parrot-qrd-wcn3990.dts | 17 +++++ parrot-qrd-wcn6750.dts | 17 +++++ parrot-rumi-wcn3990.dts | 17 +++++ parrot-wcn3990.dtsi | 83 ++++++++++++++++++++ parrot-wcn6750.dtsi | 163 ++++++++++++++++++++++++++++++++++++++++ 9 files changed, 359 insertions(+) create mode 100644 parrot-atp-wcn3990.dts create mode 100644 parrot-idp-wcn3990.dts create mode 100644 parrot-idp-wcn6750.dts create mode 100644 parrot-qrd-wcn3990.dts create mode 100644 parrot-qrd-wcn6750.dts create mode 100644 parrot-rumi-wcn3990.dts create mode 100644 parrot-wcn3990.dtsi create mode 100644 parrot-wcn6750.dtsi diff --git a/Kbuild b/Kbuild index da428956..55a2d664 100644 --- a/Kbuild +++ b/Kbuild @@ -15,6 +15,17 @@ ifeq ($(CONFIG_ARCH_X1E80100),y) dtbo-y += x1e80100-kiwi-cnss.dtbo endif +ifeq ($(CONFIG_ARCH_PARROT),y) +dtbo-y += parrot-idp-wcn3990.dtbo +dtbo-y += parrot-idp-wcn6750.dtbo +dtbo-y += parrot-qrd-wcn3990.dtbo +dtbo-y += parrot-qrd-wcn6750.dtbo +dtbo-y += parrot-atp-wcn3990.dtbo +dtbo-y += parrot-rumi-wcn3990.dtbo +dtbo-y += parrot-idp-wcn6755.dtbo +dtbo-y += parrot-qrd-wcn6755.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/parrot-atp-wcn3990.dts b/parrot-atp-wcn3990.dts new file mode 100644 index 00000000..5bff1263 --- /dev/null +++ b/parrot-atp-wcn3990.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn3990.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot ATP"; + compatible = "qcom,parrot", "qcom,parrot-atp", "qcom,atp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <33 0>; +}; diff --git a/parrot-idp-wcn3990.dts b/parrot-idp-wcn3990.dts new file mode 100644 index 00000000..fa4f3362 --- /dev/null +++ b/parrot-idp-wcn3990.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn3990.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP"; + compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <34 1>, <34 3>, <34 0x601>, <34 0x603>; +}; diff --git a/parrot-idp-wcn6750.dts b/parrot-idp-wcn6750.dts new file mode 100644 index 00000000..bfb83b71 --- /dev/null +++ b/parrot-idp-wcn6750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot IDP"; + compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <34 0>, <34 2>, <34 4>, <34 5>, <34 6>, <34 0x600>, <34 0x602>, <34 0x604>; +}; diff --git a/parrot-qrd-wcn3990.dts b/parrot-qrd-wcn3990.dts new file mode 100644 index 00000000..fc81b8fd --- /dev/null +++ b/parrot-qrd-wcn3990.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn3990.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot QRD"; + compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <0x1000B 0>, <0x1000B 0x600>; +}; diff --git a/parrot-qrd-wcn6750.dts b/parrot-qrd-wcn6750.dts new file mode 100644 index 00000000..19fd640d --- /dev/null +++ b/parrot-qrd-wcn6750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot QRD"; + compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <0x1000B 1>, <0x1000B 2>, <0x1000B 0x601>; +}; diff --git a/parrot-rumi-wcn3990.dts b/parrot-rumi-wcn3990.dts new file mode 100644 index 00000000..f48b5bb7 --- /dev/null +++ b/parrot-rumi-wcn3990.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "parrot-wcn3990.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Parrot RUMI"; + compatible = "qcom,parrot", "qcom,parrot-rumi", "qcom,rumi"; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,board-id = <0x1000F 0>; +}; diff --git a/parrot-wcn3990.dtsi b/parrot-wcn3990.dtsi new file mode 100644 index 00000000..34b0bbe1 --- /dev/null +++ b/parrot-wcn3990.dtsi @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include + +&reserved_memory { + wlan_fw_mem: wlan_fw_region@82a00000 { + no-map; + reg = <0x0 0x82a00000 0x0 0x300000>; + }; +}; + +&soc { + wpss_pas: remoteproc-wpss@8a00000 { + firmware-name = "adrastea/wpss.mdt"; + }; + + icnss: qcom,icnss@22800000 { + compatible = "qcom,icnss"; + reg = <0x22800000 0x800000>; + reg-names = "membase"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x4c0 0x1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + ; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-geometry = <0xa0000000 0x10000000>; + qcom,fw-prefix; + qcom,wlan; + bdf-download-support; + wpss-support-enable; + qcom,wlan-msa-fixed-region = <&wlan_fw_mem>; + vdd-cx-mx-supply = <&L11B>; + vdd-1.8-xo-supply = <&L1E>; + vdd-1.3-rfa-supply = <&L14B>; + vdd-3.3-ch1-supply = <&L11E>; + vdd-3.3-ch0-supply = <&L10E>; + qcom,vdd-cx-mx-config = <0 0>; + qcom,vdd-3.3-ch1-config = <3000000 3312000>; + qcom,vdd-3.3-ch0-config = <3000000 3312000>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>; + qcom,smem-state-names = "wlan-smp2p-out"; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + }; + + bluetooth: bt_wcn3990 { + compatible = "qcom,wcn3990"; + qcom,bt-sw-ctrl-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>; + qcom,bt-vdd-io-supply = <&L22B>; /* IO */ + qcom,bt-vdd-core-supply = <&L14B>; /* RFA */ + qcom,bt-vdd-pa-supply = <&L10E>; /* CH0 */ + qcom,bt-vdd-xtal-supply = <&L1E>; /* XO */ + + qcom,bt-vdd-io-config = <1700000 1900000 1 0>; + qcom,bt-vdd-core-config = <1304000 1304000 1 0>; + qcom,bt-vdd-pa-config = <3000000 3312000 1 0>; + qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>; + }; +}; diff --git a/parrot-wcn6750.dtsi b/parrot-wcn6750.dtsi new file mode 100644 index 00000000..e9d61dae --- /dev/null +++ b/parrot-wcn6750.dtsi @@ -0,0 +1,163 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&soc { + bluetooth: bt_wcn6750 { + compatible = "qcom,wcn6750-bt"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_en_sleep>; + qcom,bt-reset-gpio = <&tlmm 35 0>; /* BT_EN */ + qcom,bt-sw-ctrl-gpio = <&tlmm 61 0>; /* SW_CTRL */ + qcom,wl-reset-gpio = <&tlmm 36 0>; /* WL_EN */ + tsens = "quiet-therm"; + + qcom,bt-vdd-io-supply = <&L22B>; /* IO */ + qcom,bt-vdd-aon-supply = <&S7B>; + qcom,bt-vdd-dig-supply = <&S7B>; /* BT_CX_MX */ + qcom,bt-vdd-rfacmn-supply = <&S7B>; + qcom,bt-vdd-rfa-0p8-supply = <&S7B>; + qcom,bt-vdd-rfa1-supply = <&S8E>; /*RFA 1p7*/ + qcom,bt-vdd-rfa2-supply = <&S8B>; /*RFA 1p2*/ + qcom,bt-vdd-ipa-2p2-supply = <&S9B>; /*IPA 2p2*/ + //qcom,bt-vdd-asd-supply = <&L11C>; + + /* max voltage are set to regulator max voltage supported */ + qcom,bt-vdd-io-config = <1800000 2000000 0 1>; + qcom,bt-vdd-aon-config = <824000 1174000 0 1>; + qcom,bt-vdd-dig-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfacmn-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa-0p8-config = <824000 1174000 0 1>; + qcom,bt-vdd-rfa1-config = <1872000 2040000 0 1>; + qcom,bt-vdd-rfa2-config = <1256000 1654000 0 1>; + qcom,bt-vdd-ipa-2p2-config = <2200000 2208000 0 1>; + //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; + }; + + qcom,smp2p-wpss { + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + wpss_pas: remoteproc-wpss@8a00000 { + firmware-name = "qca6750/wpss.mdt"; + }; + + icnss2: qcom,wcn6750 { + compatible = "qcom,wcn6750"; + reg = <0x17210040 0x0>, + <0xb0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1c00 0x1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-geometry = <0xa0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "quiet-therm"; + qcom,wlan-msa-fixed-region = <&wlan_fw_mem>; + vdd-cx-mx-supply = <&S7B>; + qcom,vdd-cx-mx-config = <880000 1120000 0 0 1>; + vdd-1.8-xo-supply = <&S8E>; + qcom,vdd-1.8-xo-config = <1872000 2040000 0 0 0>; + vdd-1.3-rfa-supply = <&S8B>; + qcom,vdd-1.3-rfa-config = <1256000 1500000 0 0 0>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + mboxes = <&qmp_aop 0>; + qcom,vreg_ol_cpr ="s7b"; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; + +&qupv3_se2_i2c { + status = "ok"; + nq@64 { + compatible = "rtc6226"; + reg = <0x64>; + fmint-gpio = <&tlmm 105 0>; + vdd-supply = <&L5E>; + rtc6226,vdd-supply-voltage = <2800000 2800000>; + rtc6226,vdd-load = <15000>; + vio-supply = <&L22B>; + rtc6226,vio-supply-voltage = <1800000 1800000>; + }; +}; From bfb14148a81947a8e1363d65bee3aeecae0de3a8 Mon Sep 17 00:00:00 2001 From: Venkateswara Naralasetty Date: Mon, 10 Jun 2024 14:47:17 +0530 Subject: [PATCH 035/120] ARM: dts: msm: Add dtsi entry to configure cpu mask Add dtsi entry to configure cpu mask for wlan rx and tx completion interrupt affinity. Change-Id: I3930e401df2e37818405accadb8d5449bc16b5b7 CRs-Fixed: 3837616 --- bindings/cnss-wlan.yaml | 3 +++ sun-kiwi-cnss-v8.dtsi | 5 +++++ sun-kiwi-cnss.dtsi | 5 +++++ sun-peach-cnss-v8.dtsi | 5 +++++ sun-peach-cnss.dtsi | 5 +++++ 5 files changed, 23 insertions(+) diff --git a/bindings/cnss-wlan.yaml b/bindings/cnss-wlan.yaml index e2ef1e30..20a9b7cb 100644 --- a/bindings/cnss-wlan.yaml +++ b/bindings/cnss-wlan.yaml @@ -211,6 +211,9 @@ properties: qcom,bus-bw-cfg: description: Bus bandwidth voting data. + wlan-txrx-intr-cpumask: + description: cpumask for wlan tx rx interrupt affinity + qcom,tcs_offset_int_pow_amp_vreg: description: | TCS CMD register offset for Voltage diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index bd28a0cd..8c8fce19 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -187,6 +187,11 @@ "{class: wlan_pdc, ss: bb, res: s5f.v, enable: 1}", "{class: wlan_pdc, ss: bb, res: s5f.v, upval: 932}", "{class: wlan_pdc, ss: bb, res: s5f.v, dwnval: 444}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; }; }; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index 185769f5..85dc7b1e 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -189,6 +189,11 @@ "{class: wlan_pdc, ss: bb, res: s4j.v, enable: 1}", "{class: wlan_pdc, ss: bb, res: s4j.v, upval: 932}", "{class: wlan_pdc, ss: bb, res: s4j.v, dwnval: 444}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; }; }; diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index c51b6b36..3e2b6ac8 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -193,6 +193,11 @@ "{class: wlan_pdc, ss: rf, res: s5f.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s5f.v, upval: 876}", "{class: wlan_pdc, ss: rf, res: s5f.v, dwnval: 876}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; }; }; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 38520f13..234feb43 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -192,6 +192,11 @@ "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", "{class: wlan_pdc, ss: rf, res: s4j.v, upval: 876}", "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval: 876}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; }; }; From cc66e2efee1b4982817b1cab6f23dbc183c78b2a Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 20 Jun 2024 14:54:16 +0530 Subject: [PATCH 036/120] ARM: dts: msm: Add changes to dt files for qca6750/qca6755 Add changes to parrot66 qca6750/qca6755 dt files to have separate model name and remove moselle plus subtype from it. Change-Id: I873794d4da9016d4b586f9c2b2d7a6d7d9c04739 --- parrot-idp-wcn6750.dts | 2 +- parrot-idp-wcn6755.dts | 2 +- parrot-qrd-wcn6750.dts | 2 +- parrot-qrd-wcn6755.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/parrot-idp-wcn6750.dts b/parrot-idp-wcn6750.dts index bfb83b71..edc24ef1 100644 --- a/parrot-idp-wcn6750.dts +++ b/parrot-idp-wcn6750.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Parrot IDP"; compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; - qcom,board-id = <34 0>, <34 2>, <34 4>, <34 5>, <34 6>, <34 0x600>, <34 0x602>, <34 0x604>; + qcom,board-id = <34 0>, <34 2>, <34 4>, <34 0x600>, <34 0x602>, <34 0x604>; }; diff --git a/parrot-idp-wcn6755.dts b/parrot-idp-wcn6755.dts index 53e06a57..296aa5cd 100644 --- a/parrot-idp-wcn6755.dts +++ b/parrot-idp-wcn6755.dts @@ -10,7 +10,7 @@ #include "parrot-wcn6755.dtsi" / { - model = "Qualcomm Technologies, Inc. Parrot IDP"; + model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP"; compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; qcom,board-id = <34 5>, <34 6>; diff --git a/parrot-qrd-wcn6750.dts b/parrot-qrd-wcn6750.dts index 19fd640d..9fedaf16 100644 --- a/parrot-qrd-wcn6750.dts +++ b/parrot-qrd-wcn6750.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Parrot QRD"; compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; - qcom,board-id = <0x1000B 1>, <0x1000B 2>, <0x1000B 0x601>; + qcom,board-id = <0x1000B 1>, <0x1000B 0x601>; }; diff --git a/parrot-qrd-wcn6755.dts b/parrot-qrd-wcn6755.dts index b0796f4f..8babcf90 100644 --- a/parrot-qrd-wcn6755.dts +++ b/parrot-qrd-wcn6755.dts @@ -10,7 +10,7 @@ #include "parrot-wcn6755.dtsi" / { - model = "Qualcomm Technologies, Inc. Parrot QRD"; + model = "Qualcomm Technologies, Inc. Parrot WCN6755 QRD"; compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; qcom,board-id = <0x1000B 2>; From 0c482d7858097c0c8c7bdc64d2aca1fd36818589 Mon Sep 17 00:00:00 2001 From: Ananya Gupta Date: Tue, 25 Jun 2024 11:46:50 +0530 Subject: [PATCH 037/120] ARM: dts: msm: Enlarge cnss dma memory pool range Enlarge the range of DMA memory pool for hamilton attachment in pakala v8 module. Change-Id: I497ef2bfa6e65799c1f25e08103dcb14ea5d69d3 CRs-Fixed: 3848940 --- sun-kiwi-cnss-v8.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index bd28a0cd..050ff773 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -202,13 +202,13 @@ cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ - iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0xa0000000>, + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; cnss_pci_iommu_group0: cnss_pci_iommu_group0 { qcom,iommu-msi-size = <0x1000>; - qcom,iommu-geometry = <0xa0000000 0x10010000>; + qcom,iommu-geometry = <0x98000000 0x18010000>; qcom,iommu-dma = "fastmap"; qcom,iommu-pagetable = "coherent"; qcom,iommu-faults = "stall-disable", "HUPCF", From 0dffd710b72a24e0754b403459349319805e698b Mon Sep 17 00:00:00 2001 From: Yu Tian Date: Fri, 21 Jun 2024 00:12:15 -0700 Subject: [PATCH 038/120] ARM: dts: msm: sun: Enlarge WLAN IOMMU range to 2G Enlarge WCNSS and ADSP MMU group range from 640MB to 2GB. Change-Id: I009bda638977cd25056b20b26cab2015a95fec37 CRs-Fixed: 3831506 --- sun-peach-cnss-v8.dtsi | 2 +- sun-peach-cnss.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index c51b6b36..cd7fd396 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -204,7 +204,7 @@ cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ - iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x88000000>, + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x18000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; }; diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index 38520f13..8b4afe98 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -203,7 +203,7 @@ cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ - iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x88000000>, + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x18000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; }; From efc50b54069018011f26b4e0087c018a5ef3282e Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Wed, 26 Jun 2024 17:49:27 +0530 Subject: [PATCH 039/120] ARM: dts: msm: Add WLAN support for MTP with 3.5mm audio Add board ID in WLAN kiwi V8 DTS file to enable WLAN support for devices which has 3.5mm audio jack, V8 power grid and Kiwi as WLAN attachment. Change-Id: I2770a311aa0466d83bde1b57049e36d6048ad2bc CRs-Fixed: 3855213 --- sun-kiwi-cnss-v8.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sun-kiwi-cnss-v8.dts b/sun-kiwi-cnss-v8.dts index c82ec0c3..c31a5c35 100644 --- a/sun-kiwi-cnss-v8.dts +++ b/sun-kiwi-cnss-v8.dts @@ -16,5 +16,5 @@ <639 0x10000>, <639 0x20000>, <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>; + qcom,board-id = <0x60001 0>, <0x50008 0>, <0x20015 0>, <0x60108 0>; }; From d0b698718a8ffd4529c0a2f121134fad293e97c7 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Fri, 5 Jul 2024 11:05:47 +0530 Subject: [PATCH 040/120] ARM: dts: msm: Add WLAN support for ATP Add board ID in WLAN peach V8 DTS file to enable WLAN support for ATP devices which has V8 power grid and peach as WLAN attachment. Change-Id: I9cbef8b9d04086b63214d11087bede805ffbf01a CRs-Fixed: 3862456 --- sun-peach-cnss-v8.dts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sun-peach-cnss-v8.dts b/sun-peach-cnss-v8.dts index 523e3ca8..568e5c6d 100644 --- a/sun-peach-cnss-v8.dts +++ b/sun-peach-cnss-v8.dts @@ -17,5 +17,6 @@ <0x100026a 0x10000>, <0x100026a 0x20000>, <0x100027f 0x10000>, <0x100027f 0x20000>; qcom,board-id = <0x50001 0>, <0x40008 0>, <0x3000B 0>, <0x2000B 0>, - <0x30008 0>, <0x40001 0>, <0x30015 0>, <0x60008 0>; + <0x30008 0>, <0x40001 0>, <0x30015 0>, <0x60008 0>, + <0x10021 0>, <0x3000B 1>, <0x40108 0>; }; From 6f882fc78a6a34debb3be0e4a6648477b17c798a Mon Sep 17 00:00:00 2001 From: Amit Kumar Prasad Date: Thu, 27 Jun 2024 17:59:54 +0530 Subject: [PATCH 041/120] ARM: dts: msm: Enable BT slimbus in device tree for parrot Added support for BT slimbus in parrot for supporting BT audio usecases. CRs-Fixed: 3869751 Change-Id: I21a79c770f0b8a60e6b2a5424d13ca00d4af9ea4 --- parrot-wcn3990.dtsi | 17 +++++++++++++++++ parrot-wcn6750.dtsi | 17 +++++++++++++++++ parrot-wcn6755.dtsi | 17 +++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/parrot-wcn3990.dtsi b/parrot-wcn3990.dtsi index 34b0bbe1..96577a91 100644 --- a/parrot-wcn3990.dtsi +++ b/parrot-wcn3990.dtsi @@ -80,4 +80,21 @@ qcom,bt-vdd-pa-config = <3000000 3312000 1 0>; qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>; }; + + slim_msm: slim@3340000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; }; diff --git a/parrot-wcn6750.dtsi b/parrot-wcn6750.dtsi index e9d61dae..390c93ec 100644 --- a/parrot-wcn6750.dtsi +++ b/parrot-wcn6750.dtsi @@ -38,6 +38,23 @@ //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; }; + slim_msm: slim@3340000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; + qcom,smp2p-wpss { smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { qcom,entry-name = "wlan_soc_wake"; diff --git a/parrot-wcn6755.dtsi b/parrot-wcn6755.dtsi index e0249a16..0db78ac0 100644 --- a/parrot-wcn6755.dtsi +++ b/parrot-wcn6755.dtsi @@ -38,6 +38,23 @@ //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; }; + slim_msm: slim@3340000 { + status = "ok"; + ngd@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <1>; + //slimbus child nodes + slimbus: btfmslim-driver { + compatible = "slim217,221"; + reg = <1 0>; + qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ + qcom,btslimtx-channels = <159 160>; + qcom,btslimrx-channels = <157 158>; + }; + }; + }; + qcom,smp2p-wpss { smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { qcom,entry-name = "wlan_soc_wake"; From c447ddd7b3c7767157b471ec8973cb3fbdf1903e Mon Sep 17 00:00:00 2001 From: kartikey Arora Date: Mon, 20 May 2024 13:34:32 +0530 Subject: [PATCH 042/120] ARM: dts: msm: Add opensource wlan device tree support for Clarence Add Ravelin adrastea dtsi from kernel devicetree to vendor wlan-devicetree and corresponding dts files as part of new wlan teckpack for kernel-6.6 upgrade. Change-Id: Id47260ae0c74b76270bb9bdfba9a16cb7ed74aae --- Kbuild | 6 ++++ ravelin-adrastea.dtsi | 67 ++++++++++++++++++++++++++++++++++++++++ ravelin-atp-adrastea.dts | 17 ++++++++++ ravelin-idp-adrastea.dts | 17 ++++++++++ ravelin-qrd-adrastea.dts | 17 ++++++++++ 5 files changed, 124 insertions(+) create mode 100644 ravelin-adrastea.dtsi create mode 100644 ravelin-atp-adrastea.dts create mode 100644 ravelin-idp-adrastea.dts create mode 100644 ravelin-qrd-adrastea.dts diff --git a/Kbuild b/Kbuild index 55a2d664..00ab1b27 100644 --- a/Kbuild +++ b/Kbuild @@ -15,6 +15,12 @@ ifeq ($(CONFIG_ARCH_X1E80100),y) dtbo-y += x1e80100-kiwi-cnss.dtbo endif +ifeq ($(CONFIG_ARCH_RAVELIN),y) +dtbo-y += ravelin-idp-adrastea.dtbo +dtbo-y += ravelin-qrd-adrastea.dtbo +dtbo-y += ravelin-atp-adrastea.dtbo +endif + ifeq ($(CONFIG_ARCH_PARROT),y) dtbo-y += parrot-idp-wcn3990.dtbo dtbo-y += parrot-idp-wcn6750.dtbo diff --git a/ravelin-adrastea.dtsi b/ravelin-adrastea.dtsi new file mode 100644 index 00000000..2aa68787 --- /dev/null +++ b/ravelin-adrastea.dtsi @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include + +&reserved_memory { + wlan_msa_mem: wlan_msa_mem_region@82a00000 { + no-map; + reg = <0x0 0x82a00000 0x0 0x300000>; + }; +}; + +&soc { + wpss_pas: remoteproc-wpss@8a00000 { + firmware-name = "adrastea/wpss.mdt"; + }; + + icnss: qcom,icnss@22800000 { + compatible = "qcom,icnss"; + reg = <0x22800000 0x800000>; + reg-names = "membase"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x4c0 0x1>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + ; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-geometry = <0xa0000000 0x10000000>; + qcom,fw-prefix; + qcom,wlan; + bdf-download-support; + wpss-support-enable; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&L11B>; + vdd-1.8-xo-supply = <&L23B>; + vdd-1.3-rfa-supply = <&L14B>; + vdd-3.3-ch0-supply = <&L7E>; + qcom,vdd-cx-mx-config = <0 0>; + qcom,vdd-3.3-ch0-config = <3000000 3312000>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>; + qcom,smem-state-names = "wlan-smp2p-out"; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + }; +}; diff --git a/ravelin-atp-adrastea.dts b/ravelin-atp-adrastea.dts new file mode 100644 index 00000000..e92ca1b8 --- /dev/null +++ b/ravelin-atp-adrastea.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "ravelin-adrastea.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin ATP"; + compatible = "qcom,ravelin", "qcom,ravelin-atp", "qcom,atp"; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; + qcom,board-id = <33 0>; +}; diff --git a/ravelin-idp-adrastea.dts b/ravelin-idp-adrastea.dts new file mode 100644 index 00000000..e786b90e --- /dev/null +++ b/ravelin-idp-adrastea.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "ravelin-adrastea.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin IDP"; + compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp"; + qcom,msm-id = <568 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; + qcom,board-id = <34 0>, <34 0x601>, <34 2>; +}; diff --git a/ravelin-qrd-adrastea.dts b/ravelin-qrd-adrastea.dts new file mode 100644 index 00000000..6488515a --- /dev/null +++ b/ravelin-qrd-adrastea.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "ravelin-adrastea.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Ravelin QRD"; + compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd"; + qcom,msm-id = <568 0x10000>, <581 0x10000>, <582 0x10000>, <602 0x10000>, <653 0x10000>, <654 0x10000>; + qcom,board-id = <0x1000B 0>, <0x1000B 0x600>; +}; From c1b972a1cd373191b274ab7e6142ac3abb6d54d7 Mon Sep 17 00:00:00 2001 From: Kaushal Hooda Date: Wed, 5 Jun 2024 13:16:57 +0530 Subject: [PATCH 043/120] ARM: dts: msm: Add wlan related dtsi file for volcano This change adds wlan related dtsi file for volcano which has disabled icnss and wpss dtsi node enabled. Change-Id: I5da7d1544607dd57e66b76f6925b424953ec8a3c CRs-Fixed: 3742633 --- Kbuild | 4 ++ volcano-qca6750.dts | 17 ++++++ volcano-qca6750.dtsi | 127 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 volcano-qca6750.dts create mode 100644 volcano-qca6750.dtsi diff --git a/Kbuild b/Kbuild index 00ab1b27..06e0be1d 100644 --- a/Kbuild +++ b/Kbuild @@ -32,6 +32,10 @@ dtbo-y += parrot-idp-wcn6755.dtbo dtbo-y += parrot-qrd-wcn6755.dtbo endif +ifeq ($(CONFIG_ARCH_VOLCANO),y) +dtbo-y += volcano-qca6750.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/volcano-qca6750.dts b/volcano-qca6750.dts new file mode 100644 index 00000000..d71e2fb6 --- /dev/null +++ b/volcano-qca6750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "volcano-qca6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Volcano SoC"; + compatible = "qcom,volcano"; + qcom,msm-id = <636 0x10000>, <640 0x10000>, <657 0x10000>, <658 0x10000>; + qcom,board-id = <0 0>; +}; diff --git a/volcano-qca6750.dtsi b/volcano-qca6750.dtsi new file mode 100644 index 00000000..f0755dec --- /dev/null +++ b/volcano-qca6750.dtsi @@ -0,0 +1,127 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&soc { + qcom,smp2p-wpss { + smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { + qcom,entry-name = "wlan"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_1_out: qcom,smp2p-wlan-1-out { + qcom,entry-name = "wlan"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + icnss2: qcom,wcn6750 { + compatible = "qcom,wcn6750"; + reg = <0x17110040 0x0>, + <0xc0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1400 0x1>; + status = "disabled"; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "sys-therm-4"; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&S3B>; + qcom,vdd-cx-mx-config = <968000 1040000 0 0 1>; + vdd-1.8-xo-supply = <&S1B>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; + vdd-1.3-rfa-supply = <&S2B>; + qcom,vdd-1.3-rfa-config = <1256000 2050000 0 0 0>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + qcom,qmp = <&aoss_qmp>; + + qcom,vreg_ol_cpr ="s3b"; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; From fdeae3f72dd36588de94361ee1e06223f172fe31 Mon Sep 17 00:00:00 2001 From: Kaushal Hooda Date: Wed, 5 Jun 2024 14:58:42 +0530 Subject: [PATCH 044/120] ARM: dts: msm: Add wlan device tree for peach in Milos IOT Add wlan device tree for peach support in QCM6690. Change-Id: Ibeeb2822798b18b6b207246565d0f8546d3083c3 --- Kbuild | 1 + volcano6i-peach-cnss.dts | 19 ++++ volcano6i-peach-cnss.dtsi | 192 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 212 insertions(+) create mode 100644 volcano6i-peach-cnss.dts create mode 100644 volcano6i-peach-cnss.dtsi diff --git a/Kbuild b/Kbuild index 06e0be1d..0bb96dcb 100644 --- a/Kbuild +++ b/Kbuild @@ -34,6 +34,7 @@ endif ifeq ($(CONFIG_ARCH_VOLCANO),y) dtbo-y += volcano-qca6750.dtbo +dtbo-y += volcano6i-peach-cnss.dtbo endif always-y := $(dtb-y) $(dtbo-y) diff --git a/volcano6i-peach-cnss.dts b/volcano6i-peach-cnss.dts new file mode 100644 index 00000000..5eafed56 --- /dev/null +++ b/volcano6i-peach-cnss.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "volcano6i-peach-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Volcano6I IOT SOC + Ganges/Brahma"; + compatible = "qcom,volcano-idp", "qcom,volcano", "qcom,volcanop-idp", + "qcom,volcanop", "qcom,idp", "qcom,volcano-mtp", + "qcom,volcanop-mtp", "qcom,mtp"; + qcom,msm-id = <657 0x10000>, <658 0x10000>; + qcom,board-id = <8 2>, <8 3>, <8 4>, <8 5>, <8 6>, <34 2>, <34 3>; +}; diff --git a/volcano6i-peach-cnss.dtsi b/volcano6i-peach-cnss.dtsi new file mode 100644 index 00000000..b5444e2c --- /dev/null +++ b/volcano6i-peach-cnss.dtsi @@ -0,0 +1,192 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio44"; + function = "gpio"; + }; + + config { + pins = "gpio44"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio44"; + function = "gpio"; + }; + + config { + pins = "gpio44"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio45"; + function = "wcn_sw_ctrl"; + + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio52"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_peach: qcom,cnss-peach@b0000000 { + compatible = "qcom,cnss-peach"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 52 0>; + + supported-ids = <0x110E>; + wlan-en-gpio = <&tlmm 44 0>; + qcom,sw-ctrl-gpio = <&tlmm 45 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <45 52>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + vdd-wlan-io-supply = <&L1B>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + 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>; + vdd-wlan-dig-supply = <&S1L>; + qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; + vdd-wlan-rfa1-supply = <&S1B>; + qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S2B>; + qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L18B>; + qcom,vdd-wlan-ant-share-config = <2800000 2800000 0 0 1>; + + interconnects = + <&pcie_anoc MASTER_PCIE_0 &pcie_anoc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 800000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 800000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 800000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 800000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3224000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3224000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 4264000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s2b.v, dwnval: 1244}", + "{class: wlan_pdc, ss: rf, res: s3b.v, enable: 0}", + "{class: wlan_pdc, ss: rf, res: l5b.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: g1f.e, enable: 0}", + "{class: wlan_pdc, ss: rf, res: l1b.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s3b.m, enable: 0}", + "{class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; + }; +}; + +&wpss_pas { + status = "disabled"; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + 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 = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; From 2dbdbd1c22da3eabd57a6ac9d372f6695da35530 Mon Sep 17 00:00:00 2001 From: Adesh Mohanrao Pathare Date: Fri, 26 Jul 2024 23:05:22 +0530 Subject: [PATCH 045/120] ARM: dts: msm: Removed bluetooth dtsi for netrani Removed the bluetooth device tree changes from wlan techpack, and added into bt techpack. Change-Id: I71e870158427620c8f767d6573123eddc9b55054 --- parrot-wcn3990.dtsi | 31 +---------------------- parrot-wcn6750.dtsi | 61 --------------------------------------------- parrot-wcn6755.dtsi | 61 --------------------------------------------- 3 files changed, 1 insertion(+), 152 deletions(-) diff --git a/parrot-wcn3990.dtsi b/parrot-wcn3990.dtsi index 96577a91..67672727 100644 --- a/parrot-wcn3990.dtsi +++ b/parrot-wcn3990.dtsi @@ -67,34 +67,5 @@ }; - bluetooth: bt_wcn3990 { - compatible = "qcom,wcn3990"; - qcom,bt-sw-ctrl-gpio = <&tlmm 61 GPIO_ACTIVE_HIGH>; - qcom,bt-vdd-io-supply = <&L22B>; /* IO */ - qcom,bt-vdd-core-supply = <&L14B>; /* RFA */ - qcom,bt-vdd-pa-supply = <&L10E>; /* CH0 */ - qcom,bt-vdd-xtal-supply = <&L1E>; /* XO */ - - qcom,bt-vdd-io-config = <1700000 1900000 1 0>; - qcom,bt-vdd-core-config = <1304000 1304000 1 0>; - qcom,bt-vdd-pa-config = <3000000 3312000 1 0>; - qcom,bt-vdd-xtal-config = <1700000 1900000 1 0>; - }; - - slim_msm: slim@3340000 { - status = "ok"; - ngd@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <1>; - //slimbus child nodes - slimbus: btfmslim-driver { - compatible = "slim217,221"; - reg = <1 0>; - qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ - qcom,btslimtx-channels = <159 160>; - qcom,btslimrx-channels = <157 158>; - }; - }; - }; }; + diff --git a/parrot-wcn6750.dtsi b/parrot-wcn6750.dtsi index 390c93ec..d17180c2 100644 --- a/parrot-wcn6750.dtsi +++ b/parrot-wcn6750.dtsi @@ -7,54 +7,6 @@ #include &soc { - bluetooth: bt_wcn6750 { - compatible = "qcom,wcn6750-bt"; - pinctrl-names = "default"; - pinctrl-0 = <&bt_en_sleep>; - qcom,bt-reset-gpio = <&tlmm 35 0>; /* BT_EN */ - qcom,bt-sw-ctrl-gpio = <&tlmm 61 0>; /* SW_CTRL */ - qcom,wl-reset-gpio = <&tlmm 36 0>; /* WL_EN */ - tsens = "quiet-therm"; - - qcom,bt-vdd-io-supply = <&L22B>; /* IO */ - qcom,bt-vdd-aon-supply = <&S7B>; - qcom,bt-vdd-dig-supply = <&S7B>; /* BT_CX_MX */ - qcom,bt-vdd-rfacmn-supply = <&S7B>; - qcom,bt-vdd-rfa-0p8-supply = <&S7B>; - qcom,bt-vdd-rfa1-supply = <&S8E>; /*RFA 1p7*/ - qcom,bt-vdd-rfa2-supply = <&S8B>; /*RFA 1p2*/ - qcom,bt-vdd-ipa-2p2-supply = <&S9B>; /*IPA 2p2*/ - //qcom,bt-vdd-asd-supply = <&L11C>; - - /* max voltage are set to regulator max voltage supported */ - qcom,bt-vdd-io-config = <1800000 2000000 0 1>; - qcom,bt-vdd-aon-config = <824000 1174000 0 1>; - qcom,bt-vdd-dig-config = <824000 1174000 0 1>; - qcom,bt-vdd-rfacmn-config = <824000 1174000 0 1>; - qcom,bt-vdd-rfa-0p8-config = <824000 1174000 0 1>; - qcom,bt-vdd-rfa1-config = <1872000 2040000 0 1>; - qcom,bt-vdd-rfa2-config = <1256000 1654000 0 1>; - qcom,bt-vdd-ipa-2p2-config = <2200000 2208000 0 1>; - //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; - }; - - slim_msm: slim@3340000 { - status = "ok"; - ngd@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <1>; - //slimbus child nodes - slimbus: btfmslim-driver { - compatible = "slim217,221"; - reg = <1 0>; - qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ - qcom,btslimtx-channels = <159 160>; - qcom,btslimrx-channels = <157 158>; - }; - }; - }; - qcom,smp2p-wpss { smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { qcom,entry-name = "wlan_soc_wake"; @@ -165,16 +117,3 @@ }; }; -&qupv3_se2_i2c { - status = "ok"; - nq@64 { - compatible = "rtc6226"; - reg = <0x64>; - fmint-gpio = <&tlmm 105 0>; - vdd-supply = <&L5E>; - rtc6226,vdd-supply-voltage = <2800000 2800000>; - rtc6226,vdd-load = <15000>; - vio-supply = <&L22B>; - rtc6226,vio-supply-voltage = <1800000 1800000>; - }; -}; diff --git a/parrot-wcn6755.dtsi b/parrot-wcn6755.dtsi index 0db78ac0..c4360cd3 100644 --- a/parrot-wcn6755.dtsi +++ b/parrot-wcn6755.dtsi @@ -7,54 +7,6 @@ #include &soc { - bluetooth: bt_wcn6750 { - compatible = "qcom,wcn6750-bt"; - pinctrl-names = "default"; - pinctrl-0 = <&bt_en_sleep>; - qcom,bt-reset-gpio = <&tlmm 35 0>; /* BT_EN */ - qcom,bt-sw-ctrl-gpio = <&tlmm 61 0>; /* SW_CTRL */ - qcom,wl-reset-gpio = <&tlmm 36 0>; /* WL_EN */ - tsens = "quiet-therm"; - - qcom,bt-vdd-io-supply = <&L22B>; /* IO */ - qcom,bt-vdd-aon-supply = <&S7B>; - qcom,bt-vdd-dig-supply = <&S7B>; /* BT_CX_MX */ - qcom,bt-vdd-rfacmn-supply = <&S7B>; - qcom,bt-vdd-rfa-0p8-supply = <&S7B>; - qcom,bt-vdd-rfa1-supply = <&S8E>; /*RFA 1p7*/ - qcom,bt-vdd-rfa2-supply = <&S8B>; /*RFA 1p2*/ - qcom,bt-vdd-ipa-2p2-supply = <&S9B>; /*IPA 2p2*/ - //qcom,bt-vdd-asd-supply = <&L11C>; - - /* max voltage are set to regulator max voltage supported */ - qcom,bt-vdd-io-config = <1800000 2000000 0 1>; - qcom,bt-vdd-aon-config = <824000 1174000 0 1>; - qcom,bt-vdd-dig-config = <824000 1174000 0 1>; - qcom,bt-vdd-rfacmn-config = <824000 1174000 0 1>; - qcom,bt-vdd-rfa-0p8-config = <824000 1174000 0 1>; - qcom,bt-vdd-rfa1-config = <1872000 2040000 0 1>; - qcom,bt-vdd-rfa2-config = <1256000 1654000 0 1>; - qcom,bt-vdd-ipa-2p2-config = <2200000 2208000 0 1>; - //qcom,bt-vdd-asd-config = <2800000 3544000 0 1>; - }; - - slim_msm: slim@3340000 { - status = "ok"; - ngd@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <1>; - //slimbus child nodes - slimbus: btfmslim-driver { - compatible = "slim217,221"; - reg = <1 0>; - qcom,btslim-address = <0x0>; /* BT SLIM EP address*/ - qcom,btslimtx-channels = <159 160>; - qcom,btslimrx-channels = <157 158>; - }; - }; - }; - qcom,smp2p-wpss { smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { qcom,entry-name = "wlan_soc_wake"; @@ -166,16 +118,3 @@ }; }; -&qupv3_se2_i2c { - status = "ok"; - nq@64 { - compatible = "rtc6226"; - reg = <0x64>; - fmint-gpio = <&tlmm 105 0>; - vdd-supply = <&L5E>; - rtc6226,vdd-supply-voltage = <2800000 2800000>; - rtc6226,vdd-load = <15000>; - vio-supply = <&L22B>; - rtc6226,vio-supply-voltage = <1800000 1800000>; - }; -}; From 43647d1d134a48e3fb03aa1491c0fd1660add73d Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Mon, 5 Aug 2024 19:14:05 +0530 Subject: [PATCH 046/120] ARM: dts: msm: Set unvote flag for vdd-wlan after bootup Set unvote flag for S5F regulator(WLAN CX) after FW_READY during device bootup with V8 and V6 board in parity with previous msms. Change-Id: Ie8220c5f0dd412027cd76c10b85f1bd6ae48f5ff CRs-Fixed: 3890149 --- sun-kiwi-cnss-v8.dtsi | 2 +- sun-kiwi-cnss.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sun-kiwi-cnss-v8.dtsi b/sun-kiwi-cnss-v8.dtsi index 83bfe27d..ad93ad61 100644 --- a/sun-kiwi-cnss-v8.dtsi +++ b/sun-kiwi-cnss-v8.dtsi @@ -96,7 +96,7 @@ vdd-wlan-io12-supply = <&L2F>; qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-supply = <&S5F>; - qcom,vdd-wlan-config = <932000 1000000 0 0 0>; + qcom,vdd-wlan-config = <932000 1000000 0 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S1D>; diff --git a/sun-kiwi-cnss.dtsi b/sun-kiwi-cnss.dtsi index f2e1b5a1..47c5f1f5 100644 --- a/sun-kiwi-cnss.dtsi +++ b/sun-kiwi-cnss.dtsi @@ -96,7 +96,7 @@ vdd-wlan-io12-supply = <&L2F>; qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; vdd-wlan-supply = <&S4J>; - qcom,vdd-wlan-config = <932000 1000000 0 0 0>; + qcom,vdd-wlan-config = <932000 1000000 0 0 1>; vdd-wlan-aon-supply = <&S4D>; qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>; vdd-wlan-dig-supply = <&S1D>; From 6d4a30daec121f2fa4b5babb3f1556fa14dbc65d Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Tue, 27 Aug 2024 16:52:06 +0530 Subject: [PATCH 047/120] ARM: dts: msm: Add msm-id for soft sku in Milos target This change adds the msm-id for soft sku in Milos target. Change-Id: I731b80d17f58a718fb4bdec8a17a20ed9a3228fe CRs-Fixed: 3906560 --- volcano-qca6750.dts | 2 +- volcano6i-peach-cnss.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/volcano-qca6750.dts b/volcano-qca6750.dts index d71e2fb6..52b1a039 100644 --- a/volcano-qca6750.dts +++ b/volcano-qca6750.dts @@ -12,6 +12,6 @@ / { model = "Qualcomm Technologies, Inc. Volcano SoC"; compatible = "qcom,volcano"; - qcom,msm-id = <636 0x10000>, <640 0x10000>, <657 0x10000>, <658 0x10000>; + qcom,msm-id = <636 0x10000>, <640 0x10000>, <657 0x10000>, <658 0x10000>, <0X10291 0x10000>, <0x10292 0x10000>, <0x20291 0x10000>, <0x20292 0x10000>, <0x30291 0x10000>, <0x30292 0x10000>, <0x40291 0x10000>, <0x40292 0x10000>; qcom,board-id = <0 0>; }; diff --git a/volcano6i-peach-cnss.dts b/volcano6i-peach-cnss.dts index 5eafed56..bd568cb1 100644 --- a/volcano6i-peach-cnss.dts +++ b/volcano6i-peach-cnss.dts @@ -14,6 +14,6 @@ compatible = "qcom,volcano-idp", "qcom,volcano", "qcom,volcanop-idp", "qcom,volcanop", "qcom,idp", "qcom,volcano-mtp", "qcom,volcanop-mtp", "qcom,mtp"; - qcom,msm-id = <657 0x10000>, <658 0x10000>; + qcom,msm-id = <657 0x10000>, <658 0x10000>, <0X10291 0x10000>, <0x10292 0x10000>, <0x20291 0x10000>, <0x20292 0x10000>, <0x30291 0x10000>, <0x30292 0x10000>, <0x40291 0x10000>, <0x40292 0x10000>; qcom,board-id = <8 2>, <8 3>, <8 4>, <8 5>, <8 6>, <34 2>, <34 3>; }; From 09fde6cbb77670fbc40a16bda4d39072067ce315 Mon Sep 17 00:00:00 2001 From: Mohammed Ahmed Date: Wed, 11 Sep 2024 15:04:12 -0700 Subject: [PATCH 048/120] ARM: dts: msm: Add canoe target dts files Add canoe target dts files Change-Id: Iffee5ea6e1679c564e29a560c715b9a3c5df3300 CRs-Fixed: 3922164 --- canoe-kiwi-cnss.dts | 19 ++++ canoe-kiwi-cnss.dtsi | 225 ++++++++++++++++++++++++++++++++++++++++++ canoe-peach-cnss.dts | 20 ++++ canoe-peach-cnss.dtsi | 215 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 479 insertions(+) create mode 100644 canoe-kiwi-cnss.dts create mode 100644 canoe-kiwi-cnss.dtsi create mode 100644 canoe-peach-cnss.dts create mode 100644 canoe-peach-cnss.dtsi diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts new file mode 100644 index 00000000..7fbc39ed --- /dev/null +++ b/canoe-kiwi-cnss.dts @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "canoe-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Canoe SoCs"; + compatible = "qcom,canoe", "qcom,canoep", "qcom,canoe-mtp", "qcom,canoe-cdp"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,board-id = <0x20001 0>, <0x20008 0>, <0x40015 0>; +}; diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi new file mode 100644 index 00000000..75f8daf5 --- /dev/null +++ b/canoe-kiwi-cnss.dtsi @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + vdd-wlan-io-supply = <&L3F>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + vdd-wlan-io12-supply = <&L2F>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + vdd-wlan-supply = <&S4J>; + qcom,vdd-wlan-config = <932000 1000000 0 0 0>; + vdd-wlan-aon-supply = <&S4D>; + qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>; + vdd-wlan-dig-supply = <&S1D>; + qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; + vdd-wlan-rfa1-supply = <&S3G>; + qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7I>; + qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; + + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 800000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 800000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 800000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 800000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3224000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3224000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 4264000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + + qcom,vreg_pdc_map = + "s4j", "bb", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf", + "s1d", "rf"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "s4d", + "VDD095_PMU", "s4j", + "VDD_PMU_AON_I", "s1d", + "VDD095_PMU_BT", "s1d", + "VDD09_PMU_RFA_I", "s1d", + "VDD13_PMU_PCIE_I", "s7i", + "VDD13_PMU_RFA_I", "s7i", + "VDD19_PMU_PCIE_I", "s3g", + "VDD19_PMU_RFA_I", "s3g"; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", + "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 1844}", + "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1316}", + "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval: 972}", + "{class: wlan_pdc, ss: rf, res: s1d.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s1d.v, upval: 916}", + "{class: wlan_pdc, ss: rf, res: s1d.v, dwnval: 880}", + "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 0}", + "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 0}", + "{class: wlan_pdc, ss: bb, res: s4d.v, upval: 976}", + "{class: wlan_pdc, ss: bb, res: s4d.v, dwnval: 536}", + "{class: wlan_pdc, ss: bb, res: s4j.m, enable: 1}", + "{class: wlan_pdc, ss: bb, res: s4j.v, enable: 1}", + "{class: wlan_pdc, ss: bb, res: s4j.v, upval: 932}", + "{class: wlan_pdc, ss: bb, res: s4j.v, dwnval: 444}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; + }; +}; + +&pcie0_rp { + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; + + #address-cells = <1>; + #size-cells = <1>; + + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + + cnss_pci_iommu_group0: cnss_pci_iommu_group0 { + qcom,iommu-msi-size = <0x1000>; + qcom,iommu-geometry = <0x98000000 0x18010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts new file mode 100644 index 00000000..90dfecb8 --- /dev/null +++ b/canoe-peach-cnss.dts @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "canoe-peach-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Sun SoCs"; + compatible = "qcom,canoe", "qcom,canoep"; + qcom,msm-id = <618 0x10000>, <618 0x20000>, + <639 0x10000>, <639 0x20000>, + <0x100026a 0x10000>, <0x100026a 0x20000>, + <0x100027f 0x10000>, <0x100027f 0x20000>; + qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; +}; diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi new file mode 100644 index 00000000..6d4ff475 --- /dev/null +++ b/canoe-peach-cnss.dtsi @@ -0,0 +1,215 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + + cnss_host_sol_default: cnss_host_sol_default { + mux { + pins = "gpio202"; + function = "gpio"; + }; + + config { + pins = "gpio202"; + drive-strength = <4>; + bias-pull-down; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_peach: qcom,cnss-peach@b0000000 { + compatible = "qcom,cnss-peach"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x110E>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + wlan-host-sol-gpio = <&tlmm 202 0>; + wlan-dev-sol-gpio = <&tlmm 203 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx", "sol_default"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + pinctrl-4 = <&cnss_host_sol_default>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + msix-match-addr = <0x3000>; + + vdd-wlan-io-supply = <&L3F>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + vdd-wlan-io12-supply = <&L2F>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + vdd-wlan-aon-supply = <&S4D>; + qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; + vdd-wlan-dig-supply = <&S4J>; + qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; + vdd-wlan-rfa1-supply = <&S3G>; + qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7I>; + qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; + + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 800000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 800000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 800000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 800000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3224000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3224000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 4264000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + + qcom,vreg_pdc_map = + "s4j", "rf", + "s4d", "bb", + "s3g", "rf", + "s7i", "rf"; + + qcom,pmu_vreg_map = + "VDDD_AON_0P9", "s4j", + "VDDA_RFA_1P9", "s3g", + "VDDA_RFA_1P3", "s7i", + "VDDA_RFA_0P9", "s4j", + "VDDD_WLMX_0P9", "s4d", + "VDDD_WLCX_0P9", "s4j", + "VDDD_BTCX_0P9", "s4j", + "VDDD_BTCMX_0P9", "s4j", + "VDDA_PCIE_1P2", "s7i", + "VDDA_PCIE_0P9", "s7i"; + + qcom,pdc_init_table = + "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", + "{class: wlan_pdc, ss: rf, res: s4j.v, upval: 876}", + "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval: 876}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; + }; +}; + +&pcie0_rp { + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; + + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x18000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + }; +}; From 548c30e08a9efe715560fb5c41507b12d1bf3dc0 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Tue, 3 Sep 2024 11:26:12 +0530 Subject: [PATCH 049/120] ARM: dts: msm: Add opensource wlan device tree support for tuna-wcn7750 This change adds wlan related dt files for tuna-wcn7750 which has icnss and wpss dtsi node enabled. Change-Id: I59167fbff63c7a54836452f6f29e4ede14f3f4c7 CRs-Fixed: 3940163 --- Kbuild | 8 ++ tuna-cdp-wcn7750.dts | 17 ++++ tuna-mtp-qmp1000-wcn7750.dts | 17 ++++ tuna-mtp-wcn7750.dts | 17 ++++ tuna-qrd-wcn7750.dts | 17 ++++ tuna-rcm-wcn7750.dts | 17 ++++ tuna-wcn7750.dtsi | 170 +++++++++++++++++++++++++++++++++++ 7 files changed, 263 insertions(+) create mode 100644 tuna-cdp-wcn7750.dts create mode 100644 tuna-mtp-qmp1000-wcn7750.dts create mode 100644 tuna-mtp-wcn7750.dts create mode 100644 tuna-qrd-wcn7750.dts create mode 100644 tuna-rcm-wcn7750.dts create mode 100644 tuna-wcn7750.dtsi diff --git a/Kbuild b/Kbuild index 0bb96dcb..0ae9166a 100644 --- a/Kbuild +++ b/Kbuild @@ -37,6 +37,14 @@ dtbo-y += volcano-qca6750.dtbo dtbo-y += volcano6i-peach-cnss.dtbo endif +ifeq ($(CONFIG_ARCH_TUNA),y) +dtbo-y += tuna-rcm-wcn7750.dtbo +dtbo-y += tuna-cdp-wcn7750.dtbo +dtbo-y += tuna-mtp-wcn7750.dtbo +dtbo-y += tuna-mtp-qmp1000-wcn7750.dtbo +dtbo-y += tuna-qrd-wcn7750.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/tuna-cdp-wcn7750.dts b/tuna-cdp-wcn7750.dts new file mode 100644 index 00000000..429f4fdc --- /dev/null +++ b/tuna-cdp-wcn7750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-wcn7750.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. Tuna CDP"; + compatible = "qcom,tuna-cdp", "qcom,tuna", "qcom,cdp"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <1 0>; +}; diff --git a/tuna-mtp-qmp1000-wcn7750.dts b/tuna-mtp-qmp1000-wcn7750.dts new file mode 100644 index 00000000..aca592ef --- /dev/null +++ b/tuna-mtp-qmp1000-wcn7750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-wcn7750.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. Tuna MTP QMP1000"; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <8 1>; +}; diff --git a/tuna-mtp-wcn7750.dts b/tuna-mtp-wcn7750.dts new file mode 100644 index 00000000..4676d7f0 --- /dev/null +++ b/tuna-mtp-wcn7750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-wcn7750.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. Tuna MTP"; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <8 0>; +}; diff --git a/tuna-qrd-wcn7750.dts b/tuna-qrd-wcn7750.dts new file mode 100644 index 00000000..dfd9ea29 --- /dev/null +++ b/tuna-qrd-wcn7750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-wcn7750.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. Tuna QRD"; + compatible = "qcom,tuna-qrd", "qcom,tuna", "qcom,qrd"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <11 0>; +}; diff --git a/tuna-rcm-wcn7750.dts b/tuna-rcm-wcn7750.dts new file mode 100644 index 00000000..c2796916 --- /dev/null +++ b/tuna-rcm-wcn7750.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-wcn7750.dtsi" + +/ { + + model = "Qualcomm Technologies, Inc. Tuna RCM"; + compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <21 0>; +}; diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi new file mode 100644 index 00000000..979d3f34 --- /dev/null +++ b/tuna-wcn7750.dtsi @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include + +&soc { + qcom,smp2p-wpss { + smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { + qcom,entry-name = "wlan"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_1_out: qcom,smp2p-wlan-1-out { + qcom,entry-name = "wlan"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + icnss2: qcom,wcn7750 { + compatible = "qcom,wcn7750"; + reg = <0x17110040 0x0>, + <0xc0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1480 0x1>; + wlan-en-gpio =<35>; + host-sol-gpio =<132>; + dev-sol-gpio =<32>; + wlan-sw-ctrl-gpio =<80>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "sys-therm-3"; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + qcom,qmp = <&aoss_qmp>; + qcom,vreg_ol_cpr ="s3b"; + + interconnects = + <&pcie_anoc MASTER_PCIE_0 &pcie_anoc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1200000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1200000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1200000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1200000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3224000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3224000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 4264000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 451.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 451.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 451.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 451.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <7500 2188800>; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; From e026734e7df61361b57ef0d122463e9d9fa18855 Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Fri, 27 Sep 2024 11:20:13 +0530 Subject: [PATCH 050/120] ARM: dts: msm: Add updated msm-id for soft sku in Milos target This change updates the msm-id in new format for soft sku in Milos target. Change-Id: Ic386689c82605cb0c287edb8d9fe63ecf806d558 CRs-Fixed: 3944573 --- volcano-qca6750.dts | 2 +- volcano6i-peach-cnss.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/volcano-qca6750.dts b/volcano-qca6750.dts index 52b1a039..385ad760 100644 --- a/volcano-qca6750.dts +++ b/volcano-qca6750.dts @@ -12,6 +12,6 @@ / { model = "Qualcomm Technologies, Inc. Volcano SoC"; compatible = "qcom,volcano"; - qcom,msm-id = <636 0x10000>, <640 0x10000>, <657 0x10000>, <658 0x10000>, <0X10291 0x10000>, <0x10292 0x10000>, <0x20291 0x10000>, <0x20292 0x10000>, <0x30291 0x10000>, <0x30292 0x10000>, <0x40291 0x10000>, <0x40292 0x10000>; + 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>; }; diff --git a/volcano6i-peach-cnss.dts b/volcano6i-peach-cnss.dts index bd568cb1..df9455da 100644 --- a/volcano6i-peach-cnss.dts +++ b/volcano6i-peach-cnss.dts @@ -14,6 +14,6 @@ compatible = "qcom,volcano-idp", "qcom,volcano", "qcom,volcanop-idp", "qcom,volcanop", "qcom,idp", "qcom,volcano-mtp", "qcom,volcanop-mtp", "qcom,mtp"; - qcom,msm-id = <657 0x10000>, <658 0x10000>, <0X10291 0x10000>, <0x10292 0x10000>, <0x20291 0x10000>, <0x20292 0x10000>, <0x30291 0x10000>, <0x30292 0x10000>, <0x40291 0x10000>, <0x40292 0x10000>; + qcom,msm-id = <0x4000291 0x10000>, <0x8000291 0x10000>, <0xc000291 0x10000>, <0x10000291 0x10000>, <0x4000292 0x10000>, <0x8000292 0x10000>, <0xc000292 0x10000>, <0x10000292 0x10000>; qcom,board-id = <8 2>, <8 3>, <8 4>, <8 5>, <8 6>, <34 2>, <34 3>; }; From 123cc2aa91ac11fae8978c9234e97dd0ef4f0cce Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Wed, 9 Oct 2024 11:51:36 +0530 Subject: [PATCH 051/120] ARM: dts: msm: Update regulators config in tuna-wcn7750.dtsi This change adds regulator config in tuna-wcn7750.dtsi and update pcie_anoc to pcie_noc in bus bandwidth config params. Change-Id: I77e680aaed87b9b4faabb660202377abcd9777c1 CRs-Fixed: 3944462 --- tuna-wcn7750.dtsi | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 979d3f34..2369b84e 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -91,6 +91,13 @@ tsens = "sys-therm-3"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&S3B>; + qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; + vdd-1.8-xo-supply = <&S1B>; + 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>; + qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, <&smp2p_wlan_3_out 0>; @@ -102,7 +109,7 @@ qcom,vreg_ol_cpr ="s3b"; interconnects = - <&pcie_anoc MASTER_PCIE_0 &pcie_anoc SLAVE_ANOC_PCIE_GEM_NOC>, + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; From 2e9ba4dfeb0232a837e83fb9d75bd0d2ea185fc7 Mon Sep 17 00:00:00 2001 From: Abhishek Mantha Date: Fri, 11 Oct 2024 13:00:28 +0530 Subject: [PATCH 052/120] ARM: dts: msm: Add dtbo file in Kbuild for tuna-kiwi This change will include dtbo file in Kbuild for tuna-kiwi. Change-Id: I3b1d475751c1d0f7abd6529daa57674a7b7e939b CRs-Fixed: 3946030 --- Kbuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Kbuild b/Kbuild index 0ae9166a..70c7bb92 100644 --- a/Kbuild +++ b/Kbuild @@ -43,6 +43,9 @@ dtbo-y += tuna-cdp-wcn7750.dtbo dtbo-y += tuna-mtp-wcn7750.dtbo dtbo-y += tuna-mtp-qmp1000-wcn7750.dtbo dtbo-y += tuna-qrd-wcn7750.dtbo +dtbo-y += tuna-mtp-kiwi.dtbo +dtbo-y += tuna-rcm-kiwi.dtbo +dtbo-y += tuna-atp-kiwi.dtbo endif always-y := $(dtb-y) $(dtbo-y) From 6a57ec6f7f270867cfefb3c7b303e0aeadd69bd2 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Tue, 24 Sep 2024 19:03:41 +0530 Subject: [PATCH 053/120] ARM: dts: msm: Add opensource wlan device tree support for tuna-kiwi This change adds wlan opensource dt files for tuna-kiwi. Change-Id: Ieab01519346f3024a14dc766999488cea95b9ba2 CRs-Fixed: 3940905 --- tuna-atp-kiwi.dts | 16 ++++ tuna-kiwi-cnss.dtsi | 198 ++++++++++++++++++++++++++++++++++++++++++++ tuna-mtp-kiwi.dts | 16 ++++ tuna-rcm-kiwi.dts | 16 ++++ 4 files changed, 246 insertions(+) create mode 100644 tuna-atp-kiwi.dts create mode 100644 tuna-kiwi-cnss.dtsi create mode 100644 tuna-mtp-kiwi.dts create mode 100644 tuna-rcm-kiwi.dts diff --git a/tuna-atp-kiwi.dts b/tuna-atp-kiwi.dts new file mode 100644 index 00000000..f0384004 --- /dev/null +++ b/tuna-atp-kiwi.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Tuna ATP + kiwi WLAN"; + compatible = "qcom,tuna-atp", "qcom,tuna", "qcom,atp"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <33 0>; +}; diff --git a/tuna-kiwi-cnss.dtsi b/tuna-kiwi-cnss.dtsi new file mode 100644 index 00000000..c32c7cab --- /dev/null +++ b/tuna-kiwi-cnss.dtsi @@ -0,0 +1,198 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&wlan_msa_mem { + status = "disabled"; +}; + +&wpss_mem { + status = "disabled"; +}; + +&wpss_pas { + status = "disabled"; +}; + +&pcie0 { + status = "ok"; +}; + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio35"; + function = "gpio"; + }; + + config { + pins = "gpio35"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio80"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio34"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 34 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 35 0>; + qcom,bt-en-gpio = <&pm8550vs_g_gpios 4 0>; + qcom,sw-ctrl-gpio = <&tlmm 80 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <80 34>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1200000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1200000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1200000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1200000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3224000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3224000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 4264000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 451.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 451.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 451.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 451.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <7500 2188800>; + + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: s3b.v, upval: 976}", + " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", + " {class: wlan_pdc, ss: rf, res: s1g.m, enable: 0}", + " {class: wlan_pdc, ss: rf, res: l18b.m, enable: 0}", + " {class: wlan_pdc, ss: rf, res: b1b.m, enable: 0}", + " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; + }; +}; + +&pcie0_rp { + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = + <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; + + #address-cells = <1>; + #size-cells = <1>; + + cnss_pci0_iommu_region_partition: + cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + + cnss_pci_iommu_group0: cnss_pci_iommu_group0 { + qcom,iommu-msi-size = <0x1000>; + qcom,iommu-geometry = <0x98000000 0x18010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/tuna-mtp-kiwi.dts b/tuna-mtp-kiwi.dts new file mode 100644 index 00000000..fece1611 --- /dev/null +++ b/tuna-mtp-kiwi.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN"; + compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <8 2>; +}; diff --git a/tuna-rcm-kiwi.dts b/tuna-rcm-kiwi.dts new file mode 100644 index 00000000..ab921bac --- /dev/null +++ b/tuna-rcm-kiwi.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "tuna-kiwi-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Tuna RCM + kiwi WLAN"; + compatible = "qcom,tuna-rcm", "qcom,tuna", "qcom,rcm"; + qcom,msm-id = <655 0x10000>, <681 0x10000>; + qcom,board-id = <21 1>; +}; From 3059aac8f86ffb8defca90c934583647c508da00 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 15 Oct 2024 21:48:02 +0530 Subject: [PATCH 054/120] ARM: dts: msm: Update wlan device tree support for Canoe Update wlan opensource device tree support for Canoe SOC. Change-Id: If682b8d28cbb03a17572ea84be422070f5f47d64 CRs-Fixed: 3950204 --- canoe-kiwi-cnss.dts | 10 +++-- canoe-kiwi-cnss.dtsi | 105 +++---------------------------------------- 2 files changed, 11 insertions(+), 104 deletions(-) diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts index 7fbc39ed..5af778f5 100644 --- a/canoe-kiwi-cnss.dts +++ b/canoe-kiwi-cnss.dts @@ -12,8 +12,10 @@ / { model = "Qualcomm Technologies, Inc. Canoe SoCs"; compatible = "qcom,canoe", "qcom,canoep", "qcom,canoe-mtp", "qcom,canoe-cdp"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <0x20001 0>, <0x20008 0>, <0x40015 0>; + qcom,msm-id = <0x10294 0x10000>, <0x10294 0x20000>, <0x10295 0x10000>, <0x10295 0x20000>, + <0x30294 0x10000>, <0x30294 0x20000>, <0x30295 0x10000>, <0x30295 0x20000>, + <0x1010294 0x10000>, <0x1010294 0x20000>, <0x1010295 0x10000>, + <0x1010295 0x20000>, <0x1030294 0x10000>, <0x1030294 0x20000>, + <0x1030295 0x10000>, <0x1030295 0x20000>; + qcom,board-id = <0x1000001 0>, <0x1000008 0>, <0x1000015 0>; }; diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 75f8daf5..356cc16e 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -65,13 +65,13 @@ &soc { wlan_kiwi: qcom,cnss-kiwi@b0000000 { compatible = "qcom,cnss-kiwi"; - reg = <0xb0000000 0x10000>; + reg = <0x0 0xb0000000 0x0 0x10000>; reg-names = "smmu_iova_ipa"; qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; supported-ids = <0x1107>; wlan-en-gpio = <&tlmm 16 0>; - qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; + qcom,bt-en-gpio = <&pmh0104_gpios 5 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; @@ -91,104 +91,9 @@ /* For AOP communication, use direct QMP instead of mailbox */ qcom,qmp = <&aoss_qmp>; - vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; - vdd-wlan-io12-supply = <&L2F>; - qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; - vdd-wlan-supply = <&S4J>; - qcom,vdd-wlan-config = <932000 1000000 0 0 0>; - vdd-wlan-aon-supply = <&S4D>; - qcom,vdd-wlan-aon-config = <976000 1036000 0 0 1>; - vdd-wlan-dig-supply = <&S1D>; - qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; - vdd-wlan-rfa1-supply = <&S3G>; - qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; - vdd-wlan-rfa2-supply = <&S7I>; - qcom,vdd-wlan-rfa2-config = <1316000 1340000 0 0 1>; - vdd-wlan-ant-share-supply = <&L6K>; - qcom,vdd-wlan-ant-share-config = <1800000 1800000 0 0 1>; + // TODO REGULATORS - interconnects = - <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, - <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; - interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; - - qcom,icc-path-count = <2>; - qcom,bus-bw-cfg-count = <9>; - qcom,bus-bw-cfg = - /** ICC Path 1 **/ - <0 0>, /* no vote */ - /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 800000>, - /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 800000>, - /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 800000>, - /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 800000>, - /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, - /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, - /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, - /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, - - /** ICC Path 2 **/ - <0 0>, - /* idle: 0-18 Mbps ddr: 547.2 MHz */ - <2250 2188800>, - /* low: 18-60 Mbps ddr: 547.2 MHz */ - <7500 2188800>, - /* medium: 60-240 Mbps ddr: 547.2 MHz */ - <30000 2188800>, - /* high: 240-1200 Mbps ddr: 547.2 MHz */ - <100000 2188800>, - /* very high: > 1200 Mbps ddr: 1555 MHz */ - <175000 6220800>, - /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, - /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ - <7500 2188800>; - - qcom,vreg_pdc_map = - "s4j", "bb", - "s4d", "bb", - "s3g", "rf", - "s7i", "rf", - "s1d", "rf"; - - qcom,pmu_vreg_map = - "VDD095_MX_PMU", "s4d", - "VDD095_PMU", "s4j", - "VDD_PMU_AON_I", "s1d", - "VDD095_PMU_BT", "s1d", - "VDD09_PMU_RFA_I", "s1d", - "VDD13_PMU_PCIE_I", "s7i", - "VDD13_PMU_RFA_I", "s7i", - "VDD19_PMU_PCIE_I", "s3g", - "VDD19_PMU_RFA_I", "s3g"; - - qcom,pdc_init_table = - "{class: wlan_pdc, ss: rf, res: s3g.v, upval: 1856}", - "{class: wlan_pdc, ss: rf, res: s3g.v, dwnval: 1844}", - "{class: wlan_pdc, ss: rf, res: s7i.v, upval: 1316}", - "{class: wlan_pdc, ss: rf, res: s7i.v, dwnval: 972}", - "{class: wlan_pdc, ss: rf, res: s1d.m, enable: 1}", - "{class: wlan_pdc, ss: rf, res: s1d.v, enable: 1}", - "{class: wlan_pdc, ss: rf, res: s1d.v, upval: 916}", - "{class: wlan_pdc, ss: rf, res: s1d.v, dwnval: 880}", - "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 0}", - "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 0}", - "{class: wlan_pdc, ss: bb, res: s4d.v, upval: 976}", - "{class: wlan_pdc, ss: bb, res: s4d.v, dwnval: 536}", - "{class: wlan_pdc, ss: bb, res: s4j.m, enable: 1}", - "{class: wlan_pdc, ss: bb, res: s4j.v, enable: 1}", - "{class: wlan_pdc, ss: bb, res: s4j.v, upval: 932}", - "{class: wlan_pdc, ss: bb, res: s4j.v, dwnval: 444}"; + // TODO PDC TABLE BUS BW /* cpu mask used for wlan tx rx interrupt affinity * @@ -208,7 +113,7 @@ #size-cells = <1>; cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { - /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + /* address-cells =3 size-cells=2 from canoe-pcie.dtsi */ iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; From 9ef7354c67da750b81d6a168f2175e10421aaada Mon Sep 17 00:00:00 2001 From: Mohammed Ahmed Date: Fri, 11 Oct 2024 11:33:50 -0700 Subject: [PATCH 055/120] ARM: dts: msm: Add canoe regulator values Add correct regulator values for canoe target Change-Id: I6a5b2b6d95e4f2241845fcfdb45ebd64658c2b40 CRs-Fixed: 3947240 --- canoe-peach-cnss.dts | 13 ++--- canoe-peach-cnss.dtsi | 118 ++++++++++++------------------------------ 2 files changed, 39 insertions(+), 92 deletions(-) diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index 90dfecb8..04b6a5e8 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -10,11 +10,12 @@ #include "canoe-peach-cnss.dtsi" / { - model = "Qualcomm Technologies, Inc. Sun SoCs"; + model = "Qualcomm Technologies, Inc. Canoe SoCs"; compatible = "qcom,canoe", "qcom,canoep"; - qcom,msm-id = <618 0x10000>, <618 0x20000>, - <639 0x10000>, <639 0x20000>, - <0x100026a 0x10000>, <0x100026a 0x20000>, - <0x100027f 0x10000>, <0x100027f 0x20000>; - qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; + qcom,msm-id = <0x10294 0x10000>, <0x10294 0x20000>, <0x10295 0x10000>, <0x10295 0x20000>, + <0x30294 0x10000>, <0x30294 0x20000>, <0x30295 0x10000>, <0x30295 0x20000>, + <0x1010294 0x10000>, <0x1010294 0x20000>, <0x1010295 0x10000>, + <0x1010295 0x20000>, <0x1030294 0x10000>, <0x1030294 0x20000>, + <0x1030295 0x10000>, <0x1030295 0x20000>; + qcom,board-id = <1 0>, <8 0>, <0x10021 0>, <11 0>, <0x15 0>, <0x208 0>, <0x108 0>; }; diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 6d4ff475..075db596 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -52,12 +52,12 @@ cnss_host_sol_default: cnss_host_sol_default { mux { - pins = "gpio202"; + pins = "gpio204"; function = "gpio"; }; config { - pins = "gpio202"; + pins = "gpio204"; drive-strength = <4>; bias-pull-down; }; @@ -78,16 +78,16 @@ &soc { wlan_peach: qcom,cnss-peach@b0000000 { compatible = "qcom,cnss-peach"; - reg = <0xb0000000 0x10000>; + reg = <0x0 0xb0000000 0x0 0x10000>; reg-names = "smmu_iova_ipa"; qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; supported-ids = <0x110E>; wlan-en-gpio = <&tlmm 16 0>; - qcom,bt-en-gpio = <&pm8550vs_f_gpios 3 0>; + qcom,bt-en-gpio = <&pmh0104_gpios 5 0>; qcom,sw-ctrl-gpio = <&tlmm 18 0>; - wlan-host-sol-gpio = <&tlmm 202 0>; - wlan-dev-sol-gpio = <&tlmm 203 0>; + wlan-host-sol-gpio = <&tlmm 204 0>; + wlan-dev-sol-gpio = <&tlmm 205 0>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <18 19>; pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", @@ -108,90 +108,36 @@ qcom,qmp = <&aoss_qmp>; msix-match-addr = <0x3000>; - vdd-wlan-io-supply = <&L3F>; - qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; - vdd-wlan-io12-supply = <&L2F>; + vdd-wlan-aon-supply = <&L2G>; + qcom,vdd-wlan-aon-config = <1800000 1800000 30000 0 1>; + vdd-wlan-io12-supply = <&L3G>; qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; - vdd-wlan-aon-supply = <&S4D>; - qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; - vdd-wlan-dig-supply = <&S4J>; - qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; - vdd-wlan-rfa1-supply = <&S3G>; - qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; - vdd-wlan-rfa2-supply = <&S7I>; - qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; - vdd-wlan-ant-share-supply = <&L6K>; - qcom,vdd-wlan-ant-share-config = <1800000 1860000 0 0 1>; - - interconnects = - <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, - <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; - interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; - - qcom,icc-path-count = <2>; - qcom,bus-bw-cfg-count = <9>; - qcom,bus-bw-cfg = - /** ICC Path 1 **/ - <0 0>, /* no vote */ - /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 800000>, - /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 800000>, - /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 800000>, - /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 800000>, - /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, - /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, - /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, - /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, - - /** ICC Path 2 **/ - <0 0>, - /* idle: 0-18 Mbps ddr: 547.2 MHz */ - <2250 2188800>, - /* low: 18-60 Mbps ddr: 547.2 MHz */ - <7500 2188800>, - /* medium: 60-240 Mbps ddr: 547.2 MHz */ - <30000 2188800>, - /* high: 240-1200 Mbps ddr: 547.2 MHz */ - <100000 2188800>, - /* very high: > 1200 Mbps ddr: 1555 MHz */ - <175000 6220800>, - /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, - /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ - <7500 2188800>; + vdd-wlan-cx-supply = <&S1J>; + qcom,vdd-wlan-cx-config = <892000 1000000 0 0 1>; + vdd-wlan-dig-supply = <&S2J>; + qcom,vdd-wlan-dig-config = <892000 1000000 0 0 1>; + vdd-wlan-rfa1-supply = <&S8F>; + qcom,vdd-wlan-rfa1-config = <1876000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7F>; + qcom,vdd-wlan-rfa2-config = <1328000 1340000 0 0 1>; qcom,vreg_pdc_map = - "s4j", "rf", - "s4d", "bb", - "s3g", "rf", - "s7i", "rf"; + "s1j", "bb", + "s2j", "rf", + "s7f", "rf", + "s8f", "rf"; qcom,pmu_vreg_map = - "VDDD_AON_0P9", "s4j", - "VDDA_RFA_1P9", "s3g", - "VDDA_RFA_1P3", "s7i", - "VDDA_RFA_0P9", "s4j", - "VDDD_WLMX_0P9", "s4d", - "VDDD_WLCX_0P9", "s4j", - "VDDD_BTCX_0P9", "s4j", - "VDDD_BTCMX_0P9", "s4j", - "VDDA_PCIE_1P2", "s7i", - "VDDA_PCIE_0P9", "s7i"; - - qcom,pdc_init_table = - "{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}", - "{class: wlan_pdc, ss: rf, res: s4j.v, enable: 1}", - "{class: wlan_pdc, ss: rf, res: s4j.v, upval: 876}", - "{class: wlan_pdc, ss: rf, res: s4j.v, dwnval: 876}"; + "VDD_PMU_AON_I", "s2j", + "VDD09_PMU_RFA_I", "s2j", + "VDD19_PMU_RFA_I", "s8f", + "VDD13_PMU_RFA_I", "s7f", + "VDD095_MX_PMU", "s2j", + "VDD095_PMU_CX", "s1j", + "VDD095_PMU_BTCX", "s2j", + "VDD095_PMU_BTMX", "s2j", + "VDD13_PMU_PCIE_I", "s7f", + "VDD13_PMU_PCIE12_I", "s7f"; /* cpu mask used for wlan tx rx interrupt affinity * @@ -207,7 +153,7 @@ memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { - /* address-cells =3 size-cells=2 from sun-pcie.dtsi */ + /* address-cells =3 size-cells=2 from canoe-pcie.dtsi */ iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x18000000>, <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; }; From cfc1e73cc2b2b02f2dd23d023fd970fd20b010b7 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 17 Oct 2024 14:53:43 +0530 Subject: [PATCH 056/120] ARM: dts: msm: Add opensource wlan devicetree support Tuna MTP Add device tree support for MTP harmonium and MTP SN220 platforms for Tuna SoC. Change-Id: Ide7ee9b6e79b366d46c51a6d4c96f7027fbbfd7d CRs-Fixed: 3952108 --- tuna-mtp-kiwi.dts | 2 +- tuna-mtp-wcn7750.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tuna-mtp-kiwi.dts b/tuna-mtp-kiwi.dts index fece1611..4930b69c 100644 --- a/tuna-mtp-kiwi.dts +++ b/tuna-mtp-kiwi.dts @@ -12,5 +12,5 @@ model = "Qualcomm Technologies, Inc. Tuna MTP + kiwi WLAN"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; qcom,msm-id = <655 0x10000>, <681 0x10000>; - qcom,board-id = <8 2>; + qcom,board-id = <8 2>, <8 3>; }; diff --git a/tuna-mtp-wcn7750.dts b/tuna-mtp-wcn7750.dts index 4676d7f0..78379e2f 100644 --- a/tuna-mtp-wcn7750.dts +++ b/tuna-mtp-wcn7750.dts @@ -13,5 +13,5 @@ model = "Qualcomm Technologies, Inc. Tuna MTP"; compatible = "qcom,tuna-mtp", "qcom,tuna", "qcom,mtp"; qcom,msm-id = <655 0x10000>, <681 0x10000>; - qcom,board-id = <8 0>; + qcom,board-id = <8 0>, <8 4>; }; From 6416271921555ee9514b6532f01fc8feb9a7d6e0 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Wed, 16 Oct 2024 18:29:38 +0530 Subject: [PATCH 057/120] ARM: dts: msm: Add regulator voltage config for tuna-kiwi This change adds regulator voltage config for tuna-kiwi in wlan dtsi file. Change-Id: I9c418a93983b928ee03221094bf8669695fd165a CRs-Fixed: 3954840 --- tuna-kiwi-cnss.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tuna-kiwi-cnss.dtsi b/tuna-kiwi-cnss.dtsi index c32c7cab..9c53f0b9 100644 --- a/tuna-kiwi-cnss.dtsi +++ b/tuna-kiwi-cnss.dtsi @@ -107,6 +107,21 @@ /* For AOP communication, use direct QMP instead of mailbox */ qcom,qmp = <&aoss_qmp>; + vdd-wlan-io-supply = <&L3G>; + qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; + vdd-wlan-io12-supply = <&L2G>; + qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; + vdd-wlan-supply = <&S1G>; + qcom,vdd-wlan-config = <940000 1003000 0 0 1>; + vdd-wlan-dig-supply = <&S3B>; + qcom,vdd-wlan-dig-config = <976000 1040000 0 0 1>; + vdd-wlan-rfa1-supply = <&S1B>; + qcom,vdd-wlan-rfa1-config = <1864000 2104000 0 0 1>; + vdd-wlan-rfa2-supply = <&S2B>; + qcom,vdd-wlan-rfa2-config = <1316000 1408000 0 0 1>; + vdd-wlan-ant-share-supply = <&L6K>; + qcom,vdd-wlan-ant-share-config = <1800000 2000000 0 0 1>; + interconnects = <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; @@ -159,6 +174,7 @@ " {class: wlan_pdc, ss: rf, res: s1g.m, enable: 0}", " {class: wlan_pdc, ss: rf, res: l18b.m, enable: 0}", " {class: wlan_pdc, ss: rf, res: b1b.m, enable: 0}", + " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 0}", " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; /* cpu mask used for wlan tx rx interrupt affinity From 4d2c38c938dde64963d3c0a377239f4e362641ef Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Fri, 25 Oct 2024 14:24:47 +0530 Subject: [PATCH 058/120] ARM: dts: msm: Update L2G mode for tuna-kiwi This change updates l2g mode from LPM to RM for HMT. Change-Id: I6607f164af7c84ef65195790e02f97b68d2148e9 CRs-Fixed: 3959644 --- tuna-kiwi-cnss.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/tuna-kiwi-cnss.dtsi b/tuna-kiwi-cnss.dtsi index 9c53f0b9..1eed8a92 100644 --- a/tuna-kiwi-cnss.dtsi +++ b/tuna-kiwi-cnss.dtsi @@ -175,6 +175,7 @@ " {class: wlan_pdc, ss: rf, res: l18b.m, enable: 0}", " {class: wlan_pdc, ss: rf, res: b1b.m, enable: 0}", " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 0}", + " {class: wlan_pdc, ss: rf, res: l2g.m, dwnval: 3}", " {class: wlan_pdc, ss: bb, res: pdc, enable: 1}"; /* cpu mask used for wlan tx rx interrupt affinity From ad418df1374462c434f5c92df71b2602146ec20d Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Wed, 23 Oct 2024 11:44:07 +0530 Subject: [PATCH 059/120] ARM: dts: msm: Add canoe regulator values Add regulator values for canoe target with kiwi derived from previous targets. Change-Id: I18b08024a06d50fd2ba1b40bc4c8463947ee406e CRs-Fixed: 3958854 --- canoe-kiwi-cnss.dtsi | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 356cc16e..e0dec929 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -91,9 +91,21 @@ /* For AOP communication, use direct QMP instead of mailbox */ qcom,qmp = <&aoss_qmp>; - // TODO REGULATORS - + vdd-wlan-aon-supply = <&L2G>; + qcom,vdd-wlan-aon-config = <1800000 1800000 0 0 1>; + vdd-wlan-io12-supply = <&L3G>; + qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; + vdd-wlan-cx-supply = <&S1J>; + qcom,vdd-wlan-cx-config = <932000 1000000 0 0 1>; + vdd-wlan-dig-supply = <&S2J>; + qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; + vdd-wlan-rfa1-supply = <&S8F>; + qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; + vdd-wlan-rfa2-supply = <&S7F>; + qcom,vdd-wlan-rfa2-config = <1316000 1400000 0 0 1>; + //TODO: extractor regulator is required or not // TODO PDC TABLE BUS BW + // PDC MAP AND PMU Vreg Map /* cpu mask used for wlan tx rx interrupt affinity * From 6c3e1ef1f2d2d0121ac5e276b430e6b877c8e652 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 20 Sep 2024 17:20:15 +0530 Subject: [PATCH 060/120] ARM: dts: msm: Add opensource wlan device tree support for kera-qca6750 This change adds wlan related dt files for kera-qca6750 which has icnss and wpss dtsi node enabled. Change-Id: I2b10dfd91819ad8501479190823fe20b07382210 CRs-Fixed: 3960302 --- Kbuild | 7 +++ kera-atp-qca6750.dts | 16 ++++++ kera-cdp-qca6750.dts | 16 ++++++ kera-mtp-qca6750.dts | 16 ++++++ kera-qca6750.dtsi | 123 +++++++++++++++++++++++++++++++++++++++++++ kera-rcm-qca6750.dts | 16 ++++++ 6 files changed, 194 insertions(+) create mode 100644 kera-atp-qca6750.dts create mode 100644 kera-cdp-qca6750.dts create mode 100644 kera-mtp-qca6750.dts create mode 100644 kera-qca6750.dtsi create mode 100644 kera-rcm-qca6750.dts diff --git a/Kbuild b/Kbuild index 70c7bb92..3bf79516 100644 --- a/Kbuild +++ b/Kbuild @@ -48,6 +48,13 @@ dtbo-y += tuna-rcm-kiwi.dtbo dtbo-y += tuna-atp-kiwi.dtbo endif +ifeq ($(CONFIG_ARCH_KERA),y) +dtbo-y += kera-atp-qca6750.dtbo +dtbo-y += kera-cdp-qca6750.dtbo +dtbo-y += kera-mtp-qca6750.dtbo +dtbo-y += kera-rcm-qca6750.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/kera-atp-qca6750.dts b/kera-atp-qca6750.dts new file mode 100644 index 00000000..461f8c6b --- /dev/null +++ b/kera-atp-qca6750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-qca6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera ATP + MSL WLAN"; + compatible = "qcom,kera-atp", "qcom,kera", "qcom,atp"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x000021 0>; +}; diff --git a/kera-cdp-qca6750.dts b/kera-cdp-qca6750.dts new file mode 100644 index 00000000..bae28946 --- /dev/null +++ b/kera-cdp-qca6750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-qca6750.dtsi" + +/ { + 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>; +}; diff --git a/kera-mtp-qca6750.dts b/kera-mtp-qca6750.dts new file mode 100644 index 00000000..2c22a3dd --- /dev/null +++ b/kera-mtp-qca6750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-qca6750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera MTP"; + compatible = "qcom,kera-mtp", "qcom,kera", "qcom,mtp"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x010008 0>, <0x020008 0>, <0x030008 0>; +}; diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi new file mode 100644 index 00000000..9ae4e74b --- /dev/null +++ b/kera-qca6750.dtsi @@ -0,0 +1,123 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&soc { + qcom,smp2p-wpss { + smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { + qcom,entry-name = "wlan"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_1_out: qcom,smp2p-wlan-1-out { + qcom,entry-name = "wlan"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + icnss2: qcom,wcn6750 { + compatible = "qcom,wcn6750"; + reg = <0x17110040 0x0>, + <0xc0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1480 0x1>; + wlan-en-gpio = <35>; + host-sol-gpio = <33>; + dev-sol-gpio = <32>; + wlan-sw-ctrl-gpio = <81>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "sys-therm-3"; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + qcom,qmp = <&aoss_qmp>; + qcom,vreg_ol_cpr ="s3b"; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; diff --git a/kera-rcm-qca6750.dts b/kera-rcm-qca6750.dts new file mode 100644 index 00000000..c2f8023d --- /dev/null +++ b/kera-rcm-qca6750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-qca6750.dtsi" + +/ { + 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>; +}; From 04fc3f33bad3f8a1c5b88c9346a0311d712a41be Mon Sep 17 00:00:00 2001 From: Mohammed Ahmed Date: Tue, 29 Oct 2024 16:37:02 -0700 Subject: [PATCH 061/120] ARM: dts: msm: Remove unused msm ids Remove unused msm ids Change-Id: I2992b35f9602bf0922183c34d06c76ac223e389f CRs-Fixed: 3962711 --- canoe-kiwi-cnss.dts | 8 +++----- canoe-peach-cnss.dts | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts index 5af778f5..8848ff2a 100644 --- a/canoe-kiwi-cnss.dts +++ b/canoe-kiwi-cnss.dts @@ -12,10 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Canoe SoCs"; compatible = "qcom,canoe", "qcom,canoep", "qcom,canoe-mtp", "qcom,canoe-cdp"; - qcom,msm-id = <0x10294 0x10000>, <0x10294 0x20000>, <0x10295 0x10000>, <0x10295 0x20000>, - <0x30294 0x10000>, <0x30294 0x20000>, <0x30295 0x10000>, <0x30295 0x20000>, - <0x1010294 0x10000>, <0x1010294 0x20000>, <0x1010295 0x10000>, - <0x1010295 0x20000>, <0x1030294 0x10000>, <0x1030294 0x20000>, - <0x1030295 0x10000>, <0x1030295 0x20000>; + 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>; }; diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index 04b6a5e8..be41a1ac 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -12,10 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Canoe SoCs"; compatible = "qcom,canoe", "qcom,canoep"; - qcom,msm-id = <0x10294 0x10000>, <0x10294 0x20000>, <0x10295 0x10000>, <0x10295 0x20000>, - <0x30294 0x10000>, <0x30294 0x20000>, <0x30295 0x10000>, <0x30295 0x20000>, - <0x1010294 0x10000>, <0x1010294 0x20000>, <0x1010295 0x10000>, - <0x1010295 0x20000>, <0x1030294 0x10000>, <0x1030294 0x20000>, - <0x1030295 0x10000>, <0x1030295 0x20000>; + 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>; }; From 9e5b935436f5807580a5969608d0349667212f4d Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 28 Oct 2024 02:01:52 +0530 Subject: [PATCH 062/120] ARM: dts: msm: Add opensource wlan device tree support for kera-wcn7750 This change adds wlan related dt files for kera-wcn7750 which has icnss and wpss dtsi node enabled. Change-Id: I5e9f9453a58bc7a79e153e10a15b25cf4a71fbb4 CRs-Fixed: 3962537 --- kera-mtp-wcn7750.dts | 16 ++++ kera-qrd-wcn7750.dts | 16 ++++ kera-rcm-wcn7750.dts | 16 ++++ kera-wcn7750.dtsi | 181 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+) create mode 100644 kera-mtp-wcn7750.dts create mode 100644 kera-qrd-wcn7750.dts create mode 100644 kera-rcm-wcn7750.dts create mode 100644 kera-wcn7750.dtsi diff --git a/kera-mtp-wcn7750.dts b/kera-mtp-wcn7750.dts new file mode 100644 index 00000000..cb32303b --- /dev/null +++ b/kera-mtp-wcn7750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-wcn7750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera MTP"; + compatible = "qcom,kera-mtp", "qcom,kera", "qcom,mtp"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x010008 1>, <0x020008 1>, <0x030008 1>; +}; diff --git a/kera-qrd-wcn7750.dts b/kera-qrd-wcn7750.dts new file mode 100644 index 00000000..2e845c87 --- /dev/null +++ b/kera-qrd-wcn7750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-wcn7750.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Kera QRD"; + compatible = "qcom,kera-qrd", "qcom,kera", "qcom,qrd"; + qcom,msm-id = <686 0x10000>, <659 0x10000>; + qcom,board-id = <0x01000B 0>, <0x02000B 0>, <0x03000B 0>; +}; diff --git a/kera-rcm-wcn7750.dts b/kera-rcm-wcn7750.dts new file mode 100644 index 00000000..a9932d75 --- /dev/null +++ b/kera-rcm-wcn7750.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +/dts-v1/; +/plugin/; + +#include "kera-wcn7750.dtsi" + +/ { + 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>; +}; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi new file mode 100644 index 00000000..4b9c7d2b --- /dev/null +++ b/kera-wcn7750.dtsi @@ -0,0 +1,181 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include + +&soc { + qcom,smp2p-wpss { + smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { + qcom,entry-name = "wlan"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_1_out: qcom,smp2p-wlan-1-out { + qcom,entry-name = "wlan"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + wpss_pas: remoteproc-wpss@97000000 { + firmware-name = "wcn7750/wpss.mdt"; + }; + + icnss2: qcom,wcn7750 { + compatible = "qcom,wcn7750"; + reg = <0x17110040 0x0>, + <0xc0000000 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1480 0x1>; + wlan-en-gpio =<35>; + host-sol-gpio =<132>; + dev-sol-gpio =<32>; + wlan-sw-ctrl-gpio =<80>; + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + dma-coherent; + qcom,fw-prefix; + qcom,wlan; + tsens = "sys-therm-3"; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + + vdd-cx-mx-supply = <&S3B>; + qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; + vdd-1.8-xo-supply = <&S1B>; + 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>; + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + qcom,qmp = <&aoss_qmp>; + qcom,vreg_ol_cpr ="s3b"; + + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 1200000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 1200000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 1200000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 1200000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3224000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3224000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 4264000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 451.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 451.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 451.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 451.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <7500 2188800>; + + icnss_cdev_apss: qcom,icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: qcom,icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; +}; From c54bf768ce127f68e78aa6e64ad2a33b27f25065 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 4 Nov 2024 17:24:11 +0530 Subject: [PATCH 063/120] 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 064/120] 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 065/120] 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 066/120] 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 067/120] 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 068/120] 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 069/120] 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 646263b1b9e6daf52e93482d6b9c64f4f103df16 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Tue, 19 Nov 2024 20:47:21 +0530 Subject: [PATCH 070/120] 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 (cherry picked from commit c363c6f81f09af2ce46a8c52ce11f72c44cda313) --- 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 5ec34760c374f873d27d36d335c3cc05da23d51b Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Fri, 22 Nov 2024 15:13:11 +0530 Subject: [PATCH 071/120] 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 (cherry picked from commit 26e91776a99932d79f5a854dfb03b3335900ed19) --- 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 072/120] 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>; From 1885f7f7ae8d4cc47c51f161bd1bdc01f7bba54a Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Wed, 4 Dec 2024 11:47:02 +0530 Subject: [PATCH 073/120] ARM: dts: msm: Update gpio config for kera-wcn7750 Update gpio config in kera-wcn7750 dtsi file Change-Id: Icdefbd0c1bad4dab593adb0d5617fe63a4ea47a2 CRs-Fixed: 3991373 --- kera-wcn7750.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 4b9c7d2b..067d3e06 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -48,10 +48,10 @@ reg-names = "msi_addr", "smmu_iova_ipa"; qcom,rproc-handle = <&wpss_pas>; iommus = <&apps_smmu 0x1480 0x1>; - wlan-en-gpio =<35>; - host-sol-gpio =<132>; - dev-sol-gpio =<32>; - wlan-sw-ctrl-gpio =<80>; + wlan-en-gpio = <35>; + host-sol-gpio = <33>; + dev-sol-gpio = <32>; + wlan-sw-ctrl-gpio = <81>; interrupts = , , , From ac4f044344e0f77a0e0cab0c2d16a2888631322d Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Thu, 5 Dec 2024 10:26:29 +0530 Subject: [PATCH 074/120] ARM: dts: msm: Add direct link dt node for tuna Add direct link dt node for tuna, this device will be used in direct-link use case and required for SID configuration and sharing IOMMU bank with wlan platform device. Change-Id: Ie8cff03866fe9f514f160ed02d0ddc72c4dc5b5d CRs-Fixed: 3992469 --- tuna-wcn7750.dtsi | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 92ed6a70..97d70346 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -37,6 +37,13 @@ }; }; + icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 { + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + }; + icnss2: qcom,wcn7750 { compatible = "qcom,wcn7750"; reg = <0x17110040 0x0>, @@ -81,10 +88,7 @@ , ; - qcom,iommu-dma = "fastmap"; - qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; - qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; - qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; dma-coherent; qcom,fw-prefix; qcom,wlan; @@ -176,4 +180,11 @@ interrupt-names = "qcom,smp2p-soc-wake-ack"; }; }; + + wlan_direct_link: qcom,icnss-direct-link { + compatible = "qcom,icnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; + dma-coherent; + }; }; From 640f3ccd8c74d157aca36d9747d9f1cc13826b99 Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Thu, 28 Nov 2024 07:05:20 +0530 Subject: [PATCH 075/120] ARM: dts: msm: Add direct-link device node support Add support for direct-link device tree node, this device will be used for configuring LPASS SID iommu bank in direct-link use case. Change-Id: I31ce562bd8cbdd4692d6c721325fc15627a3f624 CRs-Fixed: 3990401 --- sun-peach-cnss-v8.dtsi | 14 ++++++++++++++ sun-peach-cnss.dtsi | 13 +++++++++++++ 2 files changed, 27 insertions(+) diff --git a/sun-peach-cnss-v8.dtsi b/sun-peach-cnss-v8.dtsi index 38350fc9..df47fc5a 100644 --- a/sun-peach-cnss-v8.dtsi +++ b/sun-peach-cnss-v8.dtsi @@ -199,6 +199,20 @@ */ wlan-txrx-intr-cpumask = <0x3 0x30>; }; + + wlan_direct_link: qcom,cnss-direct-link { + compatible = "qcom,cnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&direct_link_iommu_region_partition>; + dma-coherent; + + direct_link_iommu_region_partition: direct_link_iommu_region_partition { + iommu-addresses = <&wlan_direct_link 0x00000000 0x18000000>, + <&wlan_direct_link 0xb0000000 0x50000000>; + }; + + }; }; &pcie0_rp { diff --git a/sun-peach-cnss.dtsi b/sun-peach-cnss.dtsi index ef0efe81..c145ff69 100644 --- a/sun-peach-cnss.dtsi +++ b/sun-peach-cnss.dtsi @@ -198,6 +198,19 @@ */ wlan-txrx-intr-cpumask = <0x3 0x30>; }; + + wlan_direct_link: qcom,cnss-direct-link { + compatible = "qcom,cnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&direct_link_iommu_region_partition>; + dma-coherent; + + direct_link_iommu_region_partition: direct_link_iommu_region_partition { + iommu-addresses = <&wlan_direct_link 0x00000000 0x18000000>, + <&wlan_direct_link 0xb0000000 0x50000000>; + }; + }; }; &pcie0_rp { From e74c3e414383c2a0e9f3c3f24e52a7cec211aa28 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 2 Dec 2024 11:39:14 +0530 Subject: [PATCH 076/120] ARM: dts: msm: Update kera dtsi file This change updates the regulator config and pdc init table in kera dtsi files. Change-Id: I766d26f4505d4da717ca63e2b1bfd64de14bb79e CRs-Fixed: 3988811 --- kera-qca6750.dtsi | 7 +++++++ kera-wcn7750.dtsi | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 9ae4e74b..8803075d 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -90,6 +90,13 @@ tsens = "sys-therm-3"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&S3B>; + qcom,vdd-cx-mx-config = <920000 2736000 0 0 0>; + vdd-1.8-xo-supply = <&S1B>; + qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + vdd-1.3-rfa-supply = <&S2B>; + qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, <&smp2p_wlan_3_out 0>; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 067d3e06..2ab56f7f 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -96,11 +96,13 @@ 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 = <880000 2736000 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 = <1856000 2044000 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 = <1256000 2092000 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>, @@ -108,6 +110,12 @@ qcom,smem-state-names = "wlan-smp2p-out", "wlan-soc-wake-smp2p-out", "wlan-ep-powersave-smp2p-out"; + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 696}", + " {class: wlan_pdc, ss: rf, res: s1b.v, upval: 1864}", + " {class: wlan_pdc, ss: rf, res: s2b.v, upval: 1316}", + " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}", + " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 1}"; qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; From 75342a51c8e3448ac19f861cdf328afc412a07ab Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Thu, 5 Dec 2024 22:28:13 +0530 Subject: [PATCH 077/120] ARM: dts: msm: Disable wpss pil memory region for volcano peach target Disable wpss PIL memory region for volcano peach target. Change-Id: I0787e4a8b9380b5daea7de560e636e4aa4ce315c CRs-Fixed: 3966034 --- volcano6i-peach-cnss.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/volcano6i-peach-cnss.dtsi b/volcano6i-peach-cnss.dtsi index 7ef1b8e5..01f1468f 100644 --- a/volcano6i-peach-cnss.dtsi +++ b/volcano6i-peach-cnss.dtsi @@ -167,6 +167,10 @@ status = "disabled"; }; +&wpss_mem { + status = "disabled"; +}; + &pcie0_rp { #address-cells = <5>; #size-cells = <0>; From f43fdbf5536e8a062733a151dc3eeae4cdad1f59 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 27 Nov 2024 15:31:11 -0800 Subject: [PATCH 078/120] ARM: dts: msm: Add L3K regulator and pcie_rp support Add L3K regulator support and change pcie0_rp to pcie_rp. In addition, enable canoe dtsi compilation. Change-Id: I2771e43d559c5ae67d5fad04b45eac7060c94d72 CRs-Fixed: 3986494 --- Kbuild | 5 +++++ canoe-kiwi-cnss.dtsi | 4 +++- canoe-peach-cnss.dtsi | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Kbuild b/Kbuild index f11d6541..99a54b00 100644 --- a/Kbuild +++ b/Kbuild @@ -1,3 +1,8 @@ +ifeq ($(CONFIG_ARCH_CANOE),y) +dtbo-y += canoe-kiwi-cnss.dtbo +dtbo-y += canoe-peach-cnss.dtbo +endif + ifeq ($(CONFIG_ARCH_SUN),y) dtbo-y += sun-kiwi-cnss.dtbo dtbo-y += sun-kiwi-cnss-v8.dtbo diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index e0dec929..db41bf97 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -103,6 +103,8 @@ qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S7F>; qcom,vdd-wlan-rfa2-config = <1316000 1400000 0 0 1>; + vdd-wlan-ant-share-supply = <&L3K>; + qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; //TODO: extractor regulator is required or not // TODO PDC TABLE BUS BW // PDC MAP AND PMU Vreg Map @@ -114,7 +116,7 @@ }; }; -&pcie0_rp { +&pcie_rp { cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 075db596..3de347e6 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -120,6 +120,8 @@ qcom,vdd-wlan-rfa1-config = <1876000 2000000 0 0 1>; 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,vreg_pdc_map = "s1j", "bb", @@ -146,7 +148,7 @@ }; }; -&pcie0_rp { +&pcie_rp { cnss_pci0: cnss_pci0 { reg = <0 0 0 0 0>; qcom,iommu-group = <&cnss_audio_iommu_group0>; From fd93de97dea8265a076b950a939979200f5454df Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 3 Dec 2024 11:02:21 +0530 Subject: [PATCH 079/120] ARM: dts: msm: Add pdc cmd from latest tcs sheet Update regulator voting and add pdc cmd as per latest tcs sheet for canoe kiwi. Change-Id: Ideb2393238417f7f651d4585aa4f44d2260a4fb5 CRs-Fixed: 3992528 --- canoe-kiwi-cnss.dtsi | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index db41bf97..a40fe5c0 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -96,18 +96,29 @@ vdd-wlan-io12-supply = <&L3G>; qcom,vdd-wlan-io12-config = <1200000 1200000 0 0 1>; vdd-wlan-cx-supply = <&S1J>; - qcom,vdd-wlan-cx-config = <932000 1000000 0 0 1>; + qcom,vdd-wlan-cx-config = <968000 1000000 0 0 1>; vdd-wlan-dig-supply = <&S2J>; - qcom,vdd-wlan-dig-config = <916000 1100000 0 0 1>; + qcom,vdd-wlan-dig-config = <1012000 1100000 0 0 1>; vdd-wlan-rfa1-supply = <&S8F>; - qcom,vdd-wlan-rfa1-config = <1864000 2000000 0 0 1>; + qcom,vdd-wlan-rfa1-config = <1900000 2000000 0 0 1>; vdd-wlan-rfa2-supply = <&S7F>; - qcom,vdd-wlan-rfa2-config = <1316000 1400000 0 0 1>; + 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>; - //TODO: extractor regulator is required or not - // TODO PDC TABLE BUS BW - // PDC MAP AND PMU Vreg Map + vdd-wlan-supply = <&S7G>; + qcom,vdd-wlan-config = <952000 1100000 0 0 1>; + + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: S8F0.v, upval: 1900}", + " {class: wlan_pdc, ss: rf, res: S8F0.v, dwnval: 1860}", + " {class: wlan_pdc, ss: rf, res: S7F0.v, upval: 1352}", + " {class: wlan_pdc, ss: rf, res: S7F0.v, dwnval: 988}", + " {class: wlan_pdc, ss: bb, res: S1J1.v, upval: 968}", + " {class: wlan_pdc, ss: bb, res: S1J1.v, dwnval: 460}", + " {class: wlan_pdc, ss: bb, res: S2J1.m, enable: 1}", + " {class: wlan_pdc, ss: bb, res: S2J1.v, enable: 1}", + " {class: wlan_pdc, ss: rf, res: S7G0.m, enable: 1}", + " {class: wlan_pdc, ss: rf, res: S7G0.v, enable: 1}"; /* cpu mask used for wlan tx rx interrupt affinity * From e5cf27c3defbd84095ad674df80d3b1fba4cd3c1 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Wed, 11 Dec 2024 11:00:56 +0530 Subject: [PATCH 080/120] ARM: dts: msm: Update iommu-geometry properties Update size-cells and address-cells properties of iommu-geometry on Canoe kiwi device tree. Change-Id: I6dc06c037a7e9fc955dd9ac5be9e41713aa21a82 CRs-Fixed: 3998028 --- canoe-kiwi-cnss.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index a40fe5c0..0722627e 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -145,7 +145,7 @@ cnss_pci_iommu_group0: cnss_pci_iommu_group0 { qcom,iommu-msi-size = <0x1000>; - qcom,iommu-geometry = <0x98000000 0x18010000>; + qcom,iommu-geometry = <0x0 0x98000000 0x0 0x18010000>; qcom,iommu-dma = "fastmap"; qcom,iommu-pagetable = "coherent"; qcom,iommu-faults = "stall-disable", "HUPCF", From 8cacdbf24b0470db6d29eb165608b8287bfd2fef Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 13 Dec 2024 10:45:01 +0530 Subject: [PATCH 081/120] ARM: dts: msm: Update reg cfg and pdc cmd for Kera This change updates the regulator config and pdc init table in kera dtsi files. Change-Id: I74140414c061ffe16b41a1f40ad67cf5f3aabe65 CRs-Fixed: 4000320 --- kera-qca6750.dtsi | 6 +++--- kera-wcn7750.dtsi | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 8803075d..30d254f0 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -91,11 +91,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <920000 2736000 0 0 0>; + qcom,vdd-cx-mx-config = <920000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 2ab56f7f..3ec6e4f7 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -96,11 +96,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <880000 2736000 0 0 0>; + qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + 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>; @@ -114,8 +114,7 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 696}", " {class: wlan_pdc, ss: rf, res: s1b.v, upval: 1864}", " {class: wlan_pdc, ss: rf, res: s2b.v, upval: 1316}", - " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}", - " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 1}"; + " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}"; qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; From c3b3a3eb1552e26af490ff858d07b4c9750d9634 Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Fri, 13 Dec 2024 13:29:37 +0530 Subject: [PATCH 082/120] ARM: dts: msm: Add direct link node dtsi entry Add direct link node dtsi entry, this shares iommu domain with wlan device will be used in direct link use case. Change-Id: I9660bac1028087be02611ab7b9d16a09e3ad1323 CRs-Fixed: 4000587 --- kera-wcn7750.dtsi | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 2ab56f7f..2e0aa68b 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -41,6 +41,13 @@ firmware-name = "wcn7750/wpss.mdt"; }; + icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 { + qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; + qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + }; + icnss2: qcom,wcn7750 { compatible = "qcom,wcn7750"; reg = <0x17110040 0x0>, @@ -85,10 +92,7 @@ , ; - qcom,iommu-dma = "fastmap"; - qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; - qcom,iommu-dma-addr-pool = <0xb0000000 0x10000000>; - qcom,iommu-geometry = <0xb0000000 0x10010000>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; dma-coherent; qcom,fw-prefix; qcom,wlan; @@ -186,4 +190,11 @@ interrupt-names = "qcom,smp2p-soc-wake-ack"; }; }; + + wlan_direct_link: qcom,icnss-direct-link { + compatible = "qcom,icnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; + dma-coherent; + }; }; From bb75f7e27b6a4df8089f6f29fd94e0882aff6681 Mon Sep 17 00:00:00 2001 From: Karthik Kantamneni Date: Mon, 16 Dec 2024 11:52:45 +0530 Subject: [PATCH 083/120] ARM: dts: msm: Add direct-link device node support for canoe Add direct-link device node support for canoe. This device node is used to program SID configuration by iommu driver. This device shares the iommu domain with normal wlan device. Change-Id: Ia54f3cea8b1bec4b9765413e562192ba22269b57 CRs-Fixed: 4001977 --- canoe-peach-cnss.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 3de347e6..17f9d1db 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -146,6 +146,19 @@ */ wlan-txrx-intr-cpumask = <0x3 0x30>; }; + + wlan_direct_link: qcom,cnss-direct-link { + compatible = "qcom,cnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&cnss_audio_iommu_group0>; + memory-region = <&direct_link_iommu_region_partition>; + dma-coherent; + + direct_link_iommu_region_partition: direct_link_iommu_region_partition { + iommu-addresses = <&wlan_direct_link 0x0 0x0 0x0 0x18000000>, + <&wlan_direct_link 0x0 0xb0000000 0x0 0x50000000>; + }; + }; }; &pcie_rp { From 0ca651f412cee6b75c8875c2df3f4efeb74629b5 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Mon, 2 Dec 2024 11:39:14 +0530 Subject: [PATCH 084/120] ARM: dts: msm: Update kera dtsi file This change updates the regulator config and pdc init table in kera dtsi files. Change-Id: I766d26f4505d4da717ca63e2b1bfd64de14bb79e CRs-Fixed: 3988811 (cherry picked from commit e74c3e414383c2a0e9f3c3f24e52a7cec211aa28) --- kera-qca6750.dtsi | 7 +++++++ kera-wcn7750.dtsi | 14 +++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 9ae4e74b..8803075d 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -90,6 +90,13 @@ tsens = "sys-therm-3"; qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + vdd-cx-mx-supply = <&S3B>; + qcom,vdd-cx-mx-config = <920000 2736000 0 0 0>; + vdd-1.8-xo-supply = <&S1B>; + qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + vdd-1.3-rfa-supply = <&S2B>; + qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, <&smp2p_wlan_3_out 0>; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 4b9c7d2b..f318db8c 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -96,11 +96,13 @@ 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 = <880000 2736000 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 = <1856000 2044000 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 = <1256000 2092000 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>, @@ -108,6 +110,12 @@ qcom,smem-state-names = "wlan-smp2p-out", "wlan-soc-wake-smp2p-out", "wlan-ep-powersave-smp2p-out"; + qcom,pdc_init_table = + " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 696}", + " {class: wlan_pdc, ss: rf, res: s1b.v, upval: 1864}", + " {class: wlan_pdc, ss: rf, res: s2b.v, upval: 1316}", + " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}", + " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 1}"; qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; From a6925043913841277bb4935fe87b99319b31b847 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Wed, 4 Dec 2024 11:47:02 +0530 Subject: [PATCH 085/120] ARM: dts: msm: Update gpio config for kera-wcn7750 Update gpio config in kera-wcn7750 dtsi file Change-Id: Icdefbd0c1bad4dab593adb0d5617fe63a4ea47a2 CRs-Fixed: 3991373 (cherry picked from commit 1885f7f7ae8d4cc47c51f161bd1bdc01f7bba54a) --- kera-wcn7750.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 4b9c7d2b..067d3e06 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -48,10 +48,10 @@ reg-names = "msi_addr", "smmu_iova_ipa"; qcom,rproc-handle = <&wpss_pas>; iommus = <&apps_smmu 0x1480 0x1>; - wlan-en-gpio =<35>; - host-sol-gpio =<132>; - dev-sol-gpio =<32>; - wlan-sw-ctrl-gpio =<80>; + wlan-en-gpio = <35>; + host-sol-gpio = <33>; + dev-sol-gpio = <32>; + wlan-sw-ctrl-gpio = <81>; interrupts = , , , From c7e6793e97b71f74a3215525edf8f01f7a352c05 Mon Sep 17 00:00:00 2001 From: Manikanta Pubbisetty Date: Thu, 12 Dec 2024 16:49:59 +0530 Subject: [PATCH 086/120] ARM: dts: msm: Update WLAN IB voting for tuna Currently the WLAN SNOC voting is set based on PCIe SN4 BCM width as 16.The PCIe port width has been updated to 8 for tuna. Hence, this change will bring in the corresponding WLAN SNOC voting to support the new width. Also, update the DDR voting accordingly. CRs-Fixed: 3999629 Change-Id: Iff5b87616f1f340257096826906ca77bdba4ce29 --- tuna-kiwi-cnss.dtsi | 30 +++++++++++++++--------------- tuna-wcn7750.dtsi | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/tuna-kiwi-cnss.dtsi b/tuna-kiwi-cnss.dtsi index 1eed8a92..f0f48637 100644 --- a/tuna-kiwi-cnss.dtsi +++ b/tuna-kiwi-cnss.dtsi @@ -133,39 +133,39 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1200000>, + <2250 400000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1200000>, + <7500 400000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1200000>, + <30000 400000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1200000>, + <100000 400000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, + <175000 1612000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, + <312500 1612000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, + <587500 2171000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, + <7500 800000>, /** ICC Path 2 **/ <0 0>, - /* idle: 0-18 Mbps ddr: 451.2 MHz */ + /* idle: 0-18 Mbps ddr: 547 MHz */ <2250 2188800>, - /* low: 18-60 Mbps ddr: 451.2 MHz */ + /* low: 18-60 Mbps ddr: 547 MHz */ <7500 2188800>, - /* medium: 60-240 Mbps ddr: 451.2 MHz */ + /* medium: 60-240 Mbps ddr: 547 MHz */ <30000 2188800>, - /* high: 240-1200 Mbps ddr: 451.2 MHz */ + /* high: 240-1200 Mbps ddr: 547 MHz */ <100000 2188800>, /* very high: > 1200 Mbps ddr: 1555 MHz */ <175000 6220800>, /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, + <312500 8371200>, /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <587500 14745600>, + /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ <7500 2188800>; qcom,pdc_init_table = diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 97d70346..c0c276c3 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -125,39 +125,39 @@ /** ICC Path 1 **/ <0 0>, /* no vote */ /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1200000>, + <2250 400000>, /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1200000>, + <7500 400000>, /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1200000>, + <30000 400000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1200000>, + <100000 400000>, /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, + <175000 1612000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, + <312500 1612000>, /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, + <587500 2171000>, /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, + <7500 800000>, /** ICC Path 2 **/ <0 0>, - /* idle: 0-18 Mbps ddr: 451.2 MHz */ + /* idle: 0-18 Mbps ddr: 547 MHz */ <2250 2188800>, - /* low: 18-60 Mbps ddr: 451.2 MHz */ + /* low: 18-60 Mbps ddr: 547 MHz */ <7500 2188800>, - /* medium: 60-240 Mbps ddr: 451.2 MHz */ + /* medium: 60-240 Mbps ddr: 547 MHz */ <30000 2188800>, - /* high: 240-1200 Mbps ddr: 451.2 MHz */ + /* high: 240-1200 Mbps ddr: 547 MHz */ <100000 2188800>, /* very high: > 1200 Mbps ddr: 1555 MHz */ <175000 6220800>, /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, + <312500 8371200>, /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ + <587500 14745600>, + /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ <7500 2188800>; icnss_cdev_apss: qcom,icnss_cdev1 { From 34ecda8daf855e68ca1939f5b77d210338bb115b Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 10 Dec 2024 17:34:53 +0530 Subject: [PATCH 087/120] ARM: dts: msm: Enable Open Loop CPR feature for Kiwi Add config to enable regulator to PDC mapping and PMU to regulator mapping for canoe kiwi devicetree. Change-Id: I72dba4f6de2788aeb4860d35c83ae8540e6a9076 CRs-Fixed: 3998205 --- canoe-kiwi-cnss.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index a40fe5c0..d7a7ad27 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -108,6 +108,24 @@ vdd-wlan-supply = <&S7G>; qcom,vdd-wlan-config = <952000 1100000 0 0 1>; + qcom,vreg_pdc_map = + "S2J1", "bb", + "S1J1", "bb", + "S8F0", "rf", + "S7F0", "rf", + "S7G0", "rf"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "S2J1", + "VDD095_PMU", "S1J1", + "VDD_PMU_AON_I", "S7G0", + "VDD095_PMU_BT", "S7G0", + "VDD09_PMU_RFA_I", "S7G0", + "VDD13_PMU_PCIE_I", "S7F0", + "VDD13_PMU_RFA_I", "S7F0", + "VDD19_PMU_PCIE_I", "S8F0", + "VDD19_PMU_RFA_I", "S8F0"; + qcom,pdc_init_table = " {class: wlan_pdc, ss: rf, res: S8F0.v, upval: 1900}", " {class: wlan_pdc, ss: rf, res: S8F0.v, dwnval: 1860}", From bc9eca514b8ffbb6b4b4cc78e07e34e5981b0f20 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 13 Dec 2024 10:45:01 +0530 Subject: [PATCH 088/120] ARM: dts: msm: Update reg cfg and pdc cmd for Kera This change updates the regulator config and pdc init table in kera dtsi files. Change-Id: I74140414c061ffe16b41a1f40ad67cf5f3aabe65 CRs-Fixed: 4000320 (cherry picked from commit 8cacdbf24b0470db6d29eb165608b8287bfd2fef) --- kera-qca6750.dtsi | 6 +++--- kera-wcn7750.dtsi | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 8803075d..30d254f0 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -91,11 +91,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <920000 2736000 0 0 0>; + qcom,vdd-cx-mx-config = <920000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + qcom,vdd-1.3-rfa-config = <1256000 1408000 0 0 0>; qcom,smem-states = <&smp2p_wlan_1_out 0>, <&smp2p_wlan_2_out 0>, diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 2ab56f7f..3ec6e4f7 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -96,11 +96,11 @@ qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; vdd-cx-mx-supply = <&S3B>; - qcom,vdd-cx-mx-config = <880000 2736000 0 0 0>; + qcom,vdd-cx-mx-config = <880000 1040000 0 0 0>; vdd-1.8-xo-supply = <&S1B>; - qcom,vdd-1.8-xo-config = <1856000 2044000 0 0 0>; + qcom,vdd-1.8-xo-config = <1856000 2040000 0 0 0>; vdd-1.3-rfa-supply = <&S2B>; - qcom,vdd-1.3-rfa-config = <1256000 2092000 0 0 0>; + 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>; @@ -114,8 +114,7 @@ " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 696}", " {class: wlan_pdc, ss: rf, res: s1b.v, upval: 1864}", " {class: wlan_pdc, ss: rf, res: s2b.v, upval: 1316}", - " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}", - " {class: wlan_pdc, ss: rf, res: l4k.m, enable: 1}"; + " {class: wlan_pdc, ss: rf, res: s4b.e, enable: 0}"; qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; From 2402d2ef625fa780af2c78158d6e22e65cee190d Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Fri, 13 Dec 2024 14:36:10 +0530 Subject: [PATCH 089/120] ARM: dts: msm: Enable Open Loop CPR feature for Kiwi Add config to enable regulator to PDC mapping and PMU to regulator mapping for tuna kiwi. Change-Id: I6f12521a895aae551400d5a426576e229d9c31e3 CRs-Fixed: 4010931 --- tuna-kiwi-cnss.dtsi | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tuna-kiwi-cnss.dtsi b/tuna-kiwi-cnss.dtsi index f0f48637..1d6f1064 100644 --- a/tuna-kiwi-cnss.dtsi +++ b/tuna-kiwi-cnss.dtsi @@ -168,6 +168,24 @@ /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ <7500 2188800>; + qcom,vreg_pdc_map = + "s1g", "bb", + "s3b", "bb", + "s1b", "rf", + "s2b", "rf"; + + qcom,pmu_vreg_map = + "VDD095_MX_PMU", "s3b", + "VDD095_PMU", "s1g", + "VDD_PMU_AON_I", "s3b", + "VDD095_PMU_BT", "s3b", + "VDD09_PMU_RFA_I", "s3b", + "VDD13_PMU_PCIE_I", "s2b", + "VDD13_PMU_RFA_I", "s2b", + "VDD19_PMU_PCIE_I", "s1b", + "VDD19_PMU_RFA_I", "s1b"; + + qcom,pdc_init_table = " {class: wlan_pdc, ss: rf, res: s3b.v, upval: 976}", " {class: wlan_pdc, ss: rf, res: s3b.v, dwnval: 616}", From bf335086187da7a40d590f1058387fa100a7895f Mon Sep 17 00:00:00 2001 From: Manikanta Pubbisetty Date: Fri, 3 Jan 2025 11:04:35 +0530 Subject: [PATCH 090/120] ARM: dts: msm: Update WLAN IB voting for legacy connections for tuna Current WLAN DDR voting is not sufficient to meet the required throughputs in legacy connection. Increase the DDR vote to meet legacy throughputs. CRs-Fixed: 4011534 Change-Id: I5153b0b50c15aeacf9776b6ca63b912fbc06cc07 --- tuna-wcn7750.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index c0c276c3..968519f2 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -157,8 +157,8 @@ <312500 8371200>, /* super high: DBS mode ddr: 3.2 GHz */ <587500 14745600>, - /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ - <7500 2188800>; + /* low (latency critical): 18-60 Mbps ddr: 2092 MHz */ + <7500 8371200>; icnss_cdev_apss: qcom,icnss_cdev1 { #cooling-cells = <2>; From 85b956bfe370d6818d1d337b200cdfbbc533dc4e Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 18 Dec 2024 12:53:40 -0800 Subject: [PATCH 091/120] ARM: dts: msm: Remove board-id for Pictor from dts file Remove board-id for Pictor from Canoe dts file, as WLAN is not supported on Pictor. Change-Id: I106a0ec65b6856758c4c27e823c8099e94737122 CRs-Fixed: 4018051 --- canoe-peach-cnss.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index 37059bc1..2b721aa4 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -16,6 +16,6 @@ <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <0x1000295 0x20000>; qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>, - <0x50008 0>, <0x60008 0>, <0x70008 0>, <0x21 0>, <11 0>, + <0x50008 0>, <0x60008 0>, <0x21 0>, <11 0>, <0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>; }; From 32049a7d631df561864b6ec212e59d08beed4320 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 26 Dec 2024 14:28:56 +0530 Subject: [PATCH 092/120] 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 093/120] 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 094/120] 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 095/120] 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 096/120] 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 097/120] 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 098/120] 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 099/120] 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 100/120] 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 101/120] 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>; From 283f5dc4465b9962796eba286b390bbf26cdee7d Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Thu, 26 Dec 2024 14:28:56 +0530 Subject: [PATCH 102/120] 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 (cherry picked from commit 32049a7d631df561864b6ec212e59d08beed4320) --- 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 698938d087168ca2cf5e540fb7bb4ddeb8d1842b Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Fri, 10 Jan 2025 17:36:40 +0530 Subject: [PATCH 103/120] 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 (cherry picked from commit 6fecf46ae74c3701b19d82d2e9c8596c17ada1f5) --- kera-qca6750.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index 30d254f0..dbe02508 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 @@ -96,6 +96,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 92f8a37368ce63686c92a9b7a86783d8408d5986 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Fri, 7 Feb 2025 14:12:31 +0530 Subject: [PATCH 104/120] ARM: dts: msm: Fix iommu address and size properties for kiwi Currently address and size cell property was set to 1, due to that IOVA range that gets created was out of our expected range. This change fixes size-cells and address-cells properties of cnss_pci node to 2 on Canoe kiwi device tree. Change-Id: I03d193fe50f3a17995c5a4b0eacd13b6c749e9f4 CRs-Fixed: 4048012 --- canoe-kiwi-cnss.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 7f6bc1d1..9fcab5ba 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -152,8 +152,8 @@ qcom,iommu-group = <&cnss_pci_iommu_group0>; memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <2>; + #size-cells = <2>; cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { /* address-cells =3 size-cells=2 from canoe-pcie.dtsi */ From 41f82402699b437b8adfde73df9c612cca3fda9f Mon Sep 17 00:00:00 2001 From: Srinivas Girigowda Date: Thu, 6 Feb 2025 20:31:25 -0800 Subject: [PATCH 105/120] ARM: dts: msm: Add interconnect voting node for canoe kiwi/peach Add the interconnect voting node for canoe kiwi/peach, used for bus bandwidth voting. Change-Id: I4c1828ec5d6e8e8d2298f51f926338f977283a7e CRs-Fixed: 4036509 --- canoe-kiwi-cnss.dtsi | 46 +++++++++++++++++++++++++++++++++++++++++ canoe-peach-cnss.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 7f6bc1d1..1f671631 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -108,6 +108,52 @@ vdd-wlan-supply = <&S7G>; qcom,vdd-wlan-config = <952000 1100000 0 0 1>; + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 308000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 308000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 308000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 308000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3210000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3210000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 6450000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1610000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + qcom,vreg_pdc_map = "S2J1", "bb", "S1J1", "bb", diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 17f9d1db..db03cf53 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-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 @@ -123,6 +123,52 @@ vdd-wlan-ant-share-supply = <&L3K>; qcom,vdd-wlan-ant-share-config = <1200000 1200000 0 0 1>; + interconnects = + <&pcie_noc MASTER_PCIE_0 &pcie_noc SLAVE_ANOC_PCIE_GEM_NOC>, + <&gem_noc MASTER_ANOC_PCIE_GEM_NOC &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; + + qcom,icc-path-count = <2>; + qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 308000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 308000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 308000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 308000>, + /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + <175000 3210000>, + /* ultra high: DBS mode snoc/anoc: 403 Mhz */ + <312500 3210000>, + /* super high: DBS mode snoc/anoc: 533 Mhz */ + <587500 6450000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1610000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547.2 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547.2 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8368000>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 12800000>, + /* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */ + <7500 2188800>; + qcom,vreg_pdc_map = "s1j", "bb", "s2j", "rf", From dbe8ff2b614578ed864d9c5245e69801e3826221 Mon Sep 17 00:00:00 2001 From: Kartikey Arora Date: Tue, 11 Feb 2025 12:49:07 +0530 Subject: [PATCH 106/120] ARM: dts: msm: Update cooling device node name in dtsi This change adds a new third cooling device node to support BW mitigation request and updates existing cooling device node name in dtsi to remove qcom, prefix so it is considered as single node and not two due to comma separated while parsing it in csv format. Change-Id: I341a2412159d2af6123a3bc4f2323a38b7955b62 --- kera-qca6750.dtsi | 8 ++++++-- kera-wcn7750.dtsi | 8 ++++++-- tuna-wcn7750.dtsi | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/kera-qca6750.dtsi b/kera-qca6750.dtsi index fcbb278c..f291873a 100644 --- a/kera-qca6750.dtsi +++ b/kera-qca6750.dtsi @@ -125,11 +125,15 @@ qcom,qmp = <&aoss_qmp>; qcom,vreg_ol_cpr ="s3b"; - icnss_cdev_apss: qcom,icnss_cdev1 { + icnss_cdev_apss: icnss_cdev1 { #cooling-cells = <2>; }; - icnss_cdev_wpss: qcom,icnss_cdev2 { + icnss_cdev_wpss: icnss_cdev2 { + #cooling-cells = <2>; + }; + + icnss_cdev_bw: icnss_cdev3 { #cooling-cells = <2>; }; diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index e043257f..4e071bbe 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -185,11 +185,15 @@ /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ <7500 2188800>; - icnss_cdev_apss: qcom,icnss_cdev1 { + icnss_cdev_apss: icnss_cdev1 { #cooling-cells = <2>; }; - icnss_cdev_wpss: qcom,icnss_cdev2 { + icnss_cdev_wpss: icnss_cdev2 { + #cooling-cells = <2>; + }; + + icnss_cdev_bw: icnss_cdev3 { #cooling-cells = <2>; }; diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index ba7a33f3..6b6069b7 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -178,11 +178,11 @@ /* low (latency critical): 18-60 Mbps ddr: 2092 MHz */ <7500 8371200>; - icnss_cdev_apss: qcom,icnss_cdev1 { + icnss_cdev_apss: icnss_cdev1 { #cooling-cells = <2>; }; - icnss_cdev_wpss: qcom,icnss_cdev2 { + icnss_cdev_wpss: icnss_cdev2 { #cooling-cells = <2>; }; From 52fab2e84ef01fab39bf2761260a57da631513e2 Mon Sep 17 00:00:00 2001 From: Vara Adabala Date: Fri, 14 Feb 2025 01:53:12 -0800 Subject: [PATCH 107/120] Revert "ARM: dts: msm: Add 1.2 io rail voting for wcn7750" This reverts commit 283f5dc4465b9962796eba286b390bbf26cdee7d. Reason for revert: release branch Change-Id: I2e31f95864a3f264117ce19b280aa67ee34460b6 --- tuna-wcn7750.dtsi | 2 -- 1 file changed, 2 deletions(-) diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index 75108cd3..968519f2 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -103,8 +103,6 @@ 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 a168cc8b8132c203e1083e4919356fd0c5de8843 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Mon, 10 Feb 2025 14:47:31 +0530 Subject: [PATCH 108/120] ARM: dts: msm: Modify interconnect bus bw config based on DDR type Modify interconnect bus bw config based on DDR TYPE in tuna-wcn7750 kera-wcn7750 dtsi. Change-Id: I6be90ea224c6cd1872ec399cf709f4736aa156e9 CRs-Fixed: 4057869 --- kera-wcn7750.dtsi | 126 ++++++++++++++++++++++++++++++++-------------- tuna-wcn7750.dtsi | 81 +++++++++++++++-------------- 2 files changed, 133 insertions(+), 74 deletions(-) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index e043257f..32053e9d 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -146,44 +146,96 @@ qcom,icc-path-count = <2>; qcom,bus-bw-cfg-count = <9>; - qcom,bus-bw-cfg = - /** ICC Path 1 **/ - <0 0>, /* no vote */ - /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 1200000>, - /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 1200000>, - /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 1200000>, - /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 1200000>, - /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ - <175000 3224000>, - /* ultra high: DBS mode snoc/anoc: 403 Mhz */ - <312500 3224000>, - /* super high: DBS mode snoc/anoc: 533 Mhz */ - <587500 4264000>, - /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ - <7500 1600000>, - /** ICC Path 2 **/ - <0 0>, - /* idle: 0-18 Mbps ddr: 451.2 MHz */ - <2250 2188800>, - /* low: 18-60 Mbps ddr: 451.2 MHz */ - <7500 2188800>, - /* medium: 60-240 Mbps ddr: 451.2 MHz */ - <30000 2188800>, - /* high: 240-1200 Mbps ddr: 451.2 MHz */ - <100000 2188800>, - /* very high: > 1200 Mbps ddr: 1555 MHz */ - <175000 6220800>, - /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8368000>, - /* super high: DBS mode ddr: 3.2 GHz */ - <587500 12800000>, - /* low (latency critical): 18-60 Mbps ddr: 451.2 MHz */ - <7500 2188800>; + /* ddr_type = 8(LPDDR5) */ + + ddr_cfg@0 { + ddr_type = <8>; + + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 800000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 800000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 800000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 800000>, + /* very high: > 1200 Mbps snoc/anoc: 200 Mhz */ + <175000 1600000>, + /* ultra high: DBS mode snoc/anoc: 200 Mhz */ + <312500 1600000>, + /* super high: DBS mode snoc/anoc: 403 Mhz */ + <587500 3224000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547 MHz */ + <2250 2500800>, + /* low: 18-60 Mbps ddr: 547 MHz */ + <7500 2500800>, + /* medium: 60-240 Mbps ddr: 547 MHz */ + <30000 2500800>, + /* high: 240-1200 Mbps ddr: 547 MHz */ + <100000 2500800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 7108800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 9566400>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 14569200>, + /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ + <7500 2500800>; + }; + + /* ddr_type = 7(LPDDR4) */ + + ddr_cfg@1 { + ddr_type = <7>; + + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 800000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 800000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 800000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 800000>, + /* very high: > 1200 Mbps snoc/anoc: 200 Mhz */ + <175000 1600000>, + /* ultra high: DBS mode snoc/anoc: 200 Mhz */ + <312500 1600000>, + /* super high: DBS mode snoc/anoc: 403 Mhz */ + <587500 3224000>, + /* low (latency critical): 18-60 Mbps snoc/anoc: 200 Mhz */ + <7500 1600000>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547 MHz */ + <2250 2500800>, + /* low: 18-60 Mbps ddr: 547 MHz */ + <7500 2500800>, + /* medium: 60-240 Mbps ddr: 547 MHz */ + <30000 2500800>, + /* high: 240-1200 Mbps ddr: 547 MHz */ + <100000 2500800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 7108800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 9566400>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 14569200>, + /* low (latency critical): 18-60 Mbps ddr: 547 MHz */ + <7500 2500800>; + }; icnss_cdev_apss: qcom,icnss_cdev1 { #cooling-cells = <2>; diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index ba7a33f3..4d103503 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -139,44 +139,51 @@ qcom,icc-path-count = <2>; qcom,bus-bw-cfg-count = <9>; - qcom,bus-bw-cfg = - /** ICC Path 1 **/ - <0 0>, /* no vote */ - /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ - <2250 400000>, - /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ - <7500 400000>, - /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ - <30000 400000>, - /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ - <100000 400000>, - /* 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>, - /** ICC Path 2 **/ - <0 0>, - /* idle: 0-18 Mbps ddr: 547 MHz */ - <2250 2188800>, - /* low: 18-60 Mbps ddr: 547 MHz */ - <7500 2188800>, - /* medium: 60-240 Mbps ddr: 547 MHz */ - <30000 2188800>, - /* high: 240-1200 Mbps ddr: 547 MHz */ - <100000 2188800>, - /* very high: > 1200 Mbps ddr: 1555 MHz */ - <175000 6220800>, - /* ultra high: DBS mode ddr: 2092 MHz */ - <312500 8371200>, - /* super high: DBS mode ddr: 3.2 GHz */ - <587500 14745600>, - /* low (latency critical): 18-60 Mbps ddr: 2092 MHz */ - <7500 8371200>; + /* ddr_type = 8(LPDDR5) */ + + ddr_cfg@0 { + ddr_type = <8>; + + qcom,bus-bw-cfg = + /** ICC Path 1 **/ + <0 0>, /* no vote */ + /* idle: 0-18 Mbps snoc/anoc: 100 Mhz */ + <2250 400000>, + /* low: 18-60 Mbps snoc/anoc: 100 Mhz */ + <7500 400000>, + /* medium: 60-240 Mbps snoc/anoc: 100 Mhz */ + <30000 400000>, + /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ + <100000 400000>, + /* 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>, + + /** ICC Path 2 **/ + <0 0>, + /* idle: 0-18 Mbps ddr: 547 MHz */ + <2250 2188800>, + /* low: 18-60 Mbps ddr: 547 MHz */ + <7500 2188800>, + /* medium: 60-240 Mbps ddr: 547 MHz */ + <30000 2188800>, + /* high: 240-1200 Mbps ddr: 547 MHz */ + <100000 2188800>, + /* very high: > 1200 Mbps ddr: 1555 MHz */ + <175000 6220800>, + /* ultra high: DBS mode ddr: 2092 MHz */ + <312500 8371200>, + /* super high: DBS mode ddr: 3.2 GHz */ + <587500 14745600>, + /* low (latency critical): 18-60 Mbps ddr: 2092 MHz */ + <7500 8371200>; + }; icnss_cdev_apss: qcom,icnss_cdev1 { #cooling-cells = <2>; From 5b75d22385a7c3a0e235d7fb62ef1907257ffb5f Mon Sep 17 00:00:00 2001 From: Surabhi Vishnoi Date: Mon, 10 Feb 2025 12:15:05 +0530 Subject: [PATCH 109/120] ARM: dts: msm: Add STSafe320 eSE support to volcano IOT platform Add subtype-11 board-id in WLAN volcano IOT dtsi to support STSafe320 eSE feature. Change-Id: Iba6a041f87480b5033bafbd9d879793fefd5efe9 CRs-Fixed: 4050248 --- volcano6i-peach-cnss.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/volcano6i-peach-cnss.dts b/volcano6i-peach-cnss.dts index df9455da..8f411b4a 100644 --- a/volcano6i-peach-cnss.dts +++ b/volcano6i-peach-cnss.dts @@ -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. */ /dts-v1/; @@ -15,5 +15,5 @@ "qcom,volcanop", "qcom,idp", "qcom,volcano-mtp", "qcom,volcanop-mtp", "qcom,mtp"; qcom,msm-id = <0x4000291 0x10000>, <0x8000291 0x10000>, <0xc000291 0x10000>, <0x10000291 0x10000>, <0x4000292 0x10000>, <0x8000292 0x10000>, <0xc000292 0x10000>, <0x10000292 0x10000>; - qcom,board-id = <8 2>, <8 3>, <8 4>, <8 5>, <8 6>, <34 2>, <34 3>; + qcom,board-id = <8 2>, <8 3>, <8 4>, <8 5>, <8 6>, <34 2>, <34 3>, <8 11>; }; From b1cc355fcd572c89a51f3e5b9997253d4a453992 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Mon, 17 Feb 2025 14:23:52 +0530 Subject: [PATCH 110/120] ARM: dts: msm: Add opensource wlan device tree support for alor This change adds wlan opensource dtsi files for alor-kiwi and alor-wcn7750. Change-Id: Ibab85d6b48ca5852d6dd7d89f688a931fd2ccb08 CRs-Fixed: 4061525 --- alor-kiwi-cnss.dtsi | 148 ++++++++++++++++++++++++++++++++++++++++++ alor-wcn7750.dtsi | 155 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+) create mode 100644 alor-kiwi-cnss.dtsi create mode 100644 alor-wcn7750.dtsi diff --git a/alor-kiwi-cnss.dtsi b/alor-kiwi-cnss.dtsi new file mode 100644 index 00000000..5952f7db --- /dev/null +++ b/alor-kiwi-cnss.dtsi @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include + +&wlan_msa_mem { + status = "disabled"; +}; + +&wpss_mem { + status = "disabled"; +}; + +&wpss_pas { + status = "disabled"; +}; + +&pcie0 { + status = "ok"; +}; + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio16"; + function = "gpio"; + }; + + config { + pins = "gpio16"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; + + cnss_wlan_sw_ctrl: cnss_wlan_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; + + cnss_wlan_sw_ctrl_wl_cx: cnss_wlan_sw_ctrl_wl_cx { + mux { + pins = "gpio19"; + function = "wcn_sw"; + }; + }; + }; +}; + +&reserved_memory { + cnss_wlan_mem: cnss_wlan_region { + compatible = "shared-dma-pool"; + alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>; + reusable; + alignment = <0x0 0x400000>; + size = <0x0 0x2000000>; + }; +}; + +&soc { + wlan_kiwi: qcom,cnss-kiwi@b0000000 { + compatible = "qcom,cnss-kiwi"; + reg = <0x0 0xb0000000 0x0 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; + + supported-ids = <0x1107>; + wlan-en-gpio = <&tlmm 16 0>; + qcom,bt-en-gpio = <&pm8550ve_d_gpios 3 0>; + qcom,sw-ctrl-gpio = <&tlmm 18 0>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18 19>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", + "sw_ctrl_wl_cx"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_sw_ctrl>; + pinctrl-3 = <&cnss_wlan_sw_ctrl_wl_cx>; + qcom,wlan; + qcom,wlan-rc-num = <0>; + qcom,wlan-ramdump-dynamic = <0x780000>; + cnss-enable-self-recovery; + qcom,wlan-cbc-enabled; + use-pm-domain; + qcom,same-dt-multi-dev; + /* For AOP communication, use direct QMP instead of mailbox */ + qcom,qmp = <&aoss_qmp>; + + //TODO REGULATORS VOTING + //TODO BUS-BW + + //TODO PMU-VREG-PDC mapping for ol_cpr + //TODO PDC AOP cmd for hmt + + /* cpu mask used for wlan tx rx interrupt affinity + * + */ + wlan-txrx-intr-cpumask = <0x3 0x30>; + }; +}; + +&pcie_rp { + + cnss_pci0: cnss_pci0 { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group0>; + memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; + + #address-cells = <2>; + #size-cells = <2>; + + cnss_pci0_iommu_region_partition: cnss_pci0_iommu_region_partition { + /* address-cells =3 size-cells=2 from alor-pcie.dtsi */ + iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x98000000>, + <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; + }; + + cnss_pci_iommu_group0: cnss_pci_iommu_group0 { + qcom,iommu-msi-size = <0x1000>; + qcom,iommu-geometry = <0x0 0x98000000 0x0 0x18010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", + "non-fatal"; + }; + }; +}; diff --git a/alor-wcn7750.dtsi b/alor-wcn7750.dtsi new file mode 100644 index 00000000..410a978c --- /dev/null +++ b/alor-wcn7750.dtsi @@ -0,0 +1,155 @@ +// SPDX-License-Identifier: BSD-3-Clause + +/* + * Copyright (c) 2024-2025 Qualcomm Innovation Center, Inc. All rights reserved. + */ + +#include +#include + +&tlmm { + icnss_sw_ctrl: icnss_sw_ctrl { + mux { + pins = "gpio18"; + function = "wcn_sw_ctrl"; + }; + }; +}; + +&soc { + qcom,smp2p-wpss { + smp2p_wlan_1_in: qcom,smp2p-wlan-1-in { + qcom,entry-name = "wlan"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_1_out: qcom,smp2p-wlan-1-out { + qcom,entry-name = "wlan"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_2_in: qcom,smp2p-wlan-2-in { + qcom,entry-name = "wlan_soc_wake"; + interrupt-controller; + #interrupt-cells = <2>; + }; + + smp2p_wlan_2_out: qcom,smp2p-wlan-2-out { + qcom,entry-name = "wlan_soc_wake"; + #qcom,smem-state-cells = <1>; + }; + + smp2p_wlan_3_out: qcom,smp2p-wlan-3-out { + qcom,entry-name = "wlan_ep_power_save"; + #qcom,smem-state-cells = <1>; + }; + }; + + icnss2_direct_link_iommu_group0: icnss2_direct_link_iommu_group0 { + qcom,iommu-dma-addr-pool = <0x0 0xb0000000 0x0 0x10000000>; + qcom,iommu-geometry = <0x0 0xb0000000 0x0 0x10010000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-faults = "stall-disable", "HUPCF", "non-fatal"; + }; + + icnss2: qcom,wcn7750 { + compatible = "qcom,wcn7750"; + reg = <0x0 0x17010040 0x0 0x0>, + <0x0 0xc0000000 0x0 0x10000>; + reg-names = "msi_addr", "smmu_iova_ipa"; + qcom,rproc-handle = <&wpss_pas>; + iommus = <&apps_smmu 0x1400 0x1>; + wlan-en-gpio =<35>; + host-sol-gpio =<95>; + dev-sol-gpio =<17>; + sw-ctrl-gpio =<18>; + /* List of GPIOs to be setup for interrupt wakeup capable */ + mpm_wake_set_gpios = <18>; + pinctrl-names = "sw_ctrl"; + pinctrl-0 = <&icnss_sw_ctrl>; + + interrupts = , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + , + ; + + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; + dma-coherent; + pin-ctrl-support; + qcom,fw-prefix; + qcom,wlan; + tsens = "sys-therm-3";//TODO VERIFY from thermal team + wcn-hw-version = "wcn7750"; + qcom,wlan-msa-fixed-region = <&wlan_msa_mem>; + + //TODO REGULATOR VOTING + + qcom,smem-states = <&smp2p_wlan_1_out 0>, + <&smp2p_wlan_2_out 0>, + <&smp2p_wlan_3_out 0>; + qcom,smem-state-names = "wlan-smp2p-out", + "wlan-soc-wake-smp2p-out", + "wlan-ep-powersave-smp2p-out"; + + qcom,qmp = <&aoss_qmp>; + qcom,vreg_ol_cpr ="s2d"; + + //TODO BUS BW + + icnss_cdev_apss: icnss_cdev1 { + #cooling-cells = <2>; + }; + + icnss_cdev_wpss: icnss_cdev2 { + #cooling-cells = <2>; + }; + + qcom,smp2p_map_wlan_1_in { + interrupts-extended = <&smp2p_wlan_1_in 0 0>, + <&smp2p_wlan_1_in 1 0>; + interrupt-names = "qcom,smp2p-force-fatal-error", + "qcom,smp2p-early-crash-ind"; + }; + + qcom,smp2p_map_wlan_2_in { + interrupts-extended = <&smp2p_wlan_2_in 0 0>; + interrupt-names = "qcom,smp2p-soc-wake-ack"; + }; + }; + + wlan_direct_link: qcom,icnss-direct-link { + compatible = "qcom,icnss-direct-link"; + iommus = <&apps_smmu 0x100f 0x0>; + qcom,iommu-group = <&icnss2_direct_link_iommu_group0>; + dma-coherent; + }; +}; From 0f225510730ed23db8ecf56914383aa3d2fd96ab Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 12 Feb 2025 16:21:53 -0800 Subject: [PATCH 111/120] ARM: dts: msm: Change VREG mapping string names Change VREG mapping string names to be in line with the string names sent from FW. Change-Id: Iea6e1e60295d212f367a686244e51f45f850cdf0 CRs-Fixed: 4074221 --- canoe-peach-cnss.dtsi | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index db03cf53..0b7d7c0f 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -170,22 +170,22 @@ <7500 2188800>; qcom,vreg_pdc_map = - "s1j", "bb", - "s2j", "rf", - "s7f", "rf", - "s8f", "rf"; + "S1J1", "bb", + "S2J1", "rf", + "S7F0", "rf", + "S8F0", "rf"; qcom,pmu_vreg_map = - "VDD_PMU_AON_I", "s2j", - "VDD09_PMU_RFA_I", "s2j", - "VDD19_PMU_RFA_I", "s8f", - "VDD13_PMU_RFA_I", "s7f", - "VDD095_MX_PMU", "s2j", - "VDD095_PMU_CX", "s1j", - "VDD095_PMU_BTCX", "s2j", - "VDD095_PMU_BTMX", "s2j", - "VDD13_PMU_PCIE_I", "s7f", - "VDD13_PMU_PCIE12_I", "s7f"; + "VDDD_AON_0P9", "S2J1", + "VDDA_RFA_0P9", "S2J1", + "VDDA_RFA_1P9", "S8F0", + "VDDA_RFA_1P3", "S7F0", + "VDDD_WLMX_0P9", "S2J1", + "VDDD_WLCX_0P9", "S1J1", + "VDDD_BTCX_0P9", "S2J1", + "VDDD_BTCMX_0P9", "S2J1", + "VDDA_PCIE_0P9", "S7F0", + "VDDA_PCIE_1P2", "S7F0"; /* cpu mask used for wlan tx rx interrupt affinity * From f6843ebbb75b9035d44459048a3283629b040c43 Mon Sep 17 00:00:00 2001 From: AMAN KUMAR Date: Tue, 25 Feb 2025 17:59:00 +0530 Subject: [PATCH 112/120] ARM: dts: msm: support of KaM soc id for canoe This change adds support of KaM soc Change-Id: Id874bcdc187f9af814ba6db0f28cba0d3860298e --- canoe-kiwi-cnss.dts | 6 ++++-- canoe-peach-cnss.dts | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/canoe-kiwi-cnss.dts b/canoe-kiwi-cnss.dts index 8f8d5e5c..ad90b8e5 100644 --- a/canoe-kiwi-cnss.dts +++ b/canoe-kiwi-cnss.dts @@ -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. */ /dts-v1/; @@ -14,6 +14,8 @@ compatible = "qcom,canoe", "qcom,canoep", "qcom,canoe-mtp", "qcom,canoe-cdp"; qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>, - <0x1000295 0x10000>, <0x1000295 0x20000>; + <0x1000295 0x10000>, <0x1000295 0x20000>, + <704 0x10000>, <704 0x20000>, + <0x10002C0 0x10000>, <0x10002C0 0x20000>; qcom,board-id = <0x30001 0>, <0x20008 0>, <0x30015 0>; }; diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index 2b721aa4..4837bee9 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -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. */ /dts-v1/; @@ -14,7 +14,8 @@ compatible = "qcom,canoe", "qcom,canoep"; qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, <0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, - <0x1000295 0x20000>; + <0x1000295 0x20000>, <704 0x10000>, <704 0x20000>, + <0x10002C0 0x10000>, <0x10002C0 0x20000>; qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>, <0x50008 0>, <0x60008 0>, <0x21 0>, <11 0>, <0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>; From a7fd2c4313281f139ba930fa23bfc8f1b1d5144a Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Fri, 14 Mar 2025 10:23:39 -0700 Subject: [PATCH 113/120] ARM: dts: msm: Add board id for SN220U for Canoe + Peach Add board id for SN220U for Canoe + Peach. Change-Id: I68c9ebd5be74f6a3a4ac64286c532acdb68e1e1f CRs-Fixed: 4085191 --- canoe-peach-cnss.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/canoe-peach-cnss.dts b/canoe-peach-cnss.dts index 4837bee9..f8e2c4a2 100644 --- a/canoe-peach-cnss.dts +++ b/canoe-peach-cnss.dts @@ -17,6 +17,6 @@ <0x1000295 0x20000>, <704 0x10000>, <704 0x20000>, <0x10002C0 0x10000>, <0x10002C0 0x20000>; qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>, - <0x50008 0>, <0x60008 0>, <0x21 0>, <11 0>, - <0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>; + <0x50008 0>, <0x60008 0>, <0x21 0>, <11 0>, <0x2000B 0>, + <0x15 0>, <0x20015 0>, <0x30015 0>, <0x80008 0>; }; From e804cdf8e344e4df3ee1b71995db81432d0113f4 Mon Sep 17 00:00:00 2001 From: Prateek Patil Date: Thu, 20 Mar 2025 11:32:24 +0530 Subject: [PATCH 114/120] ARM: dts: msm: Add pinctrl string for SW_CTRL GPIO Add pinctrl string for SW_CTRL GPIO. Change-Id: I291c1c103ca0454b3616efb66b46c357494d19ae CRs-Fixed: 4090490 --- kera-wcn7750.dtsi | 1 + tuna-wcn7750.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/kera-wcn7750.dtsi b/kera-wcn7750.dtsi index 2ea94bdf..c83a831f 100644 --- a/kera-wcn7750.dtsi +++ b/kera-wcn7750.dtsi @@ -70,6 +70,7 @@ sw-ctrl-gpio = <81>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <81>; + pin_sw-ctrl-gpio = <&tlmm 81 0>; pinctrl-names = "sw_ctrl"; pinctrl-0 = <&icnss_sw_ctrl>; diff --git a/tuna-wcn7750.dtsi b/tuna-wcn7750.dtsi index d0c3f1e4..e4ffa766 100644 --- a/tuna-wcn7750.dtsi +++ b/tuna-wcn7750.dtsi @@ -66,6 +66,7 @@ sw-ctrl-gpio =<80>; /* List of GPIOs to be setup for interrupt wakeup capable */ mpm_wake_set_gpios = <80>; + pin_sw-ctrl-gpio = <&tlmm 80 0>; pinctrl-names = "sw_ctrl"; pinctrl-0 = <&icnss_sw_ctrl>; From 850da8ba8bf5ac72a6a7241d346670dff1cb9181 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 19 Mar 2025 18:41:54 -0700 Subject: [PATCH 115/120] 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 116/120] 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 117/120] 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", From 55e9273e6498843b36528afd2df009766b8b181b Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Mon, 7 Apr 2025 11:16:52 -0700 Subject: [PATCH 118/120] ARM: dts: msm: Add platform_name_required field for Canoe Add platform_name_required field for Canoe in order to get platform type. Change-Id: I2cb1338e126e494469a17a771e95254821125236 CRs-Fixed: 4108935 --- canoe-kiwi-cnss.dtsi | 1 + canoe-peach-cnss.dtsi | 1 + 2 files changed, 2 insertions(+) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 4e2bb88f..7c2eabcc 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -90,6 +90,7 @@ qcom,same-dt-multi-dev; /* For AOP communication, use direct QMP instead of mailbox */ qcom,qmp = <&aoss_qmp>; + platform-name-required; vdd-wlan-aon-supply = <&L2G>; qcom,vdd-wlan-aon-config = <1800000 1800000 30000 0 1>; diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index 0b7d7c0f..8a82fd00 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -107,6 +107,7 @@ /* For AOP communication, use direct QMP instead of mailbox */ qcom,qmp = <&aoss_qmp>; msix-match-addr = <0x3000>; + platform-name-required; vdd-wlan-aon-supply = <&L2G>; qcom,vdd-wlan-aon-config = <1800000 1800000 30000 0 1>; From 29daf46c7dd240707085c111426822d2525a35e5 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Mon, 7 Apr 2025 09:28:41 -0700 Subject: [PATCH 119/120] ARM: dts: msm: Add new pdc table to vote for mode for Canoe Add a new pdc table for Canoe in order to make mode votes for the L3K regulator. Change-Id: Idce97babe07bb23a8354dc60382e945c0b6cf4e4 CRs-Fixed: 4110480 --- canoe-kiwi-cnss.dtsi | 4 ++++ canoe-peach-cnss.dtsi | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/canoe-kiwi-cnss.dtsi b/canoe-kiwi-cnss.dtsi index 3026b8a9..7ef87022 100644 --- a/canoe-kiwi-cnss.dtsi +++ b/canoe-kiwi-cnss.dtsi @@ -185,6 +185,10 @@ " {class: wlan_pdc, ss: rf, res: S7G0.m, enable: 1}", " {class: wlan_pdc, ss: rf, res: S7G0.v, enable: 1}"; + qcom,pdc_mode_vote_table = + " {class: wlan_pdc, ss: rf, res: L3K1.m, enable: 1}", + " {class: wlan_pdc, ss: rf, res: L3K1.m, dwnval: 2}"; + /* cpu mask used for wlan tx rx interrupt affinity * */ diff --git a/canoe-peach-cnss.dtsi b/canoe-peach-cnss.dtsi index b444f039..ad922e10 100644 --- a/canoe-peach-cnss.dtsi +++ b/canoe-peach-cnss.dtsi @@ -188,6 +188,10 @@ "VDDA_PCIE_0P9", "S7F0", "VDDA_PCIE_1P2", "S7F0"; + qcom,pdc_mode_vote_table = + " {class: wlan_pdc, ss: rf, res: L3K1.m, enable: 1}", + " {class: wlan_pdc, ss: rf, res: L3K1.m, dwnval: 2}"; + /* cpu mask used for wlan tx rx interrupt affinity * */ From 283b4aa71ae5d434597a1ad7ac95c1f02b2f1873 Mon Sep 17 00:00:00 2001 From: Rohit Bhatia Date: Fri, 18 Apr 2025 12:42:07 +0530 Subject: [PATCH 120/120] ARM: dts: msm: Added new soc-ID's to parrot target Added new SOC-ID's to support parrot target Change-Id: I386b3148fe115a17a43aacb16739a265e69243aa --- parrot-atp-wcn3990.dts | 4 +++- parrot-idp-wcn3990.dts | 4 +++- parrot-idp-wcn6750.dts | 4 +++- parrot-idp-wcn6755.dts | 4 +++- parrot-qrd-wcn3990.dts | 4 +++- parrot-qrd-wcn6750.dts | 4 +++- parrot-qrd-wcn6755.dts | 4 +++- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/parrot-atp-wcn3990.dts b/parrot-atp-wcn3990.dts index 5bff1263..5fa853ce 100644 --- a/parrot-atp-wcn3990.dts +++ b/parrot-atp-wcn3990.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot ATP"; compatible = "qcom,parrot", "qcom,parrot-atp", "qcom,atp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <33 0>; }; diff --git a/parrot-idp-wcn3990.dts b/parrot-idp-wcn3990.dts index fa4f3362..c7c116b8 100644 --- a/parrot-idp-wcn3990.dts +++ b/parrot-idp-wcn3990.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot IDP"; compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <34 1>, <34 3>, <34 0x601>, <34 0x603>; }; diff --git a/parrot-idp-wcn6750.dts b/parrot-idp-wcn6750.dts index edc24ef1..1862bbaf 100644 --- a/parrot-idp-wcn6750.dts +++ b/parrot-idp-wcn6750.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot IDP"; compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <34 0>, <34 2>, <34 4>, <34 0x600>, <34 0x602>, <34 0x604>; }; diff --git a/parrot-idp-wcn6755.dts b/parrot-idp-wcn6755.dts index 296aa5cd..dbaf9491 100644 --- a/parrot-idp-wcn6755.dts +++ b/parrot-idp-wcn6755.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6755 IDP"; compatible = "qcom,parrot", "qcom,parrot-idp", "qcom,idp"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <34 5>, <34 6>; }; diff --git a/parrot-qrd-wcn3990.dts b/parrot-qrd-wcn3990.dts index fc81b8fd..026272f1 100644 --- a/parrot-qrd-wcn3990.dts +++ b/parrot-qrd-wcn3990.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot QRD"; compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <0x1000B 0>, <0x1000B 0x600>; }; diff --git a/parrot-qrd-wcn6750.dts b/parrot-qrd-wcn6750.dts index 9fedaf16..02821ee8 100644 --- a/parrot-qrd-wcn6750.dts +++ b/parrot-qrd-wcn6750.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot QRD"; compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <0x1000B 1>, <0x1000B 0x601>; }; diff --git a/parrot-qrd-wcn6755.dts b/parrot-qrd-wcn6755.dts index 8babcf90..920aa648 100644 --- a/parrot-qrd-wcn6755.dts +++ b/parrot-qrd-wcn6755.dts @@ -12,6 +12,8 @@ / { model = "Qualcomm Technologies, Inc. Parrot WCN6755 QRD"; compatible = "qcom,parrot", "qcom,parrot-qrd", "qcom,qrd"; - qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>; + qcom,msm-id = <537 0x10000>, <583 0x10000>, <613 0x10000>, <631 0x10000>, + <633 0x10000>, <634 0x10000>, <638 0x10000>, <663 0x10000>, + <713 0x10000>, <714 0x10000>; qcom,board-id = <0x1000B 2>; };