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>

diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index d31db3e14913fb1d1281c6a4eea49bf145242b76..23d554628a76128e6786bb9666a67c0179e4ec32 100644 (file)
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -73,7 +73,8 @@ static int regulator_fixed_voltage_probe(struct platform_device *pdev)
 
        drvdata->microvolts = config->microvolts;
 
-       drvdata->dev = regulator_register(&drvdata->desc, drvdata);
+       drvdata->dev = regulator_register(&drvdata->desc, &pdev->dev,
+                                         config->init_data, drvdata);
        if (IS_ERR(drvdata->dev)) {
                ret = PTR_ERR(drvdata->dev);
                goto err_name;

diff --git a/include/linux/regulator/fixed.h b/include/linux/regulator/fixed.h
index 1387a5d2190e627801c90ec0308b538265f6d1c6..91b4da31f1b510a0c21bc5d579b0143e753152ec 100644 (file)
--- a/include/linux/regulator/fixed.h
+++ b/include/linux/regulator/fixed.h
@@ -14,9 +14,12 @@
 #ifndef __REGULATOR_FIXED_H
 #define __REGULATOR_FIXED_H
 
+struct regulator_init_data;
+
 struct fixed_voltage_config {
        const char *supply_name;
        int microvolts;
+       struct regulator_init_data *init_data;
 };
 
 #endif