summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorKim, Milo <Milo.Kim@ti.com>2012-09-05 08:39:23 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-06 03:53:02 +0400
commit86b3fef0c7b5aba1c64ac1e02e68267aeaff44a6 (patch)
treeccefb3390e30201566b4680c500536b23280d308 /drivers
parentb158fba605bf4f1c97af338dfab64c85c4937513 (diff)
downloadlinux-86b3fef0c7b5aba1c64ac1e02e68267aeaff44a6.tar.xz
regulator: lp872x: initialize the DVS mode
The platform specific configuration(general_config) is optional. However, the DVS settings should be configured explicitly while loading the driver. This patch enables configuring the default DVS mode even though the 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')
-rw-r--r--drivers/regulator/lp872x.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/lp872x.c b/drivers/regulator/lp872x.c
index d86b6a3e750d..b16a941c1a62 100644
--- a/drivers/regulator/lp872x.c
+++ b/drivers/regulator/lp872x.c
@@ -796,13 +796,14 @@ static int lp872x_config(struct lp872x *lp)
struct lp872x_platform_data *pdata = lp->pdata;
int ret;
- if (!pdata->update_config)
- return 0;
+ if (!pdata || !pdata->update_config)
+ goto init_dvs;
ret = lp872x_write_byte(lp, LP872X_GENERAL_CFG, pdata->general_config);
if (ret)
return ret;
+init_dvs:
return lp872x_init_dvs(lp);
}