lkml.org 
[lkml]   [2014]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 09/15] ARM: at91: sam9rlek add touchscreen support through at91_adc
    Date
    at91_adc now supports reading a touchscreen for ADCs without a TSMR register.
    Enable touchscreen support through at91_adc. This allows to use both a
    touchscreen and the remaining ADC channel at the same time.

    Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
    ---
    arch/arm/mach-at91/board-sam9rlek.c | 14 ++++++++++++++
    1 file changed, 14 insertions(+)

    diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
    index 604eecf6cd70..35d420247e25 100644
    --- a/arch/arm/mach-at91/board-sam9rlek.c
    +++ b/arch/arm/mach-at91/board-sam9rlek.c
    @@ -18,6 +18,7 @@
    #include <linux/clk.h>
    #include <linux/input.h>
    #include <linux/gpio_keys.h>
    +#include <linux/platform_data/at91_adc.h>

    #include <video/atmel_lcdc.h>

    @@ -239,6 +240,17 @@ static struct at91_tsadcc_data ek_tsadcc_data = {


    /*
    + * ADC + Touchscreen
    + */
    +static struct at91_adc_data ek_adc_data = {
    + .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5),
    + .use_external_triggers = true,
    + .vref = 3300,
    + .touchscreen_type = ATMEL_ADC_TOUCHSCREEN_4WIRE,
    +};
    +
    +
    +/*
    * GPIO Buttons
    */
    #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
    @@ -312,6 +324,8 @@ static void __init ek_board_init(void)
    at91_add_device_ac97(&ek_ac97_data);
    /* Touch Screen Controller */
    at91_add_device_tsadcc(&ek_tsadcc_data);
    + /* Touch Screen Controller + ADC */
    + at91_add_device_adc(&ek_adc_data);
    /* LEDs */
    at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
    /* Push Buttons */
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-03-17 15:41    [W:4.140 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site