From 89ec859030ec6c96f702f59a226a16b056214226 Mon Sep 17 00:00:00 2001 From: "Alan Z. Chen" Date: Wed, 3 Apr 2024 09:44:43 -0700 Subject: [PATCH 1/4] 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 4c9bb0b34f9ba2b826e4697ed811b20cc6bccc15 Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Mon, 1 Apr 2024 22:18:15 -0700 Subject: [PATCH 2/4] 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 3/4] 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 8ef99d091eac485e46dff15f71c2a306582b6e0a Mon Sep 17 00:00:00 2001 From: Jianmin Zhu Date: Thu, 25 Apr 2024 21:08:07 -0700 Subject: [PATCH 4/4] 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>; };