Merge tag 'devicetree-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/robh...

[deliverable/linux.git] / drivers / regulator / act8865-regulator.c

diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
index 984c30fa951610b3e5bc4b36318008cebdb930ef..000d566e32a4e106744ee652dd25967a02fcb190 100644 (file)
--- a/drivers/regulator/act8865-regulator.c
+++ b/drivers/regulator/act8865-regulator.c
@@ -218,7 +218,7 @@ static const struct regulator_desc act8600_regulators[] = {
                .ops = &act8865_ldo_ops,
                .type = REGULATOR_VOLTAGE,
                .n_voltages = 1,
-               .fixed_uV = 1800000,
+               .fixed_uV = 3300000,
                .enable_reg = ACT8600_LDO910_CTRL,
                .enable_mask = ACT8865_ENA,
                .owner = THIS_MODULE,
@@ -369,7 +369,7 @@ static int act8865_pdata_from_dt(struct device *dev,
        for (i = 0; i < num_matches; i++) {
                regulator->id = i;
                regulator->name = matches[i].name;
-               regulator->platform_data = matches[i].init_data;
+               regulator->init_data = matches[i].init_data;
                of_node[i] = matches[i].of_node;
                regulator++;
        }
@@ -396,7 +396,7 @@ static struct regulator_init_data
 
        for (i = 0; i < pdata->num_regulators; i++) {
                if (pdata->regulators[i].id == id)
-                       return pdata->regulators[i].platform_data;
+                       return pdata->regulators[i].init_data;
        }
 
        return NULL;