diff options
| author |   Kim, Milo <Milo.Kim@ti.com> | 2012-09-05 04:39:16 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-06 07:53:02 +0800 |
| commit | b158fba605bf4f1c97af338dfab64c85c4937513 (patch) | |
| tree | a22c8091b4032bbc3047b53c4cc3b615d349406f /drivers/regulator/lp872x.c | |
| parent | regulator: lp872x: remove regulator platform data dependency (diff) | |
| download | linux-dev-b158fba605bf4f1c97af338dfab64c85c4937513.tar.xz linux-dev-b158fba605bf4f1c97af338dfab64c85c4937513.zip | |
regulator: lp872x: set the default DVS mode
The lp872x driver has the DVS platform data which select the register address
of the BUCK voltage.
This patch enables updating the default DVS mode when the DVS platform data
is not defined.
Signed-off-by: Milo(Woogyom) Kim <milo.kim@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator/lp872x.c')
| -rw-r--r-- | drivers/regulator/lp872x.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c index ddd60c6b27ea..d86b6a3e750d 100644 --- a/drivers/regulator/lp872x.c +++ b/drivers/regulator/lp872x.c @@ -86,6 +86,10 @@ #define EXTERN_DVS_USED 0 #define MAX_DELAY 6 +/* Default DVS Mode */ +#define LP8720_DEFAULT_DVS 0 +#define LP8725_DEFAULT_DVS BIT(2) + /* dump registers in regmap-debugfs */ #define MAX_REGISTERS 0x0F @@ -750,8 +754,13 @@ static int lp872x_check_dvs_validity(struct lp872x *lp) static int lp872x_init_dvs(struct lp872x *lp) { int ret, gpio; - struct lp872x_dvs *dvs = lp->pdata->dvs; + struct lp872x_dvs *dvs = lp->pdata ? lp->pdata->dvs : NULL; enum lp872x_dvs_state pinstate; + u8 mask[] = { LP8720_EXT_DVS_M, LP8725_DVS1_M | LP8725_DVS2_M }; + u8 default_dvs_mode[] = { LP8720_DEFAULT_DVS, LP8725_DEFAULT_DVS }; + + if (!dvs) + goto set_default_dvs_mode; ret = lp872x_check_dvs_validity(lp); if (ret) { @@ -776,6 +785,10 @@ static int lp872x_init_dvs(struct lp872x *lp) lp->dvs_gpio = gpio; return 0; + +set_default_dvs_mode: + return lp872x_update_bits(lp, LP872X_GENERAL_CFG, mask[lp->chipid], + default_dvs_mode[lp->chipid]); } static int lp872x_config(struct lp872x *lp) |