On Fri, Mar 2, 2018 at 9:20 AM, Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote: > > On Thu, Mar 1, 2018 at 5:06 PM, Linus Walleij <linus.walleij@xxxxxxxxxx> wrote: >> On Mon, Feb 12, 2018 at 2:55 PM, Geert Uytterhoeven >> <geert+renesas@xxxxxxxxx> wrote: >> >>> Since commit ab82fa7da4dce5c7 ("gpio: rcar: Prevent module clock disable >>> when wake-up is enabled"), when a GPIO is used for wakeup, the GPIO >>> block's module clock (if exists) is manually kept running during system >>> suspend, to make sure the device stays active. >>> >>> However, this explicit clock handling is merely a workaround for a >>> failure to properly communicate wakeup information to the device core. >>> >>> Instead, set the device's power.wakeup_path field, to indicate this >>> device is part of the wakeup path. Depending on the PM Domain's >>> active_wakeup configuration, the genpd core code will keep the device >>> enabled (and the clock running) during system suspend when needed. >>> This allows for the removal of all explicit clock handling code from the >>> driver. >>> >>> Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> >>> --- >>> v3: >> >> Patch applied for v4.16 fixes. > > Are you aware this conflicts with commit 51750fb167a05468 ("gpio: gpio-rcar: > Support S2RAM") in gpio/for-next? No but I guess I will become aware. I have not yet mixed the fixes and devel branches for next. > You can find the resolution in > https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/tree/drivers/gpio/gpio-rcar.c?h=renesas-drivers-2018-02-28-v4.16-rc3 Thanks! Yours, Linus Walleij