Skip to content

Commit

Permalink
regulator: Allow init data to be supplied for bq24022
Browse files Browse the repository at this point in the history
Previously it was not possible to do so, making it impossible for
machines to configure the driver.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
  • Loading branch information
Mark Brown authored and Liam Girdwood committed Mar 31, 2009
1 parent 0527100 commit 93c62da
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/regulator/bq24022.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions include/linux/regulator/bq24022.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -18,4 +20,5 @@
struct bq24022_mach_info {
int gpio_nce;
int gpio_iset2;
struct regulator_init_data *init_data;
};

0 comments on commit 93c62da

Please sign in to comment.