Merge e804cdf8e3 on remote branch

Change-Id: I3c16f3d849ac61805a71361f677c3126db816ffe
This commit is contained in:
Linux Build Service Account
2025-04-02 01:40:59 -07:00
5 changed files with 23 additions and 18 deletions

View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause // 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/; /dts-v1/;
@@ -14,6 +14,8 @@
compatible = "qcom,canoe", "qcom,canoep", "qcom,canoe-mtp", "qcom,canoe-cdp"; compatible = "qcom,canoe", "qcom,canoep", "qcom,canoe-mtp", "qcom,canoe-cdp";
qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>,
<0x1000294 0x10000>, <0x1000294 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>; qcom,board-id = <0x30001 0>, <0x20008 0>, <0x30015 0>;
}; };

View File

@@ -1,7 +1,7 @@
// SPDX-License-Identifier: BSD-3-Clause // 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/; /dts-v1/;
@@ -14,7 +14,8 @@
compatible = "qcom,canoe", "qcom,canoep"; compatible = "qcom,canoe", "qcom,canoep";
qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>, qcom,msm-id = <0x294 0x10000>, <0x294 0x20000>, <0x295 0x10000>, <0x295 0x20000>,
<0x1000294 0x10000>, <0x1000294 0x20000>, <0x1000295 0x10000>, <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>, qcom,board-id = <1 0>, <0x20001 0>, <8 0>, <0x30008 0>, <0x40008 0>,
<0x50008 0>, <0x60008 0>, <0x21 0>, <11 0>, <0x50008 0>, <0x60008 0>, <0x21 0>, <11 0>,
<0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>; <0x2000B 0>, <0x15 0>, <0x20015 0>, <0x30015 0>;

View File

@@ -170,22 +170,22 @@
<7500 2188800>; <7500 2188800>;
qcom,vreg_pdc_map = qcom,vreg_pdc_map =
"s1j", "bb", "S1J1", "bb",
"s2j", "rf", "S2J1", "rf",
"s7f", "rf", "S7F0", "rf",
"s8f", "rf"; "S8F0", "rf";
qcom,pmu_vreg_map = qcom,pmu_vreg_map =
"VDD_PMU_AON_I", "s2j", "VDDD_AON_0P9", "S2J1",
"VDD09_PMU_RFA_I", "s2j", "VDDA_RFA_0P9", "S2J1",
"VDD19_PMU_RFA_I", "s8f", "VDDA_RFA_1P9", "S8F0",
"VDD13_PMU_RFA_I", "s7f", "VDDA_RFA_1P3", "S7F0",
"VDD095_MX_PMU", "s2j", "VDDD_WLMX_0P9", "S2J1",
"VDD095_PMU_CX", "s1j", "VDDD_WLCX_0P9", "S1J1",
"VDD095_PMU_BTCX", "s2j", "VDDD_BTCX_0P9", "S2J1",
"VDD095_PMU_BTMX", "s2j", "VDDD_BTCMX_0P9", "S2J1",
"VDD13_PMU_PCIE_I", "s7f", "VDDA_PCIE_0P9", "S7F0",
"VDD13_PMU_PCIE12_I", "s7f"; "VDDA_PCIE_1P2", "S7F0";
/* 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>

View File

@@ -70,6 +70,7 @@
sw-ctrl-gpio = <81>; sw-ctrl-gpio = <81>;
/* List of GPIOs to be setup for interrupt wakeup capable */ /* List of GPIOs to be setup for interrupt wakeup capable */
mpm_wake_set_gpios = <81>; mpm_wake_set_gpios = <81>;
pin_sw-ctrl-gpio = <&tlmm 81 0>;
pinctrl-names = "sw_ctrl"; pinctrl-names = "sw_ctrl";
pinctrl-0 = <&icnss_sw_ctrl>; pinctrl-0 = <&icnss_sw_ctrl>;

View File

@@ -66,6 +66,7 @@
sw-ctrl-gpio =<80>; sw-ctrl-gpio =<80>;
/* List of GPIOs to be setup for interrupt wakeup capable */ /* List of GPIOs to be setup for interrupt wakeup capable */
mpm_wake_set_gpios = <80>; mpm_wake_set_gpios = <80>;
pin_sw-ctrl-gpio = <&tlmm 80 0>;
pinctrl-names = "sw_ctrl"; pinctrl-names = "sw_ctrl";
pinctrl-0 = <&icnss_sw_ctrl>; pinctrl-0 = <&icnss_sw_ctrl>;