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

Commit 0aed0435 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP: GPIO: ensure debounce clocks are disabled during idle/suspend 



If a GPIO bank has more than one GPIO with debounce enabled, the
debounce clock will not be fully disabled before going to
idle/suspend.

In the idle path, we just do a single clk_disable() of the bank's
debounce clock.  If there are multiple debounce-enabled GPIOs in the
bank, that clocks usage count will be > 1, so the clk_disable() will
not actually disable the clock.

So the fix is to clk_disable() for every debounce-enabled GPIO in the
bank (and an equivalent clk_enable() of course.)

Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent cbf27660

arch/arm/plat-omap/gpio.c

+4 −2
Original line number Diff line number Diff line
@@ -2085,8 +2085,9 @@ void omap2_gpio_prepare_for_idle(int power_state) 
	for (i = min; i < gpio_bank_count; i++) {

		struct gpio_bank *bank = &gpio_bank[i];

		u32 l1, l2;

		int j;



		if (bank->dbck_enable_mask)

		for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)

			clk_disable(bank->dbck);



		if (power_state > PWRDM_POWER_OFF)
@@ -2152,8 +2153,9 @@ void omap2_gpio_resume_after_idle(void) 
	for (i = min; i < gpio_bank_count; i++) {

		struct gpio_bank *bank = &gpio_bank[i];

		u32 l, gen, gen0, gen1;

		int j;



		if (bank->dbck_enable_mask)

		for (j = 0; j < hweight_long(bank->dbck_enable_mask); j++)

			clk_enable(bank->dbck);



		if (!workaround_enabled)