diff options
author | Daniel Price <danielprice@google.com> | 2023-04-03 21:26:50 +0000 |
---|---|---|
committer | Daniel Price <danielprice@google.com> | 2023-04-03 21:26:50 +0000 |
commit | 920e51586378df21d37662c358531d721bdc1df4 (patch) | |
tree | 446e8410949557befb0eb918fc40532fc0c64139 | |
parent | d79d03955dc1cb546ad1d6f45fe60113534d7b42 (diff) | |
parent | 3266f50a7a1ac70afff00bad1f4b99da89a2b9ba (diff) | |
download | wlan-devicetree-920e51586378df21d37662c358531d721bdc1df4.tar.gz |
sw5100: Integrate LW 2.0 r00062.1a
Bug: 276757489
Change-Id: Idfbe6d001ac65b06038e845d6609da7574207168
Signed-off-by: Daniel Price <danielprice@google.com>
-rwxr-xr-x | Kbuild | 6 | ||||
-rwxr-xr-x | bindings/icnss.txt | 1 | ||||
-rwxr-xr-x | direwolf-vm-dual-cnss.dts | 12 | ||||
-rwxr-xr-x | direwolf-vm-dual-cnss.dtsi | 191 | ||||
-rwxr-xr-x | kalama-cnss.dtsi | 28 | ||||
-rwxr-xr-x | kona-iot-vc-cnss.dts | 11 | ||||
-rwxr-xr-x | kona-iot-vc-cnss.dtsi | 132 | ||||
-rwxr-xr-x | lemans-cnss.dtsi | 4 | ||||
-rwxr-xr-x | sa525m-cnss.dts | 2 | ||||
-rwxr-xr-x | sa8155p-vm-cnss.dtsi | 23 | ||||
-rwxr-xr-x | sa8195p-vm-cnss.dtsi | 3 | ||||
-rwxr-xr-x | sa8295p-vm-cnss.dts | 11 | ||||
-rwxr-xr-x | sa8295p-vm-cnss.dtsi | 46 | ||||
-rwxr-xr-x | sdxpinn-cnss.dts | 2 | ||||
-rwxr-xr-x | sdxpinn-cnss.dtsi | 3 |
15 files changed, 455 insertions, 20 deletions
@@ -39,12 +39,18 @@ endif ifeq ($(CONFIG_QTI_QUIN_GVM),y) dtbo-y += sa8155p-vm-cnss.dtbo dtbo-y += sa8195p-vm-cnss.dtbo +dtbo-y += sa8295p-vm-cnss.dtbo +dtbo-y += direwolf-vm-dual-cnss.dtbo endif ifeq ($(CONFIG_ARCH_SA525),y) dtbo-y += sa525m-cnss.dtbo endif +ifeq ($(CONFIG_ARCH_KONA),y) +dtbo-y += kona-iot-vc-cnss.dtbo +endif + always-y := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtbo diff --git a/bindings/icnss.txt b/bindings/icnss.txt index 29fd1e2..4890182 100755 --- a/bindings/icnss.txt +++ b/bindings/icnss.txt @@ -9,6 +9,7 @@ WLAN PD restart notifications. Required properties: - compatible: "qcom,icnss" for ADRASTEA architecture "qcom,wcn6750" for iWCN architecture + "qcom,wcn6450" for evros architecture - reg: Memory regions defined as starting address and size - reg-names: Names of the memory regions defined in reg entry - interrupts: Copy engine interrupt table diff --git a/direwolf-vm-dual-cnss.dts b/direwolf-vm-dual-cnss.dts new file mode 100755 index 0000000..f3b5d1c --- /dev/null +++ b/direwolf-vm-dual-cnss.dts @@ -0,0 +1,12 @@ +/dts-v1/; +/plugin/; + +#include "direwolf-vm-dual-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Direwolf Single LV Virtual Machine"; + compatible = "qcom,direwolf", "qcom,quinvm"; + qcom,msm-id = <460 0x10000>; + qcom,board-id = <0 0x1000002>; + qcom,msm-name = "SA_DIREWOLF_IVI"; +}; diff --git a/direwolf-vm-dual-cnss.dtsi b/direwolf-vm-dual-cnss.dtsi new file mode 100755 index 0000000..a0d2bc4 --- /dev/null +++ b/direwolf-vm-dual-cnss.dtsi @@ -0,0 +1,191 @@ +#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h> +#include <dt-bindings/gpio/gpio.h> + +&cnss_pins { + cnss_wlan_en_active2: cnss_wlan_en_active2 { + mux { + pins = "gpio65"; + function = "gpio"; + }; + + config { + pins = "gpio65"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep2: cnss_wlan_en_sleep2 { + mux { + pins = "gpio65"; + function = "gpio"; + }; + + config { + pins = "gpio65"; + drive-strength = <2>; + output-low; + bias-pull-down; + }; + }; +}; + +&soc { + /* Support Dual Hastings case */ + cnss_pcie0: qcom,cnss-qca-converged0 { + compatible = "qcom,cnss-qca-converged"; + /* cnss_util.ko, cnss_nl.ko and other cnss + * related module need this flag + */ + qcom,wlan; + /* skip qcom,wlan-sw-ctrl-gpio check */ + qcom,multi-wlan-exchg; + qcom,wlan-rc-num = <4>; + qcom,pld_bus_ops_name = "pld_pcie_cnss2"; + qcom,bus-type=<0>; + qcom,notify-modem-status; + + #address-cells=<1>; + #size-cells=<1>; + ranges = <0xb0000000 0xb0000000 0x10000>; + + vdd-wlan-ctrl1-supply = <&vreg_conn_pa>; + vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>; + /* vdd-wlan-supply = <&vreg_wlan>; */ + vdd-wlan-vl-supply = <&pm8540_e0_s4>; + vdd-wlan-vm-supply = <&pm8540_g0_l6>; + vdd-wlan-vh-supply = <&pm8540_a0_l15>; + + wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2", "vdd-wlan-vl", + "vdd-wlan-vm", "vdd-wlan-vh"; + qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>; + qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>; + /* no vote-off as sw_ctrl is not supported */ + qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>; + /* No vol setting for bypass LDOs */ + qcom,vdd-wlan-vm-config = <0 0 0 0 0>; + qcom,vdd-wlan-vh-config = <0 0 0 0 0>; + wlan-en-gpio = <&tlmm 125 0>; + qcom,bt-en-gpio = <&tlmm 126 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + + chip_cfg@0 { + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + + supported-ids = <0x003e>; + wlan_vregs = "vdd-wlan"; + qcom,vdd-wlan-config = <0 0 0 10 1>; + + qcom,wlan-ramdump-dynamic = <0x200000>; + }; + + chip_cfg@1 { + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,qrtr_node_id = <0x10>; + supported-ids = <0x1101>; + wlan_vregs; + + qcom,wlan-ramdump-dynamic = <0x400000>; + }; + + chip_cfg@2 { + supported-ids = <0x1102>; + wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm", + "vdd-wlan-vh"; + qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>; + qcom,vdd-wlan-vm-config = <1350000 1350000 450000 0 0>; + qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>; + + qcom,wlan-ramdump-dynamic = <0x400000>; + }; + chip_cfg@3 { + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + supported-ids = <0x1103>; + wlan_vregs; + + qcom,wlan-ramdump-dynamic = <0x420000>; + }; + }; + + cnss_pcie2: qcom,cnss-qca-converged2 { + compatible = "qcom,cnss-qca-converged"; + qcom,wlan; + qcom,multi-wlan-exchg; + qcom,wlan-rc-num = <0>; + qcom,pld_bus_ops_name = "pld_pcie_cnss0"; + qcom,bus-type=<0>; + qcom,notify-modem-status; + + #address-cells=<1>; + #size-cells=<1>; + ranges = <0xd0000000 0xd0000000 0x10000>; + + vdd-wlan-ctrl1-supply = <&vreg_conn_pa2>; + /*vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>;*/ + /* vdd-wlan-supply = <&vreg_wlan>; */ + vdd-wlan-vl-supply = <&pm8540_e0_s4>; + vdd-wlan-vm-supply = <&pm8540_g0_l6>; + vdd-wlan-vh-supply = <&pm8540_a0_l15>; + + wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-vl", + "vdd-wlan-vm", "vdd-wlan-vh"; + qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>; + /*qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>;*/ + /* no vote-off as sw_ctrl is not supported */ + qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>; + /* No vol setting for bypass LDOs */ + qcom,vdd-wlan-vm-config = <0 0 0 0 0>; + qcom,vdd-wlan-vh-config = <0 0 0 0 0>; + wlan-en-gpio = <&tlmm 65 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active2>; + pinctrl-1 = <&cnss_wlan_en_sleep2>; + + chip_cfg@0 { + reg = <0xd0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + + supported-ids = <0x003e>; + wlan_vregs = "vdd-wlan"; + qcom,vdd-wlan-config = <0 0 0 10 1>; + + qcom,wlan-ramdump-dynamic = <0x200000>; + }; + + chip_cfg@1 { + reg = <0xd0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + qcom,qrtr_node_id = <0x20>; + supported-ids = <0x1101>; + wlan_vregs; + + qcom,wlan-ramdump-dynamic = <0x400000>; + }; + + chip_cfg@2 { + supported-ids = <0x1102>; + wlan_vregs = "vdd-wlan-vl", "vdd-wlan-vm", + "vdd-wlan-vh"; + qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>; + qcom,vdd-wlan-vm-config = <1350000 1350000 450000 0 0>; + qcom,vdd-wlan-vh-config = <1900000 1900000 450000 0 0>; + + qcom,wlan-ramdump-dynamic = <0x400000>; + }; + + chip_cfg@3 { + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + supported-ids = <0x1103>; + wlan_vregs; + + qcom,wlan-ramdump-dynamic = <0x420000>; + }; + }; +}; diff --git a/kalama-cnss.dtsi b/kalama-cnss.dtsi index 3e62ffb..b06bc91 100755 --- a/kalama-cnss.dtsi +++ b/kalama-cnss.dtsi @@ -85,7 +85,7 @@ interconnect-names = "pcie_to_memnoc", "memnoc_to_ddr"; qcom,icc-path-count = <2>; - qcom,bus-bw-cfg-count = <9>; + qcom,bus-bw-cfg-count = <10>; qcom,bus-bw-cfg = /** ICC Path 1 **/ <0 0>, /* no vote */ @@ -97,7 +97,7 @@ <30000 1600000>, /* high: 240-1200 Mbps snoc/anoc: 100 Mhz */ <100000 1600000>, - /* very high: > 1200 Mbps snoc/anoc: 403 Mhz */ + /* very high: 1200 Mbps snoc/anoc: 403 Mhz */ <175000 6448000>, /* ultra high: DBS mode snoc/anoc: 403 Mhz */ <312500 6448000>, @@ -107,25 +107,29 @@ * ddr: 547.2 MHz */ <7500 3200000>, + /* mid high: 800-1200 Mbps snoc/anoc: 200 Mhz */ + <100000 3200000>, /** ICC Path 2 **/ <0 0>, - /* idle: 0-18 Mbps ddr: 451.2 MHz */ - <2250 1804800>, - /* low: 18-60 Mbps ddr: 451.2 MHz */ - <7500 1804800>, - /* medium: 60-240 Mbps ddr: 451.2 MHz */ - <30000 1804800>, - /* high: 240-1080 Mbps ddr: 451.2 MHz */ - <100000 1804800>, - /* very high: > 1080 Mbps ddr: 451.2 MHz */ + /* 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-1080 Mbps ddr: 547.2 MHz */ + <100000 2188800>, + /* very high: > 1080 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>; + <7500 2188800>, + /* mid high: 800-1200 Mbps ddr: 547.2 Mhz */ + <100000 2188800>; qcom,pdc_init_table = "{class: wlan_pdc, ss: rf, res: s4e.v, upval: 966}", diff --git a/kona-iot-vc-cnss.dts b/kona-iot-vc-cnss.dts new file mode 100755 index 0000000..20245e9 --- /dev/null +++ b/kona-iot-vc-cnss.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "kona-iot-vc-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. kona-iot VC"; + compatible = "qcom,kona-iot"; + qcom,board-id = <0x010020 0x07>; + qcom,msm-id = <0x1e1 0x20001>; +}; diff --git a/kona-iot-vc-cnss.dtsi b/kona-iot-vc-cnss.dtsi new file mode 100755 index 0000000..aec2438 --- /dev/null +++ b/kona-iot-vc-cnss.dtsi @@ -0,0 +1,132 @@ +#include <dt-bindings/interconnect/qcom,kona.h> + +&tlmm { + cnss_pins { + cnss_wlan_en_active: cnss_wlan_en_active { + mux { + pins = "gpio20"; + function = "gpio"; + }; + + config { + pins = "gpio20"; + drive-strength = <16>; + output-high; + bias-pull-up; + }; + }; + + cnss_wlan_en_sleep: cnss_wlan_en_sleep { + mux { + pins = "gpio20"; + function = "gpio"; + }; + + config { + pins = "gpio20"; + 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 0x1400000>; + }; +}; + +&soc { + wlan: qcom,cnss-qca6390@b0000000 { + compatible = "qcom,cnss-qca6390"; + reg = <0xb0000000 0x10000>, + <0xb2e5510 0x5c0>; + reg-names = "smmu_iova_ipa", "tcs_cmd"; + wlan-en-gpio = <&tlmm 20 0>; + qcom,bt-en-gpio = <&tlmm 21 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + qcom,wlan; + qcom,same-dt-multi-dev; + cnss-enable-self-recovery; + qcom,wlan-rc-num = <0>; + qcom,cmd_db_name = "smpf2"; + qcom,set-wlaon-pwr-ctrl; + + vdd-wlan-aon-supply = <&S6A>; + vdd-wlan-io-supply = <&S4A>; + vdd-wlan-dig-supply = <&S2F>; + vdd-wlan-rfa1-supply = <&S5A>; + vdd-wlan-rfa2-supply = <&S8C>; + wlan-ant-switch-supply = <&L5C>; + + chip_cfg@0 { + supported-ids = <0x1101>; + qcom,wlan-ramdump-dynamic = <0x420000>; + qcom,smmu-s1-enable; + use-pm-domain; + mboxes = <&qmp_aop 0>; + + wlan_vregs = "vdd-wlan-aon", "vdd-wlan-dig", + "vdd-wlan-io", "vdd-wlan-rfa1", + "vdd-wlan-rfa2", "wlan-ant-switch"; + + qcom,vdd-wlan-aon-config = <950000 950000 0 0 1>; + qcom,vdd-wlan-dig-config = <950000 952000 0 0 1>; + qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; + qcom,vdd-wlan-rfa1-config = <1900000 1900000 0 0 1>; + qcom,vdd-wlan-rfa2-config = <1350000 1350000 0 0 1>; + qcom,wlan-ant-switch-config = <1800000 1800000 0 0 0>; + + interconnects = <&aggre2_noc MASTER_PCIE_0 &mc_virt SLAVE_EBI1>; + interconnect-names = "pcie_to_ddr"; + + qcom,icc-path-count = <1>; + qcom,bus-bw-cfg-count = <7>; + qcom,bus-bw-cfg = + /* no vote */ + <0 0>, + /* idle: 0-18 Mbps, ddr freq: 451.2 MHz */ + <2250 1600000>, + /* low: 18-60 Mbps, ddr freq: 451.2 MHz*/ + <7500 1600000>, + /* medium: 60-240 Mbps, ddr freq: 451.2 MHz */ + <30000 1804800>, + /* high: 240 - 800 Mbps, ddr freq: 451.2 MHz */ + <100000 1804800>, + /* very high: 800 - 1400 Mbps, ddr freq: 1555.2 MHz */ + <175000 6220800>, + /* low (latency critical): 18 - 60 Mbps, ddr freq: 547.2 MHz */ + <7500 2188800>; + }; + }; +}; + +&pcie0_rp { + #address-cells = <5>; + #size-cells = <0>; + + cnss_pci: cnss_pci { + reg = <0 0 0 0 0>; + qcom,iommu-group = <&cnss_pci_iommu_group>; + memory-region = <&cnss_wlan_mem>; + + #address-cells = <1>; + #size-cells = <1>; + + cnss_pci_iommu_group: cnss_pci_iommu_group { + qcom,iommu-dma-addr-pool = <0xa0000000 0x10000000>; + qcom,iommu-dma = "fastmap"; + qcom,iommu-pagetable = "coherent"; + qcom,iommu-faults = "stall-disable", "HUPCF", "no-CFRE", + "non-fatal"; + }; + }; +}; diff --git a/lemans-cnss.dtsi b/lemans-cnss.dtsi index d3aeae3..81fefc5 100755 --- a/lemans-cnss.dtsi +++ b/lemans-cnss.dtsi @@ -44,13 +44,15 @@ ranges = <0xb0000000 0xb0000000 0x10000>; vdd-wlan-ctrl1-supply = <&vreg_conn_pa>; + vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>; vdd-wlan-vl-supply = <&pm8775_c_l2>; vdd-wlan-vm-supply = <&pm8775_e_l6>; vdd-wlan-vh-supply = <&pm8775_a_s5>; - wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-vl", + wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2", "vdd-wlan-vl", "vdd-wlan-vm", "vdd-wlan-vh"; qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>; + qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>; /* no vote-off as sw_ctrl is not supported */ qcom,vdd-wlan-vl-config = <1055000 1055000 0 0 0>; qcom,vdd-wlan-vm-config = <1350000 1350000 450000 0 0>; diff --git a/sa525m-cnss.dts b/sa525m-cnss.dts index 03e02d4..31d256f 100755 --- a/sa525m-cnss.dts +++ b/sa525m-cnss.dts @@ -6,6 +6,6 @@ / { model = "Qualcomm Technologies, Inc. SA525M"; compatible = "qcom,sdxpinn"; - qcom,msm-id = <558 0x10000>; + qcom,msm-id = <558 0x10000>, <559 0x10000>; qcom,board-id = <0 0>; }; diff --git a/sa8155p-vm-cnss.dtsi b/sa8155p-vm-cnss.dtsi index d516920..8964db6 100755 --- a/sa8155p-vm-cnss.dtsi +++ b/sa8155p-vm-cnss.dtsi @@ -33,9 +33,10 @@ qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>; qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>; wlan-en-gpio = <&tlmm 169 0>; - pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "default"; pinctrl-0 = <&cnss_wlan_en_active>; pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_en_sleep>; chip_cfg@0 { supported-ids = <0x1101>; @@ -62,6 +63,26 @@ qcom,wlan-ramdump-dynamic = <0x420000>; }; + + chip_cfg@2 { + supported-ids = <0x003e>; + wlan_vregs = "vdd-wlan"; + qcom,vdd-wlan-config = <0 0 0 10 1>; + qcom,wlan-ramdump-dynamic = <0x200000>; + }; + + chip_cfg@3 { + supported-ids = <0x1102>; + + wlan_vregs = "vdd-wlan-aon", "vdd-wlan-rfa1", + "vdd-wlan-rfa2", "vdd-wlan-rfa3"; + qcom,vdd-wlan-aon-config = <1055000 1055000 0 0 0>; + qcom,vdd-wlan-rfa1-config = <1370000 1370000 0 0 0>; + qcom,vdd-wlan-rfa2-config = <2040000 2040000 0 0 0>; + qcom,vdd-wlan-rfa3-config = <1900000 1900000 450000 0 0>; + + qcom,wlan-ramdump-dynamic = <0x400000>; + }; }; }; diff --git a/sa8195p-vm-cnss.dtsi b/sa8195p-vm-cnss.dtsi index e575774..235412f 100755 --- a/sa8195p-vm-cnss.dtsi +++ b/sa8195p-vm-cnss.dtsi @@ -33,9 +33,10 @@ qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>; qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>; wlan-en-gpio = <&tlmm 169 0>; - pinctrl-names = "wlan_en_active", "wlan_en_sleep"; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "default"; pinctrl-0 = <&cnss_wlan_en_active>; pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_en_sleep>; chip_cfg@0 { supported-ids = <0x1101>; diff --git a/sa8295p-vm-cnss.dts b/sa8295p-vm-cnss.dts new file mode 100755 index 0000000..c369ab0 --- /dev/null +++ b/sa8295p-vm-cnss.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "sa8295p-vm-cnss.dtsi" + +/ { + model = "Qualcomm Technologies, Inc. Direwolf Single LA Guest Virtual Machine"; + compatible = "qcom,direwolf", "qcom,quinvm"; + qcom,msm-id = <460 0x10000>; + qcom,board-id = <0 0x1000001>; +}; diff --git a/sa8295p-vm-cnss.dtsi b/sa8295p-vm-cnss.dtsi new file mode 100755 index 0000000..b1f4385 --- /dev/null +++ b/sa8295p-vm-cnss.dtsi @@ -0,0 +1,46 @@ +&soc { + wlan: qcom,cnss-qca-converged { + compatible = "qcom,cnss-qca-converged"; + qcom,wlan; + qcom,multi-wlan-exchg; + qcom,wlan-rc-num = <4>; + qcom,bus-type=<0>; + qcom,notify-modem-status; + qcom,wlan-cbc-enabled; + + reg = <0xb0000000 0x10000>; + reg-names = "smmu_iova_ipa"; + + vdd-wlan-ctrl1-supply = <&vreg_conn_pa>; + vdd-wlan-ctrl2-supply = <&vreg_conn_1p8>; + vdd-wlan-supply = <&vreg_wlan>; + vdd-wlan-aon-supply = <&pm8540_e0_s4>; + vdd-wlan-rfa1-supply = <&pm8540_g0_l6>; + vdd-wlan-rfa3-supply = <&pm8540_a0_l15>; + + wlan_vregs = "vdd-wlan-ctrl1", "vdd-wlan-ctrl2", "vdd-wlan-aon", + "vdd-wlan-rfa1", "vdd-wlan-rfa3"; + qcom,vdd-wlan-ctrl1-config = <0 0 0 0 0>; + qcom,vdd-wlan-ctrl2-config = <0 0 0 0 0>; + /* no vote-off as sw_ctrl is not supported */ + qcom,vdd-wlan-aon-config = <1055000 1055000 0 0 0>; + /* No vol setting for bypass LDOs */ + qcom,vdd-wlan-rfa1-config = <0 0 0 0 0>; + qcom,vdd-wlan-rfa3-config = <0 0 0 0 0>; + wlan-en-gpio = <&tlmm 125 0>; + pinctrl-names = "wlan_en_active", "wlan_en_sleep", "default"; + pinctrl-0 = <&cnss_wlan_en_active>; + pinctrl-1 = <&cnss_wlan_en_sleep>; + pinctrl-2 = <&cnss_wlan_en_sleep>; + + chip_cfg@0 { + supported-ids = <0x1101>; + qcom,wlan-ramdump-dynamic = <0x400000>; + }; + + chip_cfg@1 { + supported-ids = <0x1103>; + qcom,wlan-ramdump-dynamic = <0x400000>; + }; + }; +}; diff --git a/sdxpinn-cnss.dts b/sdxpinn-cnss.dts index dff45c4..d5f23c1 100755 --- a/sdxpinn-cnss.dts +++ b/sdxpinn-cnss.dts @@ -7,5 +7,5 @@ model = "Qualcomm Technologies, Inc. SDXPINN SoC"; compatible = "qcom,sdxpinn"; qcom,msm-id = <556 0x10000>, <580 0x10000>; - qcom,board-id = <0x2010022 0x302>, <0x2020022 0x302>, <0x10015 0x300>, <0x20015 0x300>; + qcom,board-id = <0x2010022 0x302>, <0x2020022 0x302>, <0x10015 0x300>, <0x20015 0x300>, <0x2010022 0x402>; }; diff --git a/sdxpinn-cnss.dtsi b/sdxpinn-cnss.dtsi index 37922fd..7b9465e 100755 --- a/sdxpinn-cnss.dtsi +++ b/sdxpinn-cnss.dtsi @@ -64,9 +64,6 @@ use-pm-domain; mboxes = <&qmp_aop 0>; - clocks = <&rpmhcc RPMH_RF_CLK1>; - clock-names = "rf_clk"; - vdd-wlan-io-supply = <&L6B>; qcom,vdd-wlan-io-config = <1800000 1800000 0 0 1>; vdd-wlan-supply = <&S1K>; |