| Message ID | 1499852567-28165-3-git-send-email-jjhiblot@ti.com |
|---|---|
| State | Accepted |
| Commit | 5c970013a661c630ab28ddc3dd6766fe6bf83ece |
| Delegated to: | Jaehoon Chung |
| Headers | show |
On Wednesday 12 July 2017 03:12 PM, Jean-Jacques Hiblot wrote: > Some LDOs have a bypass capability. Make sure that the bypass is disabled > when is the LDO is enabled (otherwise the voltage can't be changed). Reviewed-by: Keerthy <j-keerthy@ti.com> > > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> > --- > drivers/power/regulator/palmas_regulator.c | 36 ++++++++++++++++++++++++++++++ > include/power/palmas.h | 1 + > 2 files changed, 37 insertions(+) > > diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c > index 99614b0..24a7977 100644 > --- a/drivers/power/regulator/palmas_regulator.c > +++ b/drivers/power/regulator/palmas_regulator.c > @@ -163,6 +163,38 @@ static int palmas_smps_val(struct udevice *dev, int op, int *uV) > return pmic_reg_write(dev->parent, adr, ret); > } > > +static int palmas_ldo_bypass_enable(struct udevice *dev, bool enabled) > +{ > + int type = dev_get_driver_data(dev_get_parent(dev)); > + struct dm_regulator_uclass_platdata *p; > + unsigned int adr; > + int reg; > + > + if (type == TPS65917) { > + /* bypass available only on LDO1 and LDO2 */ > + if (dev->driver_data > 2) > + return -ENOTSUPP; > + } else if (type == TPS659038) { > + /* bypass available only on LDO9 */ > + if (dev->driver_data != 9) > + return -ENOTSUPP; > + } > + > + p = dev_get_uclass_platdata(dev); > + adr = p->ctrl_reg; > + > + reg = pmic_reg_read(dev->parent, adr); > + if (reg < 0) > + return reg; > + > + if (enabled) > + reg |= PALMAS_LDO_BYPASS_EN; > + else > + reg &= ~PALMAS_LDO_BYPASS_EN; > + > + return pmic_reg_write(dev->parent, adr, reg); > +} > + > static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) > { > int ret; > @@ -194,6 +226,10 @@ static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) > ret = pmic_reg_write(dev->parent, adr, ret); > if (ret) > return ret; > + > + ret = palmas_ldo_bypass_enable(dev, false); > + if (ret && (ret != -ENOTSUPP)) > + return ret; > } > > return 0; > diff --git a/include/power/palmas.h b/include/power/palmas.h > index bad5a35..df5f15c 100644 > --- a/include/power/palmas.h > +++ b/include/power/palmas.h > @@ -23,3 +23,4 @@ > #define PALMAS_LDO_VOLT_MAX 3300000 > #define PALMAS_LDO_MODE_MASK 0x1 > #define PALMAS_LDO_STATUS_MASK 0x10 > +#define PALMAS_LDO_BYPASS_EN 0x40 >
On Wed, Jul 12, 2017 at 11:42:47AM +0200, Jean-Jacques Hiblot wrote: > Some LDOs have a bypass capability. Make sure that the bypass is disabled > when is the LDO is enabled (otherwise the voltage can't be changed). > > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com>
On 07/12/2017 06:42 PM, Jean-Jacques Hiblot wrote: > Some LDOs have a bypass capability. Make sure that the bypass is disabled > when is the LDO is enabled (otherwise the voltage can't be changed). > > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> > Reviewed-by: Keerthy <j-keerthy@ti.com> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot-mmc for pmic. Thanks! Best Regards, Jaehoon Chung > --- > drivers/power/regulator/palmas_regulator.c | 36 ++++++++++++++++++++++++++++++ > include/power/palmas.h | 1 + > 2 files changed, 37 insertions(+) > > diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c > index 99614b0..24a7977 100644 > --- a/drivers/power/regulator/palmas_regulator.c > +++ b/drivers/power/regulator/palmas_regulator.c > @@ -163,6 +163,38 @@ static int palmas_smps_val(struct udevice *dev, int op, int *uV) > return pmic_reg_write(dev->parent, adr, ret); > } > > +static int palmas_ldo_bypass_enable(struct udevice *dev, bool enabled) > +{ > + int type = dev_get_driver_data(dev_get_parent(dev)); > + struct dm_regulator_uclass_platdata *p; > + unsigned int adr; > + int reg; > + > + if (type == TPS65917) { > + /* bypass available only on LDO1 and LDO2 */ > + if (dev->driver_data > 2) > + return -ENOTSUPP; > + } else if (type == TPS659038) { > + /* bypass available only on LDO9 */ > + if (dev->driver_data != 9) > + return -ENOTSUPP; > + } > + > + p = dev_get_uclass_platdata(dev); > + adr = p->ctrl_reg; > + > + reg = pmic_reg_read(dev->parent, adr); > + if (reg < 0) > + return reg; > + > + if (enabled) > + reg |= PALMAS_LDO_BYPASS_EN; > + else > + reg &= ~PALMAS_LDO_BYPASS_EN; > + > + return pmic_reg_write(dev->parent, adr, reg); > +} > + > static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) > { > int ret; > @@ -194,6 +226,10 @@ static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) > ret = pmic_reg_write(dev->parent, adr, ret); > if (ret) > return ret; > + > + ret = palmas_ldo_bypass_enable(dev, false); > + if (ret && (ret != -ENOTSUPP)) > + return ret; > } > > return 0; > diff --git a/include/power/palmas.h b/include/power/palmas.h > index bad5a35..df5f15c 100644 > --- a/include/power/palmas.h > +++ b/include/power/palmas.h > @@ -23,3 +23,4 @@ > #define PALMAS_LDO_VOLT_MAX 3300000 > #define PALMAS_LDO_MODE_MASK 0x1 > #define PALMAS_LDO_STATUS_MASK 0x10 > +#define PALMAS_LDO_BYPASS_EN 0x40 >
diff --git a/drivers/power/regulator/palmas_regulator.c b/drivers/power/regulator/palmas_regulator.c index 99614b0..24a7977 100644 --- a/drivers/power/regulator/palmas_regulator.c +++ b/drivers/power/regulator/palmas_regulator.c @@ -163,6 +163,38 @@ static int palmas_smps_val(struct udevice *dev, int op, int *uV) return pmic_reg_write(dev->parent, adr, ret); } +static int palmas_ldo_bypass_enable(struct udevice *dev, bool enabled) +{ + int type = dev_get_driver_data(dev_get_parent(dev)); + struct dm_regulator_uclass_platdata *p; + unsigned int adr; + int reg; + + if (type == TPS65917) { + /* bypass available only on LDO1 and LDO2 */ + if (dev->driver_data > 2) + return -ENOTSUPP; + } else if (type == TPS659038) { + /* bypass available only on LDO9 */ + if (dev->driver_data != 9) + return -ENOTSUPP; + } + + p = dev_get_uclass_platdata(dev); + adr = p->ctrl_reg; + + reg = pmic_reg_read(dev->parent, adr); + if (reg < 0) + return reg; + + if (enabled) + reg |= PALMAS_LDO_BYPASS_EN; + else + reg &= ~PALMAS_LDO_BYPASS_EN; + + return pmic_reg_write(dev->parent, adr, reg); +} + static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) { int ret; @@ -194,6 +226,10 @@ static int palmas_ldo_enable(struct udevice *dev, int op, bool *enable) ret = pmic_reg_write(dev->parent, adr, ret); if (ret) return ret; + + ret = palmas_ldo_bypass_enable(dev, false); + if (ret && (ret != -ENOTSUPP)) + return ret; } return 0; diff --git a/include/power/palmas.h b/include/power/palmas.h index bad5a35..df5f15c 100644 --- a/include/power/palmas.h +++ b/include/power/palmas.h @@ -23,3 +23,4 @@ #define PALMAS_LDO_VOLT_MAX 3300000 #define PALMAS_LDO_MODE_MASK 0x1 #define PALMAS_LDO_STATUS_MASK 0x10 +#define PALMAS_LDO_BYPASS_EN 0x40
Some LDOs have a bypass capability. Make sure that the bypass is disabled when is the LDO is enabled (otherwise the voltage can't be changed). Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> --- drivers/power/regulator/palmas_regulator.c | 36 ++++++++++++++++++++++++++++++ include/power/palmas.h | 1 + 2 files changed, 37 insertions(+)