|
@@ -65,7 +65,6 @@ enum max77686_ramp_rate {
|
|
};
|
|
};
|
|
|
|
|
|
struct max77686_data {
|
|
struct max77686_data {
|
|
- struct regulator_dev *rdev[MAX77686_REGULATORS];
|
|
|
|
unsigned int opmode[MAX77686_REGULATORS];
|
|
unsigned int opmode[MAX77686_REGULATORS];
|
|
};
|
|
};
|
|
|
|
|
|
@@ -474,16 +473,18 @@ static int max77686_pmic_probe(struct platform_device *pdev)
|
|
platform_set_drvdata(pdev, max77686);
|
|
platform_set_drvdata(pdev, max77686);
|
|
|
|
|
|
for (i = 0; i < MAX77686_REGULATORS; i++) {
|
|
for (i = 0; i < MAX77686_REGULATORS; i++) {
|
|
|
|
+ struct regulator_dev *rdev;
|
|
|
|
+
|
|
config.init_data = pdata->regulators[i].initdata;
|
|
config.init_data = pdata->regulators[i].initdata;
|
|
config.of_node = pdata->regulators[i].of_node;
|
|
config.of_node = pdata->regulators[i].of_node;
|
|
|
|
|
|
max77686->opmode[i] = regulators[i].enable_mask;
|
|
max77686->opmode[i] = regulators[i].enable_mask;
|
|
- max77686->rdev[i] = devm_regulator_register(&pdev->dev,
|
|
|
|
|
|
+ rdev = devm_regulator_register(&pdev->dev,
|
|
®ulators[i], &config);
|
|
®ulators[i], &config);
|
|
- if (IS_ERR(max77686->rdev[i])) {
|
|
|
|
|
|
+ if (IS_ERR(rdev)) {
|
|
dev_err(&pdev->dev,
|
|
dev_err(&pdev->dev,
|
|
"regulator init failed for %d\n", i);
|
|
"regulator init failed for %d\n", i);
|
|
- return PTR_ERR(max77686->rdev[i]);
|
|
|
|
|
|
+ return PTR_ERR(rdev);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|