From 48ee57cdb5af203aa79f5d38e649f18114df149b Mon Sep 17 00:00:00 2001 From: Saquib Herman Date: Fri, 1 Apr 2011 10:22:42 +0530 Subject: [PATCH] --- yaml --- r: 252147 b: refs/heads/master c: 21657ebf868b9c7c6c0cab15a6797c3f1af64295 h: refs/heads/master i: 252145: 9ba9596e91c034ec16717244b7427b5c25214f11 252143: 03c7eeb9d46974ccb381e2a31953ad0fc374163a v: v3 --- [refs] | 2 +- trunk/drivers/regulator/twl-regulator.c | 31 ++++++++++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 32e9167ec9b2..88df8232ecb5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0f060bdd55e36adff4cc80b2a4ed026774db7a9 +refs/heads/master: 21657ebf868b9c7c6c0cab15a6797c3f1af64295 diff --git a/trunk/drivers/regulator/twl-regulator.c b/trunk/drivers/regulator/twl-regulator.c index 6a292852a358..2c6660583769 100644 --- a/trunk/drivers/regulator/twl-regulator.c +++ b/trunk/drivers/regulator/twl-regulator.c @@ -76,6 +76,11 @@ struct twlreg_info { #define VREG_BC_PROC 3 #define VREG_BC_CLK_RST 4 +/* TWL6030 LDO register values for CFG_STATE */ +#define TWL6030_CFG_STATE_OFF 0x00 +#define TWL6030_CFG_STATE_ON 0x01 +#define TWL6030_CFG_STATE_GRP_SHIFT 5 + static inline int twlreg_read(struct twlreg_info *info, unsigned slave_subgp, unsigned offset) { @@ -149,6 +154,11 @@ static int twlreg_enable(struct regulator_dev *rdev) ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp); + if (!ret && twl_class_is_6030()) + ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE, + grp << TWL6030_CFG_STATE_GRP_SHIFT | + TWL6030_CFG_STATE_ON); + udelay(info->delay); return ret; @@ -158,17 +168,36 @@ static int twlreg_disable(struct regulator_dev *rdev) { struct twlreg_info *info = rdev_get_drvdata(rdev); int grp; + int ret; grp = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_GRP); if (grp < 0) return grp; + /* For 6030, set the off state for all grps enabled */ + if (twl_class_is_6030()) { + ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE, + (grp & (P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030)) << + TWL6030_CFG_STATE_GRP_SHIFT | + TWL6030_CFG_STATE_OFF); + if (ret) + return ret; + } + if (twl_class_is_4030()) grp &= ~(P1_GRP_4030 | P2_GRP_4030 | P3_GRP_4030); else grp &= ~(P1_GRP_6030 | P2_GRP_6030 | P3_GRP_6030); - return twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp); + ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_GRP, grp); + + /* Next, associate cleared grp in state register */ + if (!ret && twl_class_is_6030()) + ret = twlreg_write(info, TWL_MODULE_PM_RECEIVER, VREG_STATE, + grp << TWL6030_CFG_STATE_GRP_SHIFT | + TWL6030_CFG_STATE_OFF); + + return ret; } static int twlreg_get_status(struct regulator_dev *rdev)