Commit c31cc1b7 authored Aug 06, 2012 by Igor Grinberg Committed by Kevin Hilman Aug 06, 2012

Revert "ARM: OMAP3530evm: set pendown_state and debounce time for ads7846"



1) The above commit introduced a common ->get_pendown_state() function
into the generic code, but that function was board-specific for the
OMAP3EVM and thus broke most other boards using this code.

2) The above commit was mis-merged introducing another bug which
prevents the ads7846 driver probe function to succeed.
The omap_ads7846_init() function frees the pendown GPIO in case there is
no ->get_pendown_state() function set by the caller (board specific
code), so it can be requested later by the ads7846 driver.
The above commit add a common ->get_pendown_state() function without
removing the gpio_free() call and thus once the ads7846 driver tries
to use the pendown GPIO, it crashes as the pendown GPIO has not been
requested.

3) The above commit introduces NO new functionality as
get_pendown_state() function is already implemented in a suitable way by
the ads7846 driver and the debounce time handling has already been
fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).

This reverts commit 16aced80.

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

Solved by taking the working version prior to the above commit.

Cc: Zumeng Chen <zumeng.chen@windriver.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Igor Grinberg <grinberg@compulab.co.il>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

parent 0d7614f0

arch/arm/mach-omap2/board-omap3evm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@
		#include "hsmmc.h"
		#include "common-board-devices.h"

		#define OMAP3_EVM_TS_GPIO 175
		#define OMAP3_EVM_EHCI_VBUS 22
		#define OMAP3_EVM_EHCI_SELECT 61

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

+0 −11

Original line number	Diff line number	Diff line
		@@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config = {
		.turbo_mode = 0,
		};

		/*
		* ADS7846 driver maybe request a gpio according to the value
		* of pdata->get_pendown_state, but we have done this. So set
		* get_pendown_state to avoid twice gpio requesting.
		*/
		static int omap3_get_pendown_state(void)
		{
		return !gpio_get_value(OMAP3_EVM_TS_GPIO);
		}

		static struct ads7846_platform_data ads7846_config = {
		.x_max = 0x0fff,
		.y_max = 0x0fff,
		@@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = {
		.debounce_rep = 1,
		.gpio_pendown = -EINVAL,
		.keep_vref_on = 1,
		.get_pendown_state = &omap3_get_pendown_state,
		};

		static struct spi_board_info ads7846_spi_board_info __initdata = {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@
		#include "twl-common.h"

		#define NAND_BLOCK_SIZE SZ_128K
		#define OMAP3_EVM_TS_GPIO 175

		struct mtd_partition;
		struct ads7846_platform_data;