From 38fc9612c3ff14ff8228c3339f3a4f025201bf2e Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Mon, 1 Mar 2021 18:07:53 -0800 Subject: [PATCH] ARM: dts: msm: Use separate property for multiple WLAN support qcom,converged-dt is meant to use one DT node which has multiple sub-nodes to support multiple devices. For Lahaina it is a simple scenario that the same DT node can be directly used by multiple devices without creating sub-nodes. Use a separate DT entry qcom,same-dt-multi-dev for such case to simplify implementation and avoid conflicts. Change-Id: If0dd195b8dd41eb4aa978bd86d690e6dbb18118d --- bindings/cnss/cnss-wlan.txt | 5 ++++- qcom/lahaina.dtsi | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/bindings/cnss/cnss-wlan.txt b/bindings/cnss/cnss-wlan.txt index f05e653181c4..bc7df786903c 100644 --- a/bindings/cnss/cnss-wlan.txt +++ b/bindings/cnss/cnss-wlan.txt @@ -93,8 +93,11 @@ Optional properties: enable to resolve PMU power up issues. Provide BT GPIO using this config param. - qcom,xo-clk-gpio: Added for QCA6490 XO CLK selection leakage prevention. + - qcom,same-dt-multi-dev: Boolean property to decide whether it supports + multiple WLAN devices using the same DT node + without sub-nodes. - qcom,converged-dt: Boolean property to decide whether it supports multiple - WLAN devices. + WLAN devices using the same DT node with sub-nodes. Example: diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi index 6dcd70411e17..9c50d2d9fc3f 100644 --- a/qcom/lahaina.dtsi +++ b/qcom/lahaina.dtsi @@ -5393,7 +5393,7 @@ qcom,tcs_offset_int_pow_amp_vreg = <0x4D0>; use-pm-domain; cnss-enable-self-recovery; - qcom,converged-dt; + qcom,same-dt-multi-dev; vdd-wlan-aon-supply = <&S2E>; qcom,vdd-wlan-aon-config = <950000 952000 0 0 1>;