diff options
Diffstat (limited to 'drivers/regulator/db5500-prcmu.c')
-rw-r--r-- | drivers/regulator/db5500-prcmu.c | 53 |
1 files changed, 16 insertions, 37 deletions
diff --git a/drivers/regulator/db5500-prcmu.c b/drivers/regulator/db5500-prcmu.c index d52f459fc3c..60e725b2250 100644 --- a/drivers/regulator/db5500-prcmu.c +++ b/drivers/regulator/db5500-prcmu.c @@ -19,31 +19,10 @@ #include <mach/prcmu.h> -/** - * struct db5500_regulator_info - db5500 regulator information - * @dev: device pointer - * @desc: regulator description - * @rdev: regulator device pointer - * @is_enabled: status of the regulator - * @epod_id: id for EPOD (power domain) - * @is_ramret: RAM retention switch for EPOD (power domain) - * @operating_point: operating point (only for vape, to be removed) - * - */ -struct db5500_regulator_info { - struct device *dev; - struct regulator_desc desc; - struct regulator_dev *rdev; - bool is_enabled; - u16 epod_id; - bool is_ramret; - bool exclude_from_power_state; - unsigned int operating_point; -}; - +#include "dbx500-prcmu.h" static int db5500_regulator_enable(struct regulator_dev *rdev) { - struct db5500_regulator_info *info = rdev_get_drvdata(rdev); + struct dbx500_regulator_info *info = rdev_get_drvdata(rdev); if (info == NULL) return -EINVAL; @@ -60,7 +39,7 @@ static int db5500_regulator_enable(struct regulator_dev *rdev) static int db5500_regulator_disable(struct regulator_dev *rdev) { - struct db5500_regulator_info *info = rdev_get_drvdata(rdev); + struct dbx500_regulator_info *info = rdev_get_drvdata(rdev); int ret = 0; if (info == NULL) @@ -78,7 +57,7 @@ static int db5500_regulator_disable(struct regulator_dev *rdev) static int db5500_regulator_is_enabled(struct regulator_dev *rdev) { - struct db5500_regulator_info *info = rdev_get_drvdata(rdev); + struct dbx500_regulator_info *info = rdev_get_drvdata(rdev); if (info == NULL) return -EINVAL; @@ -162,7 +141,7 @@ static int disable_epod(u16 epod_id, bool ramret) */ static int db5500_regulator_switch_enable(struct regulator_dev *rdev) { - struct db5500_regulator_info *info = rdev_get_drvdata(rdev); + struct dbx500_regulator_info *info = rdev_get_drvdata(rdev); int ret; if (info == NULL) @@ -186,7 +165,7 @@ out: static int db5500_regulator_switch_disable(struct regulator_dev *rdev) { - struct db5500_regulator_info *info = rdev_get_drvdata(rdev); + struct dbx500_regulator_info *info = rdev_get_drvdata(rdev); int ret; if (info == NULL) @@ -210,7 +189,7 @@ out: static int db5500_regulator_switch_is_enabled(struct regulator_dev *rdev) { - struct db5500_regulator_info *info = rdev_get_drvdata(rdev); + struct dbx500_regulator_info *info = rdev_get_drvdata(rdev); if (info == NULL) return -EINVAL; @@ -243,8 +222,8 @@ static struct regulator_ops db5500_regulator_switch_ops = { .epod_id = DB5500_EPOD_ID_##reg, \ } -static struct db5500_regulator_info - db5500_regulator_info[DB5500_NUM_REGULATORS] = { +static struct dbx500_regulator_info + dbx500_regulator_info[DB5500_NUM_REGULATORS] = { [DB5500_REGULATOR_VAPE] = { .desc = { .name = "db5500-vape", @@ -268,12 +247,12 @@ static int __devinit db5500_regulator_probe(struct platform_device *pdev) int i, err; /* register all regulators */ - for (i = 0; i < ARRAY_SIZE(db5500_regulator_info); i++) { - struct db5500_regulator_info *info; + for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) { + struct dbx500_regulator_info *info; struct regulator_init_data *init_data = &db5500_init_data[i]; /* assign per-regulator data */ - info = &db5500_regulator_info[i]; + info = &dbx500_regulator_info[i]; info->dev = &pdev->dev; /* register with the regulator framework */ @@ -287,7 +266,7 @@ static int __devinit db5500_regulator_probe(struct platform_device *pdev) /* if failing, unregister all earlier regulators */ i--; while (i >= 0) { - info = &db5500_regulator_info[i]; + info = &dbx500_regulator_info[i]; regulator_unregister(info->rdev); i--; } @@ -305,9 +284,9 @@ static int __exit db5500_regulator_remove(struct platform_device *pdev) { int i; - for (i = 0; i < ARRAY_SIZE(db5500_regulator_info); i++) { - struct db5500_regulator_info *info; - info = &db5500_regulator_info[i]; + for (i = 0; i < ARRAY_SIZE(dbx500_regulator_info); i++) { + struct dbx500_regulator_info *info; + info = &dbx500_regulator_info[i]; dev_vdbg(rdev_get_dev(info->rdev), "regulator-%s-remove\n", info->desc.name); |