Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 960edffe authored by Tarun Kanti DebBarma's avatar Tarun Kanti DebBarma
Browse files

gpio/omap: fix incorrect context restore logic in omap_gpio_runtime_* 



In omap_gpio_runtime_suspend/resume() the context save/restore should
be independent of bank->enabled_non_wakeup_gpios. This was preventing
context restore of GPIO lines which are not wakeup enabled.

Reported-by: default avatarGovindraj Raja <govindraj.raja@ti.com>
Signed-off-by: default avatarTarun Kanti DebBarma <tarun.kanti@ti.com>
Reviewed-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 2c836f7e

drivers/gpio/gpio-omap.c

+1 −4
Original line number Diff line number Diff line
@@ -1247,9 +1247,6 @@ static int omap_gpio_runtime_suspend(struct device *dev) 
	 * non-wakeup GPIOs.  Otherwise spurious IRQs will be

	 * generated.  See OMAP2420 Errata item 1.101.

	 */

	if (!(bank->enabled_non_wakeup_gpios))

		goto update_gpio_context_count;



	bank->saved_datain = __raw_readl(bank->base +

						bank->regs->datain);

	l1 = __raw_readl(bank->base + bank->regs->fallingdetect);
@@ -1298,7 +1295,7 @@ static int omap_gpio_runtime_resume(struct device *dev) 
	__raw_writel(bank->context.risingdetect,

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



	if (!bank->enabled_non_wakeup_gpios || !bank->workaround_enabled) {

	if (!bank->workaround_enabled) {

		spin_unlock_irqrestore(&bank->lock, flags);

		return 0;

	}