Merge branch 'for_3.6/fixes/ads7846-2' of... (8aeff82f) · Commits · e / devices / android_kernel_fairphone_FP4

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

+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 = {

+0 −1