Commit 06dce84e authored by Tony Lindgren's avatar Tony Lindgren Committed by Bartosz Golaszewski
Browse files

gpio: gpio-omap: always scan for triggered non-wakeup capable interrupts 



The bank->workaround_enabled should be for omap24xx erratum 1.101 but is not
needed any longer as erratum 1.101 handling only needs to happen based on
!bank->loses_context with patch "gpio: omap: Limit errata 1.101 handling to
wkup domain gpios only".

Further Grygorii Strashko <grygorii.strashko@ti.com> points out that we are
now tagging all edge GPIOs as non-wakeup GPIOs and rely on original erratum
1.101 handling for scacnning for edge interrupts that have triggered during
idle.

Also the TI Android kernel tree has an earlier commit "GPIO: OMAP: Always
scan gpios during runtime resume" by Tero Kristo <t-kristo@ti.com> saying:

 "This allows the driver to generate interrupts for GPIOs that can't
  wakeup but have changed state during runtime suspend. We cannot
  depend on the decision based on no need to restore, as the system
  state might change and pending events could gather up."

So let's remove bank->workaround_enabled and always scan for triggered edge
interrupts on resume. We do that based on bank->enabled_non_wakeup_gpios.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Tero Kristo <t-kristo@ti.com>
Reported-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 21e2118f

drivers/gpio/gpio-omap.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ struct gpio_bank { 
	int stride;

	int stride;

	u32 width;

	u32 width;

	int context_loss_count;

	int context_loss_count;

	bool workaround_enabled;

	u32 quirks;

	u32 quirks;





	void (*set_dataout)(struct gpio_bank *bank, unsigned gpio, int enable);

	void (*set_dataout)(struct gpio_bank *bank, unsigned gpio, int enable);
@@ -1469,8 +1468,6 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context) 
		omap_gpio_rmw(base, bank->regs->risingdetect, nowake, ~nowake);

		omap_gpio_rmw(base, bank->regs->risingdetect, nowake, ~nowake);

	}

	}





	bank->workaround_enabled = true;



update_gpio_context_count:

update_gpio_context_count:

	if (bank->get_context_loss_count)

	if (bank->get_context_loss_count)

		bank->context_loss_count =

		bank->context_loss_count =
@@ -1524,9 +1521,6 @@ static void omap_gpio_unidle(struct gpio_bank *bank) 
			       bank->base + bank->regs->risingdetect);

			       bank->base + bank->regs->risingdetect);

	}

	}





	if (!bank->workaround_enabled)

		return;



	l = readl_relaxed(bank->base + bank->regs->datain);

	l = readl_relaxed(bank->base + bank->regs->datain);





	/*

	/*
@@ -1576,8 +1570,6 @@ static void omap_gpio_unidle(struct gpio_bank *bank) 
		writel_relaxed(old0, bank->base + bank->regs->leveldetect0);

		writel_relaxed(old0, bank->base + bank->regs->leveldetect0);

		writel_relaxed(old1, bank->base + bank->regs->leveldetect1);

		writel_relaxed(old1, bank->base + bank->regs->leveldetect1);

	}

	}



	bank->workaround_enabled = false;

}

}





static void omap_gpio_init_context(struct gpio_bank *p)

static void omap_gpio_init_context(struct gpio_bank *p)

CRA Git | Maintained and supported by SUSTech CRA and CCSE