Merge 8ef99d091e
on remote branch
Change-Id: I68e861b86d2f92ab63e710b23fec44aa601455a9
This commit is contained in:
1
Kbuild
1
Kbuild
@@ -3,6 +3,7 @@ dtbo-y += sun-kiwi-cnss.dtbo
|
|||||||
dtbo-y += sun-kiwi-cnss-v8.dtbo
|
dtbo-y += sun-kiwi-cnss-v8.dtbo
|
||||||
dtbo-y += sun-peach-cnss.dtbo
|
dtbo-y += sun-peach-cnss.dtbo
|
||||||
dtbo-y += sun-peach-cnss-v8.dtbo
|
dtbo-y += sun-peach-cnss-v8.dtbo
|
||||||
|
dtbo-y += sunp-hdk-peach-cnss-v8.dtbo
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(CONFIG_ARCH_PINEAPPLE),y)
|
ifeq ($(CONFIG_ARCH_PINEAPPLE),y)
|
||||||
|
@@ -92,9 +92,9 @@
|
|||||||
qcom,qmp = <&aoss_qmp>;
|
qcom,qmp = <&aoss_qmp>;
|
||||||
|
|
||||||
vdd-wlan-io-supply = <&L3F>;
|
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>;
|
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>;
|
vdd-wlan-supply = <&S5F>;
|
||||||
qcom,vdd-wlan-config = <932000 1000000 0 0 0>;
|
qcom,vdd-wlan-config = <932000 1000000 0 0 0>;
|
||||||
vdd-wlan-aon-supply = <&S4D>;
|
vdd-wlan-aon-supply = <&S4D>;
|
||||||
|
@@ -92,9 +92,9 @@
|
|||||||
qcom,qmp = <&aoss_qmp>;
|
qcom,qmp = <&aoss_qmp>;
|
||||||
|
|
||||||
vdd-wlan-io-supply = <&L3F>;
|
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>;
|
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>;
|
vdd-wlan-supply = <&S4J>;
|
||||||
qcom,vdd-wlan-config = <932000 1000000 0 0 0>;
|
qcom,vdd-wlan-config = <932000 1000000 0 0 0>;
|
||||||
vdd-wlan-aon-supply = <&S4D>;
|
vdd-wlan-aon-supply = <&S4D>;
|
||||||
|
@@ -110,9 +110,9 @@
|
|||||||
msix-match-addr = <0x3000>;
|
msix-match-addr = <0x3000>;
|
||||||
|
|
||||||
vdd-wlan-io-supply = <&L3F>;
|
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>;
|
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>;
|
vdd-wlan-aon-supply = <&S4D>;
|
||||||
qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>;
|
qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>;
|
||||||
vdd-wlan-dig-supply = <&S5F>;
|
vdd-wlan-dig-supply = <&S5F>;
|
||||||
@@ -170,6 +170,24 @@
|
|||||||
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
|
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
|
||||||
<7500 2188800>;
|
<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 =
|
qcom,pdc_init_table =
|
||||||
"{class: wlan_pdc, ss: rf, res: s5f.m, enable: 1}",
|
"{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, enable: 1}",
|
||||||
|
@@ -109,9 +109,9 @@
|
|||||||
msix-match-addr = <0x3000>;
|
msix-match-addr = <0x3000>;
|
||||||
|
|
||||||
vdd-wlan-io-supply = <&L3F>;
|
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>;
|
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>;
|
vdd-wlan-aon-supply = <&S4D>;
|
||||||
qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>;
|
qcom,vdd-wlan-aon-config = <876000 1036000 0 0 1>;
|
||||||
vdd-wlan-dig-supply = <&S4J>;
|
vdd-wlan-dig-supply = <&S4J>;
|
||||||
@@ -169,6 +169,24 @@
|
|||||||
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
|
/* low (latency critical): 18-60 Mbps ddr: 547.2 MHz */
|
||||||
<7500 2188800>;
|
<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 =
|
qcom,pdc_init_table =
|
||||||
"{class: wlan_pdc, ss: rf, res: s4j.m, enable: 1}",
|
"{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, enable: 1}",
|
||||||
|
20
sunp-hdk-peach-cnss-v8.dts
Normal file
20
sunp-hdk-peach-cnss-v8.dts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
// 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>,
|
||||||
|
<0x100026a 0x10000>, <0x100026a 0x20000>,
|
||||||
|
<0x100027f 0x10000>, <0x100027f 0x20000>;
|
||||||
|
|
||||||
|
qcom,board-id = <0x1001f 0>;
|
||||||
|
};
|
12
sunp-hdk-peach-cnss-v8.dtsi
Normal file
12
sunp-hdk-peach-cnss-v8.dtsi
Normal file
@@ -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;
|
||||||
|
};
|
Reference in New Issue
Block a user