| Message ID | 1403807494-23907-1-git-send-email-nm@ti.com |
|---|---|
| State | New |
| Headers | show |
Hello Nishanth, On Friday 27 June 2014 12:01 AM, Nishanth Menon wrote: > We use regmap regulator ops to enable/disable and check if regulator > is enabled for various SMPS. However, these depend on valid > enable_reg, enable_mask and enable_value in regulator descriptor. > > So, similar to fix we did in commit 318dbb02b50c > ("regulator: palmas: Fix SMPS enable/disable/is_enabled"), populate the > same for TPS65917 SMPS registration. LDO definitions are already in place. > > Fixes: d6f83370ed97 ("regulator: palmas: Add tps65917 PMIC support") > Signed-off-by: Nishanth Menon <nm@ti.com> > --- > > Applies on: > git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git > branch: topic/palmas (4c0c9ca Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas) > > Note: Ignored the minor style check from checkpatch --strict as fixing > it would create an 80 char warning > > drivers/regulator/palmas-regulator.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c > index 7c8b441..c7aa1b1 100644 > --- a/drivers/regulator/palmas-regulator.c > +++ b/drivers/regulator/palmas-regulator.c > @@ -1333,6 +1333,14 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic, > pmic->current_reg_mode[id] = reg & > PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; > > + pmic->desc[id].enable_reg = > + PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, > + palmas_regs_info[id].ctrl_addr); This is wrong. Please change palmas_regs_info[id].ctrl_addr to ddata->palmas_regs_info[id].ctrl_addr. The palmas_regs_info should come from the driver data for specific instances as the regmap is different for the different PMICs we support. Once you make the above changes please feel free to add Tested-by: Keerthy <j-keerthy@ti.com>. > + pmic->desc[id].enable_mask = > + PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; > + /* set_mode overrides this value */ > + pmic->desc[id].enable_val = SMPS_CTRL_MODE_ON; > + > pmic->desc[id].type = REGULATOR_VOLTAGE; > pmic->desc[id].owner = THIS_MODULE; > Regards, Keerthy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 7c8b441..c7aa1b1 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -1333,6 +1333,14 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic, pmic->current_reg_mode[id] = reg & PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; + pmic->desc[id].enable_reg = + PALMAS_BASE_TO_REG(PALMAS_SMPS_BASE, + palmas_regs_info[id].ctrl_addr); + pmic->desc[id].enable_mask = + PALMAS_SMPS12_CTRL_MODE_ACTIVE_MASK; + /* set_mode overrides this value */ + pmic->desc[id].enable_val = SMPS_CTRL_MODE_ON; + pmic->desc[id].type = REGULATOR_VOLTAGE; pmic->desc[id].owner = THIS_MODULE;
We use regmap regulator ops to enable/disable and check if regulator is enabled for various SMPS. However, these depend on valid enable_reg, enable_mask and enable_value in regulator descriptor. So, similar to fix we did in commit 318dbb02b50c ("regulator: palmas: Fix SMPS enable/disable/is_enabled"), populate the same for TPS65917 SMPS registration. LDO definitions are already in place. Fixes: d6f83370ed97 ("regulator: palmas: Add tps65917 PMIC support") Signed-off-by: Nishanth Menon <nm@ti.com> --- Applies on: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git branch: topic/palmas (4c0c9ca Merge remote-tracking branch 'regulator/fix/palmas' into regulator-palmas) Note: Ignored the minor style check from checkpatch --strict as fixing it would create an 80 char warning drivers/regulator/palmas-regulator.c | 8 ++++++++ 1 file changed, 8 insertions(+)