diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-01-19 08:37:04 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2009-03-31 04:56:21 -0400 |
commit | bcf3402c50a48d51462f37f72129d9c4369702b4 (patch) | |
tree | 9a8dcd212ac0a5d0a7da05369e0dd408ee87934c | |
parent | 93c62da23a717f59933ec799688da42f71d8c6c4 (diff) |
regulator: Allow init_data to be passed to fixed voltage regulators
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
-rw-r--r-- | drivers/regulator/fixed.c | 3 | ||||
-rw-r--r-- | include/linux/regulator/fixed.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index d31db3e14913..23d554628a76 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c | |||
@@ -73,7 +73,8 @@ static int regulator_fixed_voltage_probe(struct platform_device *pdev) | |||
73 | 73 | ||
74 | drvdata->microvolts = config->microvolts; | 74 | drvdata->microvolts = config->microvolts; |
75 | 75 | ||
76 | drvdata->dev = regulator_register(&drvdata->desc, drvdata); | 76 | drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev, |
77 | config->init_data, drvdata); | ||
77 | if (IS_ERR(drvdata->dev)) { | 78 | if (IS_ERR(drvdata->dev)) { |
78 | ret = PTR_ERR(drvdata->dev); | 79 | ret = PTR_ERR(drvdata->dev); |
79 | goto err_name; | 80 | goto err_name; |
diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h index 1387a5d2190e..91b4da31f1b5 100644 --- a/include/linux/regulator/fixed.h +++ b/include/linux/regulator/fixed.h | |||
@@ -14,9 +14,12 @@ | |||
14 | #ifndef __REGULATOR_FIXED_H | 14 | #ifndef __REGULATOR_FIXED_H |
15 | #define __REGULATOR_FIXED_H | 15 | #define __REGULATOR_FIXED_H |
16 | 16 | ||
17 | struct regulator_init_data; | ||
18 | |||
17 | struct fixed_voltage_config { | 19 | struct fixed_voltage_config { |
18 | const char *supply_name; | 20 | const char *supply_name; |
19 | int microvolts; | 21 | int microvolts; |
22 | struct regulator_init_data *init_data; | ||
20 | }; | 23 | }; |
21 | 24 | ||
22 | #endif | 25 | #endif |