Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb6f49fa authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Bluetooth: Move missing dts entries logs to info message"

parents deefc4a2 e2fb53b7

drivers/bluetooth/btpower.c

+16 −13
Original line number Diff line number Diff line
@@ -33,8 +33,12 @@ 


// Regulator structure for QCA6390 and QCA6490 BT SoC series

static struct bt_power_vreg_data bt_vregs_info_qca6x9x[] = {

	{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},
@@ -160,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);
@@ -639,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__);

	}
@@ -801,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);
@@ -815,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;