A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

cnss2: Use CONFIG_QCOM_COMMAND_DB to protect MSM command DB APIs

Browse source 
This makes sure CNSS2 driver is able to work in non-MSM platforms
which do not have command DB feature.

Change-Id: I9551bfc639e6db0256e475a27db5dec87bce74ed
Signed-off-by: Yue Ma <yuem@codeaurora.org>
This commit is contained in:
Yue Ma 2020-12-04 14:18:56 -08:00
commit 872b48bc98
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
drivers/net/wireless/cnss2/power.c
View file

@ -6,7 +6,9 @@
#include <linux/of.h>
#include <linux/pinctrl/consumer.h>
#include <linux/regulator/consumer.h>
#if IS_ENABLED(CONFIG_QCOM_COMMAND_DB)
#include <soc/qcom/cmd-db.h>
#endif
#include <linux/of_gpio.h>
#include "main.h"
@ -944,6 +946,30 @@ void cnss_set_pin_connect_status(struct cnss_plat_data *plat_priv)
plat_priv->pin_result.host_pin_result = pin_status;
}
#if IS_ENABLED(CONFIG_QCOM_COMMAND_DB)
static int cnss_cmd_db_ready(struct cnss_plat_data *plat_priv)
{
return cmd_db_ready();
}
static u32 cnss_cmd_db_read_addr(struct cnss_plat_data *plat_priv,
const char *res_id)
{
return cmd_db_read_addr(res_id);
}
#else
static int cnss_cmd_db_ready(struct cnss_plat_data *plat_priv)
{
return -EOPNOTSUPP;
}
static u32 cnss_cmd_db_read_addr(struct cnss_plat_data *plat_priv,
const char *res_id)
{
return 0;
}
#endif
int cnss_get_tcs_info(struct cnss_plat_data *plat_priv)
{
struct platform_device *plat_dev = plat_priv->plat_dev;
@ -996,13 +1022,13 @@ int cnss_get_cpr_info(struct cnss_plat_data *plat_priv)
goto out;
}
ret = cmd_db_ready();
ret = cnss_cmd_db_ready(plat_priv);
if (ret) {
cnss_pr_err("CommandDB is not ready\n");
cnss_pr_err("CommandDB is not ready, err = %d\n", ret);
goto out;
}
cpr_pmic_addr = cmd_db_read_addr(cmd_db_name);
cpr_pmic_addr = cnss_cmd_db_read_addr(plat_priv, cmd_db_name);
if (cpr_pmic_addr > 0) {
cpr_info->cpr_pmic_addr = cpr_pmic_addr;
cnss_pr_dbg("Get CPR PMIC address 0x%x from %s\n",