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

Commit 0a0d6285 authored by Igor Grinberg's avatar Igor Grinberg Committed by Dmitry Torokhov
Browse files

ARM - OMAP: ads7846: fix pendown debounce setting 



Commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code) have enabled the
pendown GPIO debounce time setting by the below sequence:

  gpio_request_one()
  gpio_set_debounce()
  gpio_free()

It also revealed a bug in the OMAP GPIO handling code which prevented
the GPIO debounce clock to be disabled and CORE transition to low power
states.

Commit c9c55d92 (gpio/omap: fix off-mode bug: clear debounce settings on
free/reset) fixes the OMAP GPIO handling code by making sure that the
GPIO debounce clock gets disabled if no GPIO is requested from current
bank.

While fixing the OMAP GPIO handling code (in the right way), the above
commit makes the gpio_request->set_debounce->free sequence invalid as
after freeing the GPIO, the debounce settings are lost.

Fix the debounce settings by moving the debounce initialization to the
actual GPIO requesting code - the ads7846 driver.

Signed-off-by: default avatarIgor Grinberg <grinberg@compulab.co.il>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c4f49254

arch/arm/mach-omap2/common-board-devices.c

+20 −14
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, 
	struct spi_board_info *spi_bi = &ads7846_spi_board_info;

	int err;



	/*

	 * If a board defines get_pendown_state() function, request the pendown

	 * GPIO and set the GPIO debounce time.

	 * If a board does not define the get_pendown_state() function, then

	 * the ads7846 driver will setup the pendown GPIO itself.

	 */

	if (board_pdata && board_pdata->get_pendown_state) {

		err = gpio_request_one(gpio_pendown, GPIOF_IN, "TSPenDown");

		if (err) {

			pr_err("Couldn't obtain gpio for TSPenDown: %d\n", err);
@@ -73,21 +80,20 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce, 
		if (gpio_debounce)

			gpio_set_debounce(gpio_pendown, gpio_debounce);



		gpio_export(gpio_pendown, 0);

	}



	spi_bi->bus_num	= bus_num;

	spi_bi->irq	= gpio_to_irq(gpio_pendown);



	ads7846_config.gpio_pendown = gpio_pendown;



	if (board_pdata) {

		board_pdata->gpio_pendown = gpio_pendown;

		board_pdata->gpio_pendown_debounce = gpio_debounce;

		spi_bi->platform_data = board_pdata;

		if (board_pdata->get_pendown_state)

			gpio_export(gpio_pendown, 0);

	} else {

		ads7846_config.gpio_pendown = gpio_pendown;

	}



	if (!board_pdata || (board_pdata && !board_pdata->get_pendown_state))

		gpio_free(gpio_pendown);



	spi_register_board_info(&ads7846_spi_board_info, 1);

}

#else