Re: linux-next: manual merge of the regulator tree with the arm-soc tree

From: Janusz Krzysztofik
Date: Fri Jun 01 2018 - 11:37:36 EST

On Wednesday, May 30, 2018 9:29:24 AM CEST Linus Walleij wrote:
> On Wed, May 30, 2018 at 7:07 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> > Hi all,
> >
> > Today's linux-next merge of the regulator tree got a conflict in:
> > arch/arm/mach-omap1/board-ams-delta.c
> >
> > between commit:
> > 0486738928bf ("ARM: OMAP1: ams-delta: add GPIO lookup tables")
> >
> > from the arm-soc tree and commit:
> > 6059577cb28d ("regulator: fixed: Convert to use GPIO descriptor only")
> >
> > from the regulator tree.
> >
> > I fixed it up (see below - it may be better done) and can carry the fix
> > as necessary.
> OMG that patch on a patch makes my head spin.
> I think I just have to look at the eventual result in linux-next and see if
> it makes proper sense, and rely on Janusz to test the result and help
> to fix it up.


I confirm the fix by Stephen works for me, however, the conflicting patch by
Linus breaks things a bit.

Lookup tables added to board files use function name "enable" while the
regulator uses NULL. As a result, GPIO descriptor is not matched and not
assigned to the regulator which ends up running with no control over GPIO pin.

Either the regulator driver should use the function name "enable" or that name
should be removed from lookup tables.