| Message ID | 1474932670-11953-2-git-send-email-wolfgit@wiedmeyer.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, Sep 27, 2016 at 01:31:08AM +0200, Wolfgang Wiedmeyer wrote: > This prepares for an updated regulator and charger driver. The defines > are needed to set the maximum input current and the fast charge > current. > > Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> This shouldn't be separate patch, because: 1. You are touching later power and regulator so this patch should be applied to one and then pulled by other... a lot of unneeded work. 2. It is difficult to find which new code is needed for which driver. Simpler approach might work - when changing the regulator or psy driver, just change the header as needed. Unless there are conflicts and both of them need the same? Best regards, Krzysztof > --- > include/linux/mfd/max77693-private.h | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h > index 3c7a63b..ca18344 100644 > --- a/include/linux/mfd/max77693-private.h > +++ b/include/linux/mfd/max77693-private.h > @@ -222,6 +222,9 @@ enum max77693_charger_battery_state { > #define CHG_CNFG_00_CHG_MASK 0x1 > #define CHG_CNFG_00_BUCK_MASK 0x4 > > +/* MAX77693 CHG_CNFG_02 register */ > +#define CHG_CNFG_02_CC_MASK 0x3F > + > /* MAX77693_CHG_REG_CHG_CNFG_01 register */ > #define CHG_CNFG_01_FCHGTIME_SHIFT 0 > #define CHG_CNFG_01_CHGRSTRT_SHIFT 4 > @@ -258,6 +261,10 @@ enum max77693_charger_battery_state { > > /* MAX77693 CHG_CNFG_09 Register */ > #define CHG_CNFG_09_CHGIN_ILIM_MASK 0x7F > +#define CHG_CNFG_09_CHGIN_ILIM_500_MAX 500000 > +#define CHG_CNFG_09_CHGIN_ILIM_500_MIN 470000 > +#define CHG_CNFG_09_CHGIN_ILIM_0_MAX 60000 > +#define CHG_CNFG_09_CHGIN_ILIM_0_MIN 0 > > /* MAX77693 CHG_CTRL Register */ > #define SAFEOUT_CTRL_SAFEOUT1_MASK 0x3 > -- > 2.8.0.rc3 > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Krzysztof Kozlowski writes: > On Tue, Sep 27, 2016 at 01:31:08AM +0200, Wolfgang Wiedmeyer wrote: >> This prepares for an updated regulator and charger driver. The defines >> are needed to set the maximum input current and the fast charge >> current. >> >> Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> > > This shouldn't be separate patch, because: > 1. You are touching later power and regulator so this patch should be > applied to one and then pulled by other... a lot of unneeded work. > 2. It is difficult to find which new code is needed for which driver. > > Simpler approach might work - when changing the regulator or psy driver, > just change the header as needed. Unless there are conflicts and both of > them need the same? No, no conflicts. I will change the header as needed and won't do a separate patch. Thanks, Wolfgang > Best regards, > Krzysztof > >> --- >> include/linux/mfd/max77693-private.h | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h >> index 3c7a63b..ca18344 100644 >> --- a/include/linux/mfd/max77693-private.h >> +++ b/include/linux/mfd/max77693-private.h >> @@ -222,6 +222,9 @@ enum max77693_charger_battery_state { >> #define CHG_CNFG_00_CHG_MASK 0x1 >> #define CHG_CNFG_00_BUCK_MASK 0x4 >> >> +/* MAX77693 CHG_CNFG_02 register */ >> +#define CHG_CNFG_02_CC_MASK 0x3F >> + >> /* MAX77693_CHG_REG_CHG_CNFG_01 register */ >> #define CHG_CNFG_01_FCHGTIME_SHIFT 0 >> #define CHG_CNFG_01_CHGRSTRT_SHIFT 4 >> @@ -258,6 +261,10 @@ enum max77693_charger_battery_state { >> >> /* MAX77693 CHG_CNFG_09 Register */ >> #define CHG_CNFG_09_CHGIN_ILIM_MASK 0x7F >> +#define CHG_CNFG_09_CHGIN_ILIM_500_MAX 500000 >> +#define CHG_CNFG_09_CHGIN_ILIM_500_MIN 470000 >> +#define CHG_CNFG_09_CHGIN_ILIM_0_MAX 60000 >> +#define CHG_CNFG_09_CHGIN_ILIM_0_MIN 0 >> >> /* MAX77693 CHG_CTRL Register */ >> #define SAFEOUT_CTRL_SAFEOUT1_MASK 0x3 >> -- >> 2.8.0.rc3 >>
diff --git a/include/linux/mfd/max77693-private.h b/include/linux/mfd/max77693-private.h index 3c7a63b..ca18344 100644 --- a/include/linux/mfd/max77693-private.h +++ b/include/linux/mfd/max77693-private.h @@ -222,6 +222,9 @@ enum max77693_charger_battery_state { #define CHG_CNFG_00_CHG_MASK 0x1 #define CHG_CNFG_00_BUCK_MASK 0x4 +/* MAX77693 CHG_CNFG_02 register */ +#define CHG_CNFG_02_CC_MASK 0x3F + /* MAX77693_CHG_REG_CHG_CNFG_01 register */ #define CHG_CNFG_01_FCHGTIME_SHIFT 0 #define CHG_CNFG_01_CHGRSTRT_SHIFT 4 @@ -258,6 +261,10 @@ enum max77693_charger_battery_state { /* MAX77693 CHG_CNFG_09 Register */ #define CHG_CNFG_09_CHGIN_ILIM_MASK 0x7F +#define CHG_CNFG_09_CHGIN_ILIM_500_MAX 500000 +#define CHG_CNFG_09_CHGIN_ILIM_500_MIN 470000 +#define CHG_CNFG_09_CHGIN_ILIM_0_MAX 60000 +#define CHG_CNFG_09_CHGIN_ILIM_0_MIN 0 /* MAX77693 CHG_CTRL Register */ #define SAFEOUT_CTRL_SAFEOUT1_MASK 0x3
This prepares for an updated regulator and charger driver. The defines are needed to set the maximum input current and the fast charge current. Signed-off-by: Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> --- include/linux/mfd/max77693-private.h | 7 +++++++ 1 file changed, 7 insertions(+)