| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <532D838D.9050603@kernel.org>
Date: Sat, 22 Mar 2014 12:35:25 +0000
From: Jonathan Cameron <jic23@...nel.org>
To: Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
Nicolas Ferre <nicolas.ferre@...el.com>,
Dmitry Torokhov <dmitry.torokhov@...il.com>
CC: Jean-Christophe Plagniol-Villard <plagnioj@...osoft.com>,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-iio@...r.kernel.org, linux-input@...r.kernel.org,
Maxime Ripard <maxime.ripard@...e-electrons.com>,
Gregory Clement <gregory.clement@...e-electrons.com>
Subject: Re: [PATCH v2 08/15] ARM: at91: sam9rl: add at91_adc to support adc
and touchscreen
On 17/03/14 13:57, Alexandre Belloni wrote:
> The ADC clock needs to be defined to enable the at91_adc driver. It is defined
> to the same speed that is used for atmel_tsadcc.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@...e-electrons.com>
Looks good to me, but out of my area of expertise so I won't ack it.
> ---
> arch/arm/mach-at91/at91sam9rl.c | 7 +++
> arch/arm/mach-at91/at91sam9rl_devices.c | 85 +++++++++++++++++++++++++++++++++
> 2 files changed, 92 insertions(+)
>
> diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
> index 3651517abedf..753ba4893836 100644
> --- a/arch/arm/mach-at91/at91sam9rl.c
> +++ b/arch/arm/mach-at91/at91sam9rl.c
> @@ -151,6 +151,11 @@ static struct clk ac97_clk = {
> .pmc_mask = 1 << AT91SAM9RL_ID_AC97C,
> .type = CLK_TYPE_PERIPHERAL,
> };
> +static struct clk adc_op_clk = {
> + .name = "adc_op_clk",
> + .type = CLK_TYPE_PERIPHERAL,
> + .rate_hz = 1000000,
> +};
>
> static struct clk *periph_clocks[] __initdata = {
> &pioA_clk,
> @@ -176,6 +181,7 @@ static struct clk *periph_clocks[] __initdata = {
> &udphs_clk,
> &lcdc_clk,
> &ac97_clk,
> + &adc_op_clk,
> // irq0
> };
>
> @@ -196,6 +202,7 @@ static struct clk_lookup periph_clocks_lookups[] = {
> CLKDEV_CON_ID("pioB", &pioB_clk),
> CLKDEV_CON_ID("pioC", &pioC_clk),
> CLKDEV_CON_ID("pioD", &pioD_clk),
> + CLKDEV_CON_ID("adc_clk", &tsc_clk),
> };
>
> static struct clk_lookup usart_clocks_lookups[] = {
> diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
> index a698bdab2cce..b836dada942c 100644
> --- a/arch/arm/mach-at91/at91sam9rl_devices.c
> +++ b/arch/arm/mach-at91/at91sam9rl_devices.c
> @@ -22,6 +22,7 @@
> #include <mach/at91_matrix.h>
> #include <mach/at91sam9_smc.h>
> #include <linux/platform_data/dma-atmel.h>
> +#include <linux/platform_data/at91_adc.h>
>
> #include "board.h"
> #include "generic.h"
> @@ -656,6 +657,90 @@ void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data)
> void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data) {}
> #endif
>
> +/* --------------------------------------------------------------------
> + * ADC and Touchscreen
> + * -------------------------------------------------------------------- */
> +
> +#if IS_ENABLED(CONFIG_AT91_ADC)
> +static struct at91_adc_data adc_data;
> +
> +static struct resource adc_resources[] = {
> + [0] = {
> + .start = AT91SAM9RL_BASE_TSC,
> + .end = AT91SAM9RL_BASE_TSC + SZ_16K - 1,
> + .flags = IORESOURCE_MEM,
> + },
> + [1] = {
> + .start = NR_IRQS_LEGACY + AT91SAM9RL_ID_TSC,
> + .end = NR_IRQS_LEGACY + AT91SAM9RL_ID_TSC,
> + .flags = IORESOURCE_IRQ,
> + }
> +};
> +
> +static struct platform_device at91_adc_device = {
> + .name = "at91sam9rl-adc",
> + .id = -1,
> + .dev = {
> + .platform_data = &adc_data,
> + },
> + .resource = adc_resources,
> + .num_resources = ARRAY_SIZE(adc_resources),
> +};
> +
> +static struct at91_adc_trigger at91_adc_triggers[] = {
> + [0] = {
> + .name = "external-rising",
> + .value = 1,
> + .is_external = true,
> + },
> + [1] = {
> + .name = "external-falling",
> + .value = 2,
> + .is_external = true,
> + },
> + [2] = {
> + .name = "external-any",
> + .value = 3,
> + .is_external = true,
> + },
> + [3] = {
> + .name = "continuous",
> + .value = 6,
> + .is_external = false,
> + },
> +};
> +
> +void __init at91_add_device_adc(struct at91_adc_data *data)
> +{
> + if (!data)
> + return;
> +
> + if (test_bit(0, &data->channels_used))
> + at91_set_A_periph(AT91_PIN_PA17, 0);
> + if (test_bit(1, &data->channels_used))
> + at91_set_A_periph(AT91_PIN_PA18, 0);
> + if (test_bit(2, &data->channels_used))
> + at91_set_A_periph(AT91_PIN_PA19, 0);
> + if (test_bit(3, &data->channels_used))
> + at91_set_A_periph(AT91_PIN_PA20, 0);
> + if (test_bit(4, &data->channels_used))
> + at91_set_A_periph(AT91_PIN_PD6, 0);
> + if (test_bit(5, &data->channels_used))
> + at91_set_A_periph(AT91_PIN_PD7, 0);
> +
> + if (data->use_external_triggers)
> + at91_set_A_periph(AT91_PIN_PB15, 0);
> +
> + data->startup_time = 40;
> + data->trigger_number = 4;
> + data->trigger_list = at91_adc_triggers;
> +
> + adc_data = *data;
> + platform_device_register(&at91_adc_device);
> +}
> +#else
> +void __init at91_add_device_adc(struct at91_adc_data *data) {}
> +#endif
>
> /* --------------------------------------------------------------------
> * RTC
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists