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

Commit 6fd9c421 authored by Tarun Kanti DebBarma's avatar Tarun Kanti DebBarma
Browse files

gpio/omap: fix incorrect access of debounce module 



Enable debounce clock before writing/reading debounce registers.
Disable the clock at the end so that it is synchronized with the
pm_runtime_get/put_sync calls.

Enable debounce clock per module. This call is mandatory because
in omap_gpio_request() when *_runtime_get_sync() is called,
_gpio_dbck_enable() within runtime callbck fails to turn on dbck
 because dbck_enable_mask used within _gpio_dbck_enable() is still
not initialized at that point. Therefore we have to enable dbck here.

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 72f83af9

drivers/gpio/gpio-omap.c

+13 −5
Original line number Diff line number Diff line
@@ -203,22 +203,30 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio, 


	l = GPIO_BIT(bank, gpio);



	clk_enable(bank->dbck);

	reg = bank->base + bank->regs->debounce;

	__raw_writel(debounce, reg);



	reg = bank->base + bank->regs->debounce_en;

	val = __raw_readl(reg);



	if (debounce) {

	if (debounce)

		val |= l;

		clk_enable(bank->dbck);

	} else {

	else

		val &= ~l;

		clk_disable(bank->dbck);

	}

	bank->dbck_enable_mask = val;



	__raw_writel(val, reg);

	clk_disable(bank->dbck);

	/*

	 * Enable debounce clock per module.

	 * This call is mandatory because in omap_gpio_request() when

	 * *_runtime_get_sync() is called,  _gpio_dbck_enable() within

	 * runtime callbck fails to turn on dbck because dbck_enable_mask

	 * used within _gpio_dbck_enable() is still not initialized at

	 * that point. Therefore we have to enable dbck here.

	 */

	_gpio_dbck_enable(bank);

}



static inline void set_gpio_trigger(struct gpio_bank *bank, int gpio,