Commit 163d42fa authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Marcel Holtmann
Browse files

Bluetooth: hci_qca: Use regulator bulk enable/disable 



With the regulator_set_load() and regulator_set_voltage() out of the
enable/disable code paths the code can now use the standard
regulator bulk enable/disable API.

By cloning num_vregs into struct qca_power there's no need to lug around
a reference to the struct qca_vreg_data, which further simplifies
qca_power_setup().

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent f2edd66e

drivers/bluetooth/hci_qca.c

+13 −42
Original line number Original line Diff line number Diff line
@@ -144,8 +144,8 @@ struct qca_vreg_data { 
 */

 */

struct qca_power {

struct qca_power {

	struct device *dev;

	struct device *dev;

	const struct qca_vreg_data *vreg_data;

	struct regulator_bulk_data *vreg_bulk;

	struct regulator_bulk_data *vreg_bulk;

	int num_vregs;

	bool vregs_on;

	bool vregs_on;

};

};
@@ -1383,63 +1383,34 @@ static int qca_power_off(struct hci_dev *hdev) 
	return 0;

	return 0;

}

}





static int qca_enable_regulator(struct qca_vreg vregs,

				struct regulator *regulator)

{

	return regulator_enable(regulator);



}



static void qca_disable_regulator(struct qca_vreg vregs,

				  struct regulator *regulator)

{

	regulator_disable(regulator);



}



static int qca_power_setup(struct hci_uart *hu, bool on)

static int qca_power_setup(struct hci_uart *hu, bool on)

{

{

	struct qca_vreg *vregs;

	struct regulator_bulk_data *vreg_bulk;

	struct regulator_bulk_data *vreg_bulk;

	struct qca_serdev *qcadev;

	struct qca_serdev *qcadev;

	int i, num_vregs, ret = 0;

	int num_vregs;

	int ret = 0;





	qcadev = serdev_device_get_drvdata(hu->serdev);

	qcadev = serdev_device_get_drvdata(hu->serdev);

	if (!qcadev || !qcadev->bt_power || !qcadev->bt_power->vreg_data ||

	if (!qcadev || !qcadev->bt_power || !qcadev->bt_power->vreg_bulk)

	    !qcadev->bt_power->vreg_bulk)

		return -EINVAL;

		return -EINVAL;





	vregs = qcadev->bt_power->vreg_data->vregs;

	vreg_bulk = qcadev->bt_power->vreg_bulk;

	vreg_bulk = qcadev->bt_power->vreg_bulk;

	num_vregs = qcadev->bt_power->vreg_data->num_vregs;

	num_vregs = qcadev->bt_power->num_vregs;

	BT_DBG("on: %d", on);

	BT_DBG("on: %d (%d regulators)", on, num_vregs);

	if (on && !qcadev->bt_power->vregs_on) {

	if (on && !qcadev->bt_power->vregs_on) {

		for (i = 0; i < num_vregs; i++) {

		ret = regulator_bulk_enable(num_vregs, vreg_bulk);

			ret = qca_enable_regulator(vregs[i],

						   vreg_bulk[i].consumer);

		if (ret)

		if (ret)

				break;

			return ret;

		}





		if (ret) {

			BT_ERR("failed to enable regulator:%s", vregs[i].name);

			/* turn off regulators which are enabled */

			for (i = i - 1; i >= 0; i--)

				qca_disable_regulator(vregs[i],

						      vreg_bulk[i].consumer);

		} else {

		qcadev->bt_power->vregs_on = true;

		qcadev->bt_power->vregs_on = true;

		}

	} else if (!on && qcadev->bt_power->vregs_on) {

	} else if (!on && qcadev->bt_power->vregs_on) {

		/* turn off regulator in reverse order */

		/* turn off regulator in reverse order */

		i = qcadev->bt_power->vreg_data->num_vregs - 1;

		regulator_bulk_disable(num_vregs, vreg_bulk);

		for ( ; i >= 0; i--)

			qca_disable_regulator(vregs[i], vreg_bulk[i].consumer);





		qcadev->bt_power->vregs_on = false;

		qcadev->bt_power->vregs_on = false;

	}

	}





	return ret;

	return 0;

}

}





static int qca_init_regulators(struct qca_power *qca,

static int qca_init_regulators(struct qca_power *qca,
@@ -1467,6 +1438,7 @@ static int qca_init_regulators(struct qca_power *qca, 
	}

	}





	qca->vreg_bulk = bulk;

	qca->vreg_bulk = bulk;

	qca->num_vregs = num_vregs;





	return 0;

	return 0;

}

}
@@ -1495,7 +1467,6 @@ static int qca_serdev_probe(struct serdev_device *serdev) 
			return -ENOMEM;

			return -ENOMEM;





		qcadev->bt_power->dev = &serdev->dev;

		qcadev->bt_power->dev = &serdev->dev;

		qcadev->bt_power->vreg_data = data;

		err = qca_init_regulators(qcadev->bt_power, data->vregs,

		err = qca_init_regulators(qcadev->bt_power, data->vregs,

					  data->num_vregs);

					  data->num_vregs);

		if (err) {

		if (err) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE