From 50cfb94d7250e775e33bec5b14be9e5db68c03e1 Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Tue, 28 Jul 2020 16:33:45 +0530 Subject: [PATCH 1/2] Bluetooth: Update power sources for QCA6390/QCA6490 This change will add all the power sources which are needed for BT SoC's QCA6390 and QCA6490 to operate. Change-Id: Ice58ba2b5c637c9be5cab5118c4b060037c1077d Signed-off-by: Balakrishna Godavarthi --- drivers/bluetooth/btpower.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/bluetooth/btpower.c b/drivers/bluetooth/btpower.c index 9ef8cc479f5d..700fa5450c80 100644 --- a/drivers/bluetooth/btpower.c +++ b/drivers/bluetooth/btpower.c @@ -33,11 +33,15 @@ // Regulator structure for QCA6390 and QCA6490 BT SoC series static struct bt_power_vreg_data bt_vregs_info_qca6x9x[] = { - {NULL, "qcom,bt-vdd-aon", 950000, 950000, 0, false, true}, - {NULL, "qcom,bt-vdd-dig", 950000, 952000, 0, false, true}, - {NULL, "qcom,bt-vdd-rfa1", 1900000, 1900000, 0, false, true}, - {NULL, "qcom,bt-vdd-rfa2", 1900000, 1900000, 0, false, true}, - {NULL, "qcom,bt-vdd-asd", 2800000, 2800000, 0, false, true}, + {NULL, "qcom,bt-vdd-io", 1800000, 1800000, 0, false, true}, + {NULL, "qcom,bt-vdd-aon", 950000, 950000, 0, false, true}, + {NULL, "qcom,bt-vdd-rfacmn", 950000, 950000, 0, false, true}, + /* BT_CX_MX */ + {NULL, "qcom,bt-vdd-dig", 950000, 952000, 0, false, true}, + {NULL, "qcom,bt-vdd-rfa-0p8", 950000, 952000, 0, false, true}, + {NULL, "qcom,bt-vdd-rfa1", 1900000, 1900000, 0, false, true}, + {NULL, "qcom,bt-vdd-rfa2", 1900000, 1900000, 0, false, true}, + {NULL, "qcom,bt-vdd-asd", 2800000, 2800000, 0, false, true}, }; // Regulator structure for WCN399x BT SoC series From e2fb53b7e3a0fcdc36e105180656bf17f0b17cb6 Mon Sep 17 00:00:00 2001 From: Balakrishna Godavarthi Date: Fri, 24 Jul 2020 21:30:35 +0530 Subject: [PATCH 2/2] Bluetooth: Move missing dts entries logs to info message If dts entries are missing, might be which are not required entry for a SoC. Instead of logging them as error message moving them to log messages. Change-Id: I1e2d2e75ee3d5ee9533b12a634a694b9b1da9d08 Signed-off-by: Balakrishna Godavarthi --- drivers/bluetooth/btpower.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/bluetooth/btpower.c b/drivers/bluetooth/btpower.c index 700fa5450c80..40203ccf186b 100644 --- a/drivers/bluetooth/btpower.c +++ b/drivers/bluetooth/btpower.c @@ -164,7 +164,7 @@ static int bt_vreg_disable(struct bt_power_vreg_data *vreg) if (!vreg) return rc; - pr_debug("vreg_disable for : %s\n", __func__, vreg->name); + pr_debug("%s for : %s\n", __func__, vreg->name); if (vreg->is_enabled) { rc = regulator_disable(vreg->reg); @@ -643,25 +643,24 @@ static int bt_power_populate_dt_pinfo(struct platform_device *pdev) of_get_named_gpio(pdev->dev.of_node, "qcom,bt-reset-gpio", 0); if (bt_power_pdata->bt_gpio_sys_rst < 0) - pr_err("%s: bt-reset-gpio not provided in device tree\n", - __func__); + pr_warn("bt-reset-gpio not provided in devicetree\n"); bt_power_pdata->bt_gpio_sw_ctrl = of_get_named_gpio(pdev->dev.of_node, "qcom,bt-sw-ctrl-gpio", 0); if (bt_power_pdata->bt_gpio_sw_ctrl < 0) - pr_err("bt-sw-ctrl-gpio not provided in devicetree\n"); + pr_warn("bt-sw-ctrl-gpio not provided in devicetree\n"); bt_power_pdata->bt_gpio_debug = of_get_named_gpio(pdev->dev.of_node, "qcom,bt-debug-gpio", 0); if (bt_power_pdata->bt_gpio_debug < 0) - pr_err("bt-debug-gpio not provided in devicetree\n"); + pr_warn("bt-debug-gpio not provided in devicetree\n"); rc = bt_dt_parse_clk_info(&pdev->dev, &bt_power_pdata->bt_chip_clk); if (rc < 0) - pr_err("%s: clock not provided in device tree\n", + pr_warn("%s: clock not provided in device tree\n", __func__); } @@ -805,7 +804,7 @@ static long bt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case BT_CMD_PWR_CTRL: pwr_cntrl = (int)arg; - pr_err("%s: BT_CMD_PWR_CTRL pwr_cntrl: %d\n", + pr_warn("%s: BT_CMD_PWR_CTRL pwr_cntrl: %d\n", __func__, pwr_cntrl); if (pwr_state != pwr_cntrl) { ret = bluetooth_power(pwr_cntrl); @@ -819,7 +818,7 @@ static long bt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) break; case BT_CMD_CHIPSET_VERS: chipset_version = (int)arg; - pr_err("%s: unified Current SOC Version : %x\n", __func__, + pr_warn("%s: unified Current SOC Version : %x\n", __func__, chipset_version); if (chipset_version) { soc_id = chipset_version;