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

Commit b2a7905f authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy Committed by Jeevan Shriram
Browse files

Revert "regulator: labibb: avail of simpler regulator registration api" 



This reverts commit 0324b74b ("regulator: labibb: avail of
simpler regulator registration api").

LABIBB regulator driver still needs to obtain init_data from
the device tree not just for the regulator name but it is for
a subsequent change which will pass the parent supply name via
init_data to register with the regulator framework. Hence bring
it back.

Since of_get_regulator_init_data() is brought back, we need to
pass rdesc to that function as the number of arguments got
changed.

CRs-Fixed: 1008400
Change-Id: I027a9ddbbbf6ff0ba7886151e5336d190ac3ce25
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent 93aea9eb

drivers/regulator/qpnp-labibb-regulator.c

+83 −34
Original line number Diff line number Diff line
@@ -1660,7 +1660,8 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb, 
					struct device_node *of_node)

{

	int rc = 0;

	struct regulator_desc *rdesc;

	struct regulator_init_data *init_data;

	struct regulator_desc *rdesc = &labibb->lab_vreg.rdesc;

	struct regulator_config cfg = {};

	u8 val;

	const char *current_sense_str;
@@ -1672,6 +1673,12 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb, 
		return -EINVAL;

	}



	init_data = of_get_regulator_init_data(labibb->dev, of_node, rdesc);

	if (!init_data) {

		pr_err("unable to get regulator init data for qpnp lab regulator\n");

		return -ENOMEM;

	}



	rc = of_property_read_u32(of_node, "qcom,qpnp-lab-min-voltage",

					&(labibb->lab_vreg.min_volt));

	if (rc < 0) {
@@ -1891,18 +1898,22 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb, 
		}

	}



	rdesc			= &(labibb->lab_vreg.rdesc);

	if (init_data->constraints.name) {

		rdesc->owner		= THIS_MODULE;

		rdesc->type		= REGULATOR_VOLTAGE;

		rdesc->ops		= &qpnp_lab_ops;

	rdesc->name		= of_node->name;

	rdesc->of_match		= of_node->name;

		rdesc->name		= init_data->constraints.name;



		cfg.dev = labibb->dev;

		cfg.init_data = init_data;

		cfg.driver_data = labibb;

		cfg.of_node = of_node;



	labibb->lab_vreg.rdev

		= devm_regulator_register(labibb->dev, rdesc, &cfg);

		init_data->constraints.valid_ops_mask

				|= REGULATOR_CHANGE_VOLTAGE |

					REGULATOR_CHANGE_STATUS;



		labibb->lab_vreg.rdev = regulator_register(rdesc, &cfg);

		if (IS_ERR(labibb->lab_vreg.rdev)) {

			rc = PTR_ERR(labibb->lab_vreg.rdev);

			labibb->lab_vreg.rdev = NULL;
@@ -1911,6 +1922,10 @@ static int register_qpnp_lab_regulator(struct qpnp_labibb *labibb, 


			return rc;

		}

	} else {

		dev_err(labibb->dev, "qpnp lab regulator name missing\n");

		return -EINVAL;

	}



	mutex_init(&(labibb->lab_vreg.lab_mutex));

	return 0;
@@ -2339,7 +2354,8 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb, 
					struct device_node *of_node)

{

	int rc = 0;

	struct regulator_desc *rdesc;

	struct regulator_init_data *init_data;

	struct regulator_desc *rdesc = &labibb->ibb_vreg.rdesc;

	struct regulator_config cfg = {};

	u8 val, ibb_enable_ctl;

	u32 tmp;
@@ -2349,6 +2365,12 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb, 
		return -EINVAL;

	}



	init_data = of_get_regulator_init_data(labibb->dev, of_node, rdesc);

	if (!init_data) {

		pr_err("unable to get regulator init data for qpnp ibb regulator\n");

		return -ENOMEM;

	}



	rc = of_property_read_u32(of_node, "qcom,qpnp-ibb-min-voltage",

					&(labibb->ibb_vreg.min_volt));

	if (rc < 0) {
@@ -2590,18 +2612,22 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb, 
		}

	}



	rdesc			= &(labibb->ibb_vreg.rdesc);

	if (init_data->constraints.name) {

		rdesc->owner		= THIS_MODULE;

		rdesc->type		= REGULATOR_VOLTAGE;

		rdesc->ops		= &qpnp_ibb_ops;

	rdesc->name		= of_node->name;

	rdesc->of_match		= of_node->name;

		rdesc->name		= init_data->constraints.name;



		cfg.dev = labibb->dev;

		cfg.init_data = init_data;

		cfg.driver_data = labibb;

		cfg.of_node = of_node;



		init_data->constraints.valid_ops_mask

				|= REGULATOR_CHANGE_VOLTAGE |

					REGULATOR_CHANGE_STATUS;



	labibb->ibb_vreg.rdev

		= devm_regulator_register(labibb->dev, rdesc, &cfg);

		labibb->ibb_vreg.rdev = regulator_register(rdesc, &cfg);

		if (IS_ERR(labibb->ibb_vreg.rdev)) {

			rc = PTR_ERR(labibb->ibb_vreg.rdev);

			labibb->ibb_vreg.rdev = NULL;
@@ -2610,6 +2636,10 @@ static int register_qpnp_ibb_regulator(struct qpnp_labibb *labibb, 


			return rc;

		}

	} else {

		dev_err(labibb->dev, "qpnp ibb regulator name missing\n");

		return -EINVAL;

	}



	mutex_init(&(labibb->ibb_vreg.ibb_mutex));

	return 0;
@@ -2813,9 +2843,27 @@ static int qpnp_labibb_regulator_probe(struct platform_device *pdev) 
	return 0;



fail_registration:

	if (labibb->lab_vreg.rdev)

		regulator_unregister(labibb->lab_vreg.rdev);

	if (labibb->ibb_vreg.rdev)

		regulator_unregister(labibb->ibb_vreg.rdev);



	return rc;

}



static int qpnp_labibb_regulator_remove(struct platform_device *pdev)

{

	struct qpnp_labibb *labibb = dev_get_drvdata(&pdev->dev);



	if (labibb) {

		if (labibb->lab_vreg.rdev)

			regulator_unregister(labibb->lab_vreg.rdev);

		if (labibb->ibb_vreg.rdev)

			regulator_unregister(labibb->ibb_vreg.rdev);

	}

	return 0;

}



static struct of_device_id spmi_match_table[] = {

	{ .compatible = QPNP_LABIBB_REGULATOR_DRIVER_NAME, },

	{ },
@@ -2827,6 +2875,7 @@ static struct platform_driver qpnp_labibb_regulator_driver = { 
		.of_match_table	= spmi_match_table,

	},

	.probe		= qpnp_labibb_regulator_probe,

	.remove		= qpnp_labibb_regulator_remove,

};



static int __init qpnp_labibb_regulator_init(void)