On Wed, Oct 30, 2019 at 05:04:21PM +0100, Linus Walleij wrote: > On Wed, Oct 30, 2019 at 5:01 PM Hans de Goede <hdegoede@xxxxxxxxxx> wrote: > > > For 5.4 we should probably revert > > "gpio: merrifield: Pass irqchip when adding gpiochip" > > and the fixes added on top of it, since AFAICT _AEI handling > > will be broken on merrifield after this change too. > > > > So I suggest that we revert the following commits (in revert order): > > > > 4c87540940cbc7ddbe9674087919c605fd5c2ef1 "gpio: merrifield: Move hardware initialization to callback" > > 6658f87f219427ee776c498e07c878eb5cad1be2 "gpio: merrifield: Restore use of irq_base" > > 8f86a5b4ad679e4836733b47414226074eee4e4d "gpio: merrifield: Pass irqchip when adding gpiochip" > > > > That seems like the safest thing to do at this point in the cycle. > > OK are the Intel people OK with this? I'm fine but I'll leave this to Andy since that's his stuff. > If so I'll go and revert them. > > Mika: will any of the pin control fixes you sent collide with > this? (I guess not...) No they should not, they don't touch the merrifield driver.