regulator: core: Add enable_pulldown flag to indicate pulldown on EN input
PATCH 1/3 regulator: core: Add enable_pulldown flag to indicate pulldown on EN input
Add enable_pulldown flag to indicate pulldown on EN input when using regulator_enable_regmap and friends APIs.
--- drivers/regulator/core.c | 24 ++++++++++++++++++++---- include/linux/regulator/driver.h | 3 +++ 2 files changed, 23 insertions(+), 4 deletions(-)
drivers/regulator/core.c +20 -4
@@ -1794,7 +1794,10 @@ int regulator_is_enabled_regmap(struct regulator_dev *rdev)if (ret !=0 )return ret; -return (val & rdev->desc->enable_mask) !=0 ; +if (rdev->desc->enable_pulldown) +return (val & rdev->desc->enable_mask) ==0 ; +else +return (val & rdev->desc->enable_mask) !=0 ; }EXPORT_SYMBOL_GPL (regulator_is_enabled_regmap);
@@ -1809,9 +1812,15 @@ EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap);*/ int regulator_enable_regmap (struct regulator_dev *rdev) { +unsigned int val; + +if (rdev->desc->enable_pulldown) + val =0 ; +else + val = rdev->desc->enable_mask; +return regmap_update_bits (rdev->regmap, rdev->desc->enable_reg, - rdev->desc->enable_mask, - rdev->desc->enable_mask); + rdev->desc->enable_mask, val); }EXPORT_SYMBOL_GPL (regulator_enable_regmap);
@@ -1826,8 +1835,15 @@ EXPORT_SYMBOL_GPL(regulator_enable_regmap);*/ int regulator_disable_regmap (struct regulator_dev *rdev) { +unsigned int val; + +if (rdev->desc->enable_pulldown) + val = rdev->desc->enable_mask; +else + val =0 ; +return regmap_update_bits (rdev->regmap, rdev->desc->enable_reg, - rdev->desc->enable_mask,0 ); + rdev->desc->enable_mask, val); }EXPORT_SYMBOL_GPL (regulator_disable_regmap);
include/linux/regulator/driver.h +3 -0
@@ -199,6 +199,8 @@ enum regulator_type {* output when using regulator_set_voltage_sel_regmap * @enable_reg: Register for control when using regmap enable/disable ops * @enable_mask: Mask for control when using regmap enable/disable ops +* @enable_pulldown: A flag to indicate pulldown on EN input when using +* regulator_enable_regmap and friends APIs. * * @enable_time: Time taken for initial enable of regulator (in uS). */
@@ -226,6 +228,7 @@ struct regulator_desc {unsigned int apply_bit;unsigned int enable_reg;unsigned int enable_mask; +bool enable_pulldown;unsigned int bypass_reg;unsigned int bypass_mask;
Signature · 1 line
1.7.9.5
PATCH 2/3 regulator: 88pm8607: Use enable_pulldown flag with regulator_enable_regmap and friends APIs
--- drivers/regulator/88pm8607.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-)
drivers/regulator/88pm8607.c +4 -32
@@ -220,35 +220,6 @@ static int pm8607_list_voltage(struct regulator_dev *rdev, unsigned index)return ret; } -static int pm8606_preg_enable (struct regulator_dev *rdev) -{ -struct pm8607_regulator_info *info =rdev_get_drvdata (rdev); - -return pm860x_set_bits (info->i2c, rdev->desc->enable_reg, -1 << rdev->desc->enable_mask,0 ); -} - -static int pm8606_preg_disable (struct regulator_dev *rdev) -{ -struct pm8607_regulator_info *info =rdev_get_drvdata (rdev); - -return pm860x_set_bits (info->i2c, rdev->desc->enable_reg, -1 << rdev->desc->enable_mask, -1 << rdev->desc->enable_mask); -} - -static int pm8606_preg_is_enabled (struct regulator_dev *rdev) -{ -struct pm8607_regulator_info *info =rdev_get_drvdata (rdev); -int ret; - - ret =pm860x_reg_read (info->i2c, rdev->desc->enable_reg); -if (ret <0 ) -return ret; - -return !((unsigned char )ret & (1 << rdev->desc->enable_mask)); -} -static struct regulator_ops pm8607_regulator_ops = { .list_voltage = pm8607_list_voltage, .set_voltage_sel = regulator_set_voltage_sel_regmap,
@@ -259,9 +230,9 @@ static struct regulator_ops pm8607_regulator_ops = { };static struct regulator_ops pm8606_preg_ops = { - .enable = pm8606_preg_enable, - .disable = pm8606_preg_disable, - .is_enabled = pm8606_preg_is_enabled, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, };#define PM8606_PREG (ereg, ebit) \
@@ -274,6 +245,7 @@ static struct regulator_ops pm8606_preg_ops = { .owner = THIS_MODULE, \ .enable_reg = PM8606_##ereg, \ .enable_mask = (ebit), \ + .enable_pulldown = true, \ }, \ }
Signature · 1 line
1.7.9.5
PATCH 3/3 regulator: max8649: Use enable_pulldown flag with regulator_enable_regmap and friends APIs
In reply to Axel Lin--- drivers/regulator/max8649.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-)
drivers/regulator/max8649.c +6 -33
@@ -60,36 +60,6 @@ struct max8649_regulator_info { unsigned ramp_down:1; }; -/* EN_PD means pulldown on EN input */ -static int max8649_enable (struct regulator_dev *rdev) -{ -struct max8649_regulator_info *info =rdev_get_drvdata (rdev); -return regmap_update_bits (info->regmap,MAX8649_CONTROL ,MAX8649_EN_PD ,0 ); -} - -/* -* Applied internal pulldown resistor on EN input pin. -* If pulldown EN pin outside, it would be better. -*/ -static int max8649_disable (struct regulator_dev *rdev) -{ -struct max8649_regulator_info *info =rdev_get_drvdata (rdev); -return regmap_update_bits (info->regmap,MAX8649_CONTROL ,MAX8649_EN_PD , -MAX8649_EN_PD ); -} - -static int max8649_is_enabled (struct regulator_dev *rdev) -{ -struct max8649_regulator_info *info =rdev_get_drvdata (rdev); -unsigned int val; -int ret; - - ret =regmap_read (info->regmap,MAX8649_CONTROL , &val); -if (ret !=0 ) -return ret; -return !((unsigned char )val &MAX8649_EN_PD ); -} -static int max8649_enable_time (struct regulator_dev *rdev) {struct max8649_regulator_info *info =rdev_get_drvdata (rdev);
@@ -151,9 +121,9 @@ static struct regulator_ops max8649_dcdc_ops = { .get_voltage_sel = regulator_get_voltage_sel_regmap, .list_voltage = regulator_list_voltage_linear, .map_voltage = regulator_map_voltage_linear, - .enable = max8649_enable, - .disable = max8649_disable, - .is_enabled = max8649_is_enabled, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .is_enabled = regulator_is_enabled_regmap, .enable_time = max8649_enable_time, .set_mode = max8649_set_mode, .get_mode = max8649_get_mode,
@@ -169,6 +139,9 @@ static struct regulator_desc dcdc_desc = { .vsel_mask = MAX8649_VOL_MASK, .min_uV = MAX8649_DCDC_VMIN, .uV_step = MAX8649_DCDC_STEP, + .enable_reg = MAX8649_CONTROL, + .enable_mask = MAX8649_EN_PD, + .enable_pulldown = true, };static struct regmap_config max8649_regmap_config = {
Signature · 1 line
1.7.9.5
Quoted 26 lines · Axel Lin
Add
enable_pulldownflag to indicate pulldown on EN input when usingregulator_enable_regmapand friends APIs.Signed-off-by Axel Lin <[email protected]>--- drivers/regulator/core.c | 24 ++++++++++++++++++++---- include/linux/regulator/driver.h | 3 +++ 2 files changed, 23 insertions(+), 4 deletions(-)drivers/regulator/core.c +4
-1@@ -1794,7 +1794,10 @@ int regulator_is_enabled_regmap(struct regulator_dev *rdev)if (ret !=0 )return ret; -return (val & rdev->desc->enable_mask) !=0 ; +if (rdev->desc->enable_pulldown) +return (val & rdev->desc->enable_mask) ==0 ; +else +return (val & rdev->desc->enable_mask) !=0 ; }EXPORT_SYMBOL_GPL (regulator_is_enabled_regmap);
drivers/regulator/core.c EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap); · line 1821
Quoted 10 lines
drivers/regulator/core.c +7
-0@@ -1809,9 +1812,15 @@ EXPORT_SYMBOL_GPL(regulator_is_enabled_regmap);*/ int regulator_enable_regmap (struct regulator_dev *rdev) { +unsigned int val; + +if (rdev->desc->enable_pulldown) + val =0 ; +else + val = rdev->desc->enable_mask; +
I think that enable_pulldown is a little hard to understand. How about change the name, like set_to_disable or something else?
Quoted 50 lines
drivers/regulator/core.c +9
-3return regmap_update_bits (rdev->regmap, rdev->desc->enable_reg, - rdev->desc->enable_mask, - rdev->desc->enable_mask); + rdev->desc->enable_mask, val); }EXPORT_SYMBOL_GPL (regulator_enable_regmap);@@ -1826,8 +1835,15 @@ EXPORT_SYMBOL_GPL(regulator_enable_regmap);*/ int regulator_disable_regmap (struct regulator_dev *rdev) { +unsigned int val; + +if (rdev->desc->enable_pulldown) + val = rdev->desc->enable_mask; +else + val =0 ; +return regmap_update_bits (rdev->regmap, rdev->desc->enable_reg, - rdev->desc->enable_mask,0 ); + rdev->desc->enable_mask, val); }EXPORT_SYMBOL_GPL (regulator_disable_regmap);include/linux/regulator/driver.h +3
-1@@ -199,6 +199,8 @@ enum regulator_type {* output when using regulator_set_voltage_sel_regmap * @enable_reg: Register for control when using regmap enable/disable ops * @enable_mask: Mask for control when using regmap enable/disable ops +* @enable_pulldown: A flag to indicate pulldown on EN input when using +* regulator_enable_regmap and friends APIs. * * @enable_time: Time taken for initial enable of regulator (in uS). */ @@ -226,6 +228,7 @@ struct regulator_desc {unsigned int apply_bit;unsigned int enable_reg;unsigned int enable_mask; +bool enable_pulldown;unsigned int bypass_reg;unsigned int bypass_mask; --1.7.9.5
A message that is not in the archive (sent off-list or not yet received): CAFRkauBxV6sqN7w-YSE_tMZAJAOF2YANGzrU51btRT2Mz+fsNQ@mail.gmail.com
Quoted 9 lines · Axel Lin
Quoted 4 lines
I think that
enable_pulldownis a little hard to understand. How about change
the name, likeset_to_disableor something else?How about "
enable_invert"?
( We haveena_gpio_invertsetting for GPIO controlled enable lines )
Quoted 6 lines
Then I'll update the comments to:
@enable_invert: A flag to indicate setenable_maskbits to disable when using
regulator_enable_regmapand friends APIs.Axel
enable_is_inverted is better.
drivers/regulator/core.c int regulator_is_enabled_regmap(struct regulator_dev *rdev) · line 1800
Quoted 8 lines · Axel Lin
Add
enable_pulldownflag to indicate pulldown on EN input when usingregulator_enable_regmapand friends APIs.drivers/regulator/core.c +4
-1-return (val & rdev->desc->enable_mask) !=0 ; +if (rdev->desc->enable_pulldown) +return (val & rdev->desc->enable_mask) ==0 ; +else +return (val & rdev->desc->enable_mask) !=0 ;
Pulldown isn't the word here... it's saying that enable is inverted, not that it's pulled down. Pulling something down is more an electrical engineering thing saying what the default value for a signal is if it's not otherwise driven, it doesn't really make sense in terms of a register value.
Something like enable_active_low or enable_invert?