| Message ID | 606950da6f4b36f5a124ff13756c78644fc89804.1677620677.git.jahau@rocketmail.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | Add RT5033 charger device driver | expand |
On Tue, 28 Feb 2023, Jakob Hauser wrote: > Fix comments and remove some empty lines in rt5033-private.h. Align struct > rt5033_charger in rt5033.h. > > Signed-off-by: Jakob Hauser <jahau@rocketmail.com> > --- > include/linux/mfd/rt5033-private.h | 17 +++++++---------- > include/linux/mfd/rt5033.h | 7 +++---- > 2 files changed, 10 insertions(+), 14 deletions(-) Applied, thanks
Hi Lee, On 05.03.23 11:48, Lee Jones wrote: > On Tue, 28 Feb 2023, Jakob Hauser wrote: > >> Fix comments and remove some empty lines in rt5033-private.h. Align struct >> rt5033_charger in rt5033.h. >> >> Signed-off-by: Jakob Hauser <jahau@rocketmail.com> >> --- >> include/linux/mfd/rt5033-private.h | 17 +++++++---------- >> include/linux/mfd/rt5033.h | 7 +++---- >> 2 files changed, 10 insertions(+), 14 deletions(-) > > Applied, thanks > Thanks! Does this mean I should skip this patch in the next versions of the patchset? Or should I just add the Acked-for-MFD-by tag of yours? In the first case I'm not sure what base to use for the next versions of the patchset. Sorry, I'm not so much familiar with the procedures. Kind regards, Jakob
On Sun, 05 Mar 2023, Jakob Hauser wrote: > Hi Lee, > > On 05.03.23 11:48, Lee Jones wrote: > > On Tue, 28 Feb 2023, Jakob Hauser wrote: > > > > > Fix comments and remove some empty lines in rt5033-private.h. Align struct > > > rt5033_charger in rt5033.h. > > > > > > Signed-off-by: Jakob Hauser <jahau@rocketmail.com> > > > --- > > > include/linux/mfd/rt5033-private.h | 17 +++++++---------- > > > include/linux/mfd/rt5033.h | 7 +++---- > > > 2 files changed, 10 insertions(+), 14 deletions(-) > > > > Applied, thanks > > > > Thanks! Does this mean I should skip this patch in the next versions of the > patchset? Or should I just add the Acked-for-MFD-by tag of yours? In the > first case I'm not sure what base to use for the next versions of the > patchset. Sorry, I'm not so much familiar with the procedures. You should rebase onto -next before sending out your next submission. This patch should vanish from the set. If it doesn't, please wait another 24hrs and try again.
diff --git a/include/linux/mfd/rt5033-private.h b/include/linux/mfd/rt5033-private.h index d18cd4572208..b035a67cec73 100644 --- a/include/linux/mfd/rt5033-private.h +++ b/include/linux/mfd/rt5033-private.h @@ -111,14 +111,13 @@ enum rt5033_reg { #define RT5033_LDO_CTRL_MASK 0x1f /* RT5033 charger property - model, manufacturer */ - #define RT5033_CHARGER_MODEL "RT5033WSC Charger" #define RT5033_MANUFACTURER "Richtek Technology Corporation" /* - * RT5033 charger fast-charge current lmits (as in CHGCTRL1 register), - * AICR mode limits the input current for example, - * the AIRC 100 mode limits the input current to 100 mA. + * While RT5033 charger can limit the fast-charge current (as in CHGCTRL1 + * register), AICR mode limits the input current. For example, the AIRC 100 + * mode limits the input current to 100 mA. */ #define RT5033_AICR_100_MODE 0x20 #define RT5033_AICR_500_MODE 0x40 @@ -143,10 +142,9 @@ enum rt5033_reg { #define RT5033_TE_ENABLE_MASK 0x08 /* - * RT5033 charger opa mode. RT50300 have two opa mode charger mode - * and boost mode for OTG + * RT5033 charger opa mode. RT5033 has two opa modes for OTG: charger mode + * and boost mode. */ - #define RT5033_CHARGER_MODE 0x00 #define RT5033_BOOST_MODE 0x01 @@ -185,18 +183,17 @@ enum rt5033_reg { * RT5033 charger pre-charge threshold volt limits * (as in CHGCTRL5 register), uV */ - #define RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MIN 2300000U #define RT5033_CHARGER_PRE_THRESHOLD_STEP_NUM 100000U #define RT5033_CHARGER_PRE_THRESHOLD_LIMIT_MAX 3800000U /* - * RT5033 charger enable UUG, If UUG enable MOS auto control by H/W charger + * RT5033 charger UUG. It enables MOS auto control by H/W charger * circuit. */ #define RT5033_CHARGER_UUG_ENABLE 0x02 -/* RT5033 charger High impedance mode */ +/* RT5033 charger high impedance mode */ #define RT5033_CHARGER_HZ_DISABLE 0x00 #define RT5033_CHARGER_HZ_ENABLE 0x01 diff --git a/include/linux/mfd/rt5033.h b/include/linux/mfd/rt5033.h index 3c23b6220c04..8f306ac15a27 100644 --- a/include/linux/mfd/rt5033.h +++ b/include/linux/mfd/rt5033.h @@ -49,10 +49,9 @@ struct rt5033_charger_data { }; struct rt5033_charger { - struct device *dev; - struct rt5033_dev *rt5033; - struct power_supply psy; - + struct device *dev; + struct rt5033_dev *rt5033; + struct power_supply psy; struct rt5033_charger_data *chg; };
Fix comments and remove some empty lines in rt5033-private.h. Align struct rt5033_charger in rt5033.h. Signed-off-by: Jakob Hauser <jahau@rocketmail.com> --- include/linux/mfd/rt5033-private.h | 17 +++++++---------- include/linux/mfd/rt5033.h | 7 +++---- 2 files changed, 10 insertions(+), 14 deletions(-)