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

Commit f7647e63 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 5260/1: [AT91] Touchscreen on AT91SAM9RL 



This patch adds initialization of the Touchscreen controller for the
AT91SAM9RL processor.

Signed-off-by: default avatarJustin Waters <justin.waters@timesys.com>
Signed-off-by: default avatarDan Liang <dan.liang@atmel.com>
Signed-off-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a7307bf2

arch/arm/configs/at91sam9rlek_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -496,6 +496,7 @@ CONFIG_INPUT_TOUCHSCREEN=y 
# CONFIG_TOUCHSCREEN_PENMOUNT is not set

# CONFIG_TOUCHSCREEN_PENMOUNT is not set

# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set

# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set

# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

# CONFIG_TOUCHSCREEN_TOUCHWIN is not set

CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y

# CONFIG_TOUCHSCREEN_UCB1400 is not set

# CONFIG_TOUCHSCREEN_UCB1400 is not set

# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set

# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set

# CONFIG_INPUT_MISC is not set

# CONFIG_INPUT_MISC is not set

arch/arm/mach-at91/at91sam9rl_devices.c

+45 −0
Original line number Original line Diff line number Diff line
@@ -526,6 +526,51 @@ static void __init at91_add_device_tc(void) { } 
#endif

#endif









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

 *  Touchscreen

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



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

static u64 tsadcc_dmamask = DMA_BIT_MASK(32);



static struct resource tsadcc_resources[] = {

	[0] = {

		.start	= AT91SAM9RL_BASE_TSC,

		.end	= AT91SAM9RL_BASE_TSC + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AT91SAM9RL_ID_TSC,

		.end	= AT91SAM9RL_ID_TSC,

		.flags	= IORESOURCE_IRQ,

	}

};



static struct platform_device at91sam9rl_tsadcc_device = {

	.name		= "atmel_tsadcc",

	.id		= -1,

	.dev		= {

				.dma_mask		= &tsadcc_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

	.resource	= tsadcc_resources,

	.num_resources	= ARRAY_SIZE(tsadcc_resources),

};



void __init at91_add_device_tsadcc(void)

{

	at91_set_A_periph(AT91_PIN_PA17, 0);	/* AD0_XR */

	at91_set_A_periph(AT91_PIN_PA18, 0);	/* AD1_XL */

	at91_set_A_periph(AT91_PIN_PA19, 0);	/* AD2_YT */

	at91_set_A_periph(AT91_PIN_PA20, 0);	/* AD3_TB */



	platform_device_register(&at91sam9rl_tsadcc_device);

}

#else

void __init at91_add_device_tsadcc(void) {}

#endif





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

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

 *  RTC

 *  RTC

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

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

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

+2 −0
Original line number Original line Diff line number Diff line
@@ -195,6 +195,8 @@ static void __init ek_board_init(void) 
	at91_add_device_mmc(0, &ek_mmc_data);

	at91_add_device_mmc(0, &ek_mmc_data);

	/* LCD Controller */

	/* LCD Controller */

	at91_add_device_lcdc(&ek_lcdc_data);

	at91_add_device_lcdc(&ek_lcdc_data);

	/* Touch Screen Controller */

	at91_add_device_tsadcc();

}

}





MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")

MACHINE_START(AT91SAM9RLEK, "Atmel AT91SAM9RL-EK")

arch/arm/mach-at91/include/mach/board.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,9 @@ extern void __init at91_add_device_ac97(struct atmel_ac97_data *data); 
 /* ISI */

 /* ISI */

extern void __init at91_add_device_isi(void);

extern void __init at91_add_device_isi(void);





 /* Touchscreen Controller */

extern void __init at91_add_device_tsadcc(void);



 /* LEDs */

 /* LEDs */

extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);

extern void __init at91_init_leds(u8 cpu_led, u8 timer_led);

extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);

extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);