From 55df7912d1f0fdfcd0725bb57a62f6ab5ec1f2b0 Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Mon, 1 Mar 2021 17:49:12 -0800 Subject: [PATCH] cnss2: Use separate DT entry to add firmware path prefix qcom,converged-dt is meant to use one DT node which has multiple sub-nodes to support multiple devices. There is also one simple scenario that one same DT node can be directly used by multiple devices without creating sub-nodes. Use separate DT entry for such case to add firmware path prefix to simplify implementation and avoid conflicts. Change-Id: I3beb3dfce30d31f086eeb6667afa83560880ff32 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index 537f5dec9bda..03021d123753 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -2955,8 +2955,10 @@ static void cnss_get_wlaon_pwr_ctrl_info(struct cnss_plat_data *plat_priv) static bool cnss_use_fw_path_with_prefix(struct cnss_plat_data *plat_priv) { - return of_property_read_bool(plat_priv->plat_dev->dev.of_node, - "qcom,converged-dt"); + return (of_property_read_bool(plat_priv->plat_dev->dev.of_node, + "qcom,converged-dt") || + of_property_read_bool(plat_priv->plat_dev->dev.of_node, + "qcom,same-dt-multi-dev")); } static const struct platform_device_id cnss_platform_id_table[] = {