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

Commit 93c62da2 authored by Mark Brown's avatar Mark Brown Committed by Liam Girdwood
Browse files

regulator: Allow init data to be supplied for bq24022 



Previously it was not possible to do so, making it impossible for
machines to configure the driver.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 0527100f

drivers/regulator/bq24022.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static int __init bq24022_probe(struct platform_device *pdev) 
	ret = gpio_direction_output(pdata->gpio_iset2, 0);

	ret = gpio_direction_output(pdata->gpio_nce, 1);



	bq24022 = regulator_register(&bq24022_desc, &pdev->dev, NULL, pdata);

	bq24022 = regulator_register(&bq24022_desc, &pdev->dev,

				     pdata->init_data, pdata);

	if (IS_ERR(bq24022)) {

		dev_dbg(&pdev->dev, "couldn't register regulator\n");

		ret = PTR_ERR(bq24022);

include/linux/regulator/bq24022.h

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ 
 *

 */



struct regulator_init_data;



/**

 * bq24022_mach_info - platform data for bq24022

 * @gpio_nce: GPIO line connected to the nCE pin, used to enable / disable charging
@@ -18,4 +20,5 @@ 
struct bq24022_mach_info {

	int gpio_nce;

	int gpio_iset2;

	struct regulator_init_data *init_data;

};