RE: [PATCH V1] mfd: da9061: fix to remove BBAT_CONT register from chip model

[Steve Twiss]

On 06 June 2017 08:16, Lee Jones wrote:

Hi Lee,

> To: Steve Twiss
> Cc: LINUX-KERNEL; Support Opensource
> Subject: Re: [PATCH V1] mfd: da9061: fix to remove BBAT_CONT register from chip model
> 
> On Mon, 05 Jun 2017, Steve Twiss wrote:
> 
> > From: Steve Twiss <stwiss.opensource@xxxxxxxxxxx>
> >
> > Remove the register DA9062AA_BBAT_CONT (0x0C5) from the DA9061 chip model
> > regmap access ranges. This applies to both da9061_aa_readable_ranges[]
> > and da9061_aa_writeable_ranges[].
> >
> > This change is to correct the DA9061 chip model and align it with the
> > latest DA9061 Datasheet.
> >
> > This register previously appeared in the DA9061 Datasheet, Revision 3.2,
> > 01-Mar-2016 and has been removed from later DA9061 datasheet from Dialog,
> > Revision 3.3, 04-Apr-2017.
> >
> > Signed-off-by: Steve Twiss <stwiss.opensource@xxxxxxxxxxx>
> >
> > ---
> >
> > Hi Lee,
> >
> > This is a fix to remove DA9062AA_BBAT_CONT register from the DA9061
> > regmap read/write access tables. It only applies to the DA9061 chip,
> > and does not affect the DA9062.
> >
> > No existing kernel code tries to access this register, so the change is
> > just a formality to correct the DA9061 chip model and align it with the
> > DA9061 Datasheet.
> >
> > This patch applies against linux-next and v4.12-rc3
> >
> > Regards,
> > Steve Twiss, Dialog Semiconductor
> >
> >
> >  drivers/mfd/da9062-core.c | 6 ------
> >  1 file changed, 6 deletions(-)
> 
> Applied, thanks.

$ git describe
v4.13-rc5

Looking at linux-mainline today, I noticed a commit that seems to be applied
twice. This patch I sent on 5th June seems to have been duplicated and applied for
a second time (to the same file), and this has resulted in an error.

$ git log --oneline --author="diasemi.com" -2

b77eb79 mfd: da9061: Fix to remove BBAT_CONT register from chip model
2cd6496 mfd: da9061: Fix to remove BBAT_CONT register from chip model

$ git log --pretty=format:"%h, %cn, %s" | grep b77eb79
b77eb79, Lee Jones, mfd: da9061: Fix to remove BBAT_CONT register from chip model

Could you revert the b77eb79 commit please?

The original patch only applies to the DA9061 chip model and by duplicating my original
submission and applying b77eb79, it has also made the same change to the DA9062 chip
model. This is incorrect. The DA9062 and DA90861 chip models are different.

Regards,
Steve

> 
> > diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c
> > index 7f5e8be..fe18115 100644
> > --- a/drivers/mfd/da9062-core.c
> > +++ b/drivers/mfd/da9062-core.c
> > @@ -429,9 +429,6 @@ static int da9062_get_device_type(struct da9062 *chip)
> >  		.range_min = DA9062AA_VLDO1_B,
> >  		.range_max = DA9062AA_VLDO4_B,
> >  	}, {
> > -		.range_min = DA9062AA_BBAT_CONT,
> > -		.range_max = DA9062AA_BBAT_CONT,
> > -	}, {
> >  		.range_min = DA9062AA_INTERFACE,
> >  		.range_max = DA9062AA_CONFIG_E,
> >  	}, {
> > @@ -514,9 +511,6 @@ static int da9062_get_device_type(struct da9062 *chip)
> >  		.range_min = DA9062AA_VLDO1_B,
> >  		.range_max = DA9062AA_VLDO4_B,
> >  	}, {
> > -		.range_min = DA9062AA_BBAT_CONT,
> > -		.range_max = DA9062AA_BBAT_CONT,
> > -	}, {
> >  		.range_min = DA9062AA_GP_ID_0,
> >  		.range_max = DA9062AA_GP_ID_19,
> >  	},
> 
> --
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org â Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog