Merge "ARM: dts: msm: Add canoe regulator values" into wlan-platform.lnx.2.0

This commit is contained in:
CNSS_WLAN Service
2024-10-16 21:36:59 -07:00
committed by Gerrit - the friendly Code Review server
2 changed files with 39 additions and 92 deletions

View File

@@ -10,11 +10,12 @@
#include "canoe-peach-cnss.dtsi" #include "canoe-peach-cnss.dtsi"
/ { / {
model = "Qualcomm Technologies, Inc. Sun SoCs"; model = "Qualcomm Technologies, Inc. Canoe SoCs";
compatible = "qcom,canoe", "qcom,canoep"; compatible = "qcom,canoe", "qcom,canoep";
qcom,msm-id = <618 0x10000>, <618 0x20000>, qcom,msm-id = <0x10294 0x10000>, <0x10294 0x20000>, <0x10295 0x10000>, <0x10295 0x20000>,
<639 0x10000>, <639 0x20000>, <0x30294 0x10000>, <0x30294 0x20000>, <0x30295 0x10000>, <0x30295 0x20000>,
<0x100026a 0x10000>, <0x100026a 0x20000>, <0x1010294 0x10000>, <0x1010294 0x20000>, <0x1010295 0x10000>,
<0x100027f 0x10000>, <0x100027f 0x20000>; <0x1010295 0x20000>, <0x1030294 0x10000>, <0x1030294 0x20000>,
qcom,board-id = <1 0>, <8 0>, <0x1000B 0>, <0x15 0>; <0x1030295 0x10000>, <0x1030295 0x20000>;
qcom,board-id = <1 0>, <8 0>, <0x10021 0>, <11 0>, <0x15 0>, <0x208 0>, <0x108 0>;
}; };

View File

@@ -52,12 +52,12 @@
cnss_host_sol_default: cnss_host_sol_default { cnss_host_sol_default: cnss_host_sol_default {
mux { mux {
pins = "gpio202"; pins = "gpio204";
function = "gpio"; function = "gpio";
}; };
config { config {
pins = "gpio202"; pins = "gpio204";
drive-strength = <4>; drive-strength = <4>;
bias-pull-down; bias-pull-down;
}; };
@@ -78,16 +78,16 @@
&soc { &soc {
wlan_peach: qcom,cnss-peach@b0000000 { wlan_peach: qcom,cnss-peach@b0000000 {
compatible = "qcom,cnss-peach"; compatible = "qcom,cnss-peach";
reg = <0xb0000000 0x10000>; reg = <0x0 0xb0000000 0x0 0x10000>;
reg-names = "smmu_iova_ipa"; reg-names = "smmu_iova_ipa";
qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>; qcom,wlan-sw-ctrl-gpio = <&tlmm 19 0>;
supported-ids = <0x110E>; supported-ids = <0x110E>;
wlan-en-gpio = <&tlmm 16 0>; 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>; qcom,sw-ctrl-gpio = <&tlmm 18 0>;
wlan-host-sol-gpio = <&tlmm 202 0>; wlan-host-sol-gpio = <&tlmm 204 0>;
wlan-dev-sol-gpio = <&tlmm 203 0>; wlan-dev-sol-gpio = <&tlmm 205 0>;
/* List of GPIOs to be setup for interrupt wakeup capable */ /* List of GPIOs to be setup for interrupt wakeup capable */
mpm_wake_set_gpios = <18 19>; mpm_wake_set_gpios = <18 19>;
pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl", pinctrl-names = "wlan_en_active", "wlan_en_sleep", "sw_ctrl",
@@ -108,90 +108,36 @@
qcom,qmp = <&aoss_qmp>; qcom,qmp = <&aoss_qmp>;
msix-match-addr = <0x3000>; msix-match-addr = <0x3000>;
vdd-wlan-io-supply = <&L3F>; vdd-wlan-aon-supply = <&L2G>;
qcom,vdd-wlan-io-config = <1800000 1800000 30000 0 1>; qcom,vdd-wlan-aon-config = <1800000 1800000 30000 0 1>;
vdd-wlan-io12-supply = <&L2F>; vdd-wlan-io12-supply = <&L3G>;
qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>; qcom,vdd-wlan-io12-config = <1200000 1200000 30000 0 1>;
vdd-wlan-aon-supply = <&S4D>; vdd-wlan-cx-supply = <&S1J>;
qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>; qcom,vdd-wlan-cx-config = <892000 1000000 0 0 1>;
vdd-wlan-dig-supply = <&S4J>; vdd-wlan-dig-supply = <&S2J>;
qcom,vdd-wlan-dig-config = <876000 1000000 0 0 1>; qcom,vdd-wlan-dig-config = <892000 1000000 0 0 1>;
vdd-wlan-rfa1-supply = <&S3G>; vdd-wlan-rfa1-supply = <&S8F>;
qcom,vdd-wlan-rfa1-config = <1860000 2000000 0 0 1>; qcom,vdd-wlan-rfa1-config = <1876000 2000000 0 0 1>;
vdd-wlan-rfa2-supply = <&S7I>; vdd-wlan-rfa2-supply = <&S7F>;
qcom,vdd-wlan-rfa2-config = <1312000 1340000 0 0 1>; qcom,vdd-wlan-rfa2-config = <1328000 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 = qcom,vreg_pdc_map =
"s4j", "rf", "s1j", "bb",
"s4d", "bb", "s2j", "rf",
"s3g", "rf", "s7f", "rf",
"s7i", "rf"; "s8f", "rf";
qcom,pmu_vreg_map = qcom,pmu_vreg_map =
"VDDD_AON_0P9", "s4j", "VDD_PMU_AON_I", "s2j",
"VDDA_RFA_1P9", "s3g", "VDD09_PMU_RFA_I", "s2j",
"VDDA_RFA_1P3", "s7i", "VDD19_PMU_RFA_I", "s8f",
"VDDA_RFA_0P9", "s4j", "VDD13_PMU_RFA_I", "s7f",
"VDDD_WLMX_0P9", "s4d", "VDD095_MX_PMU", "s2j",
"VDDD_WLCX_0P9", "s4j", "VDD095_PMU_CX", "s1j",
"VDDD_BTCX_0P9", "s4j", "VDD095_PMU_BTCX", "s2j",
"VDDD_BTCMX_0P9", "s4j", "VDD095_PMU_BTMX", "s2j",
"VDDA_PCIE_1P2", "s7i", "VDD13_PMU_PCIE_I", "s7f",
"VDDA_PCIE_0P9", "s7i"; "VDD13_PMU_PCIE12_I", "s7f";
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 /* cpu mask used for wlan tx rx interrupt affinity
* <cpumask_for_rx_interrupts cpumask_for_tx_comp_interrupts> * <cpumask_for_rx_interrupts cpumask_for_tx_comp_interrupts>
@@ -207,7 +153,7 @@
memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>; memory-region = <&cnss_wlan_mem &cnss_pci0_iommu_region_partition>;
cnss_pci0_iommu_region_partition: 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>, iommu-addresses = <&cnss_pci0 0x0 0x0 0x0 0x0 0x18000000>,
<&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>; <&cnss_pci0 0x0 0x0 0xB0000000 0x0 0x50000000>;
}; };