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

2019-03-05 Thread Stephen Rothwell
Hi all, On Mon, 18 Feb 2019 12:56:27 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the regulator tree got a conflict in: > > arch/arm/mach-pxa/raumfeld.c > > between commit: > > 0f884f8a090e ("ARM: pxa: remove raumfeld board files and defconfig") > > from the arm-soc tree

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

2019-02-17 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the regulator tree got a conflict in: arch/arm/mach-pxa/raumfeld.c between commit: 0f884f8a090e ("ARM: pxa: remove raumfeld board files and defconfig") from the arm-soc tree and commit: 01dc79cd6fe7 ("regulator: fixed/gpio: Pull inversion/OD into gpio

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

2018-06-11 Thread Linus Walleij
On Mon, Jun 4, 2018 at 12:46 PM, Mark Brown wrote: > On Fri, Jun 01, 2018 at 12:49:53AM +0200, Janusz Krzysztofik wrote: > >> 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

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

2018-06-04 Thread Mark Brown
On Fri, Jun 01, 2018 at 12:49:53AM +0200, Janusz Krzysztofik wrote: > 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 desc

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

2018-06-01 Thread Janusz Krzysztofik
On Wednesday, May 30, 2018 9:29:24 AM CEST Linus Walleij wrote: > On Wed, May 30, 2018 at 7:07 AM, Stephen Rothwell wrote: > > 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

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

2018-05-30 Thread Janusz Krzysztofik
On Wednesday, May 30, 2018 7:07:11 AM CEST Stephen Rothwell wrote: > 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 a

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

2018-05-30 Thread Linus Walleij
On Wed, May 30, 2018 at 7:07 AM, Stephen Rothwell wrote: > 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 a

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

2018-05-29 Thread Stephen Rothwell
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 descripto