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

Commit 985f37f8 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Dmitry Torokhov
Browse files

AT91: add touchscreen support for at91sam9g45ekes 



New at91sam9g45ekes board provides a LCD with resistive touchscreen.
This is the support of this feature by atmel_tsadcc driver. This also
sets up platform parameters to be passed to the driver.

Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 423c9b0d

arch/arm/mach-at91/at91sam9g45_devices.c

+51 −0
Original line number Diff line number Diff line
@@ -809,6 +809,57 @@ static void __init at91_add_device_rtc(void) {} 
#endif





/* --------------------------------------------------------------------

 *  Touchscreen

 * -------------------------------------------------------------------- */



#if defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) || defined(CONFIG_TOUCHSCREEN_ATMEL_TSADCC_MODULE)

static u64 tsadcc_dmamask = DMA_BIT_MASK(32);

static struct at91_tsadcc_data tsadcc_data;



static struct resource tsadcc_resources[] = {

	[0] = {

		.start	= AT91SAM9G45_BASE_TSC,

		.end	= AT91SAM9G45_BASE_TSC + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AT91SAM9G45_ID_TSC,

		.end	= AT91SAM9G45_ID_TSC,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device at91sam9g45_tsadcc_device = {

	.name		= "atmel_tsadcc",

	.id		= -1,

	.dev		= {

				.dma_mask		= &tsadcc_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &tsadcc_data,

	},

	.resource	= tsadcc_resources,

	.num_resources	= ARRAY_SIZE(tsadcc_resources),

};



void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data)

{

	if (!data)

		return;



	at91_set_gpio_input(AT91_PIN_PD20, 0);	/* AD0_XR */

	at91_set_gpio_input(AT91_PIN_PD21, 0);	/* AD1_XL */

	at91_set_gpio_input(AT91_PIN_PD22, 0);	/* AD2_YT */

	at91_set_gpio_input(AT91_PIN_PD23, 0);	/* AD3_TB */



	tsadcc_data = *data;

	platform_device_register(&at91sam9g45_tsadcc_device);

}

#else

void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}

#endif





/* --------------------------------------------------------------------

 *  RTT

 * -------------------------------------------------------------------- */

arch/arm/mach-at91/board-sam9m10g45ek.c

+12 −0
Original line number Diff line number Diff line
@@ -228,6 +228,16 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data; 
#endif





/*

 * Touchscreen

 */

static struct at91_tsadcc_data ek_tsadcc_data = {

	.adc_clock		= 300000,

	.pendet_debounce	= 0x0d,

	.ts_sample_hold_time	= 0x0a,

};





/*

 * GPIO Buttons

 */
@@ -378,6 +388,8 @@ static void __init ek_board_init(void) 
	at91_add_device_i2c(0, NULL, 0);

	/* LCD Controller */

	at91_add_device_lcdc(&ek_lcdc_data);

	/* Touch Screen */

	at91_add_device_tsadcc(&ek_tsadcc_data);

	/* Push Buttons */

	ek_add_device_buttons();

	/* AC97 */

drivers/input/touchscreen/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ config TOUCHSCREEN_TOUCHWIN 


config TOUCHSCREEN_ATMEL_TSADCC

	tristate "Atmel Touchscreen Interface"

	depends on ARCH_AT91SAM9RL

	depends on ARCH_AT91SAM9RL || ARCH_AT91SAM9G45

	help

	  Say Y here if you have a 4-wire touchscreen connected to the

          ADC Controller on your Atmel SoC (such as the AT91SAM9RL).