From: maxime.ripard@free-electrons•com (Maxime Ripard)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board
Date: Mon, 14 Nov 2011 16:17:35 +0100 [thread overview]
Message-ID: <4EC1310F.7010901@free-electrons.com> (raw)
In-Reply-To: <4EC0FB7C.6000800@atmel.com>
Hi Nicolas,
On 14/11/2011 12:29, Nicolas Ferre wrote:
> On 11/14/2011 11:06 AM, Maxime Ripard :
>> Cc: Nicolas Ferre <nicolas.ferre@atmel•com>
>> Cc: Patrice Vilchez <patrice.vilchez@atmel•com>
>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons•com>
>>
>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons•com>
>
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel•com>
>
> (even if I have a tiny comment: see below)
>
>> ---
>> arch/arm/mach-at91/at91sam9260_devices.c | 52 ++++++++++++++++++++++++++++++
>> arch/arm/mach-at91/board-sam9g20ek.c | 11 ++++++
>> 2 files changed, 63 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
>> index 39f81f4..0859553 100644
>> --- a/arch/arm/mach-at91/at91sam9260_devices.c
>> +++ b/arch/arm/mach-at91/at91sam9260_devices.c
>> @@ -1312,6 +1312,58 @@ void __init at91_add_device_cf(struct at91_cf_data *data)
>> void __init at91_add_device_cf(struct at91_cf_data * data) {}
>> #endif
>>
>> +/* --------------------------------------------------------------------
>> + * ADCs
>> + * -------------------------------------------------------------------- */
>
> What about adding all this only if the IIO_AT91ADC is selected?
> Otherwise, you configure pins without actually using them...
I'm not sure on what I should do here. Should I only wrap the pin
configuration part in the at91_add_device_adc function in an ifdef, or
wrap all there is in this patch (that is structure definitions,
at91_add_device_adc declaration and call, etc) by the ifdef ?
>
>> +
>> +static struct at91_adc_data adc_data;
>> +
>> +static struct resource adc_resources[] = {
>> + [0] = {
>> + .start = AT91SAM9260_BASE_ADC,
>> + .end = AT91SAM9260_BASE_ADC + SZ_16K - 1,
>> + .flags = IORESOURCE_MEM,
>> + },
>> + [1] = {
>> + .start = AT91SAM9260_ID_ADC,
>> + .end = AT91SAM9260_ID_ADC,
>> + .flags = IORESOURCE_IRQ,
>> + },
>> +};
>> +
>> +static struct platform_device at91_adc_device = {
>> + .name = "at91adc",
>> + .id = -1,
>> + .dev = {
>> + .platform_data = &adc_data,
>> + },
>> + .resource = adc_resources,
>> + .num_resources = ARRAY_SIZE(adc_resources),
>> +};
>> +
>> +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_PC0, 0);
>> + if (test_bit(1, &(data->channels_used)))
>> + at91_set_A_periph(AT91_PIN_PC1, 0);
>> + if (test_bit(2, &(data->channels_used)))
>> + at91_set_A_periph(AT91_PIN_PC2, 0);
>> + if (test_bit(3, &(data->channels_used)))
>> + at91_set_A_periph(AT91_PIN_PC3, 0);
>> +
>> + data->adc_clock = 5000000;
>> + data->num_channels = 4;
>> + data->startup_time = 10;
>> +
>> + adc_data = *data;
>> + platform_device_register(&at91_adc_device);
>> +}
>> +
>> +
>> /* -------------------------------------------------------------------- */
>> /*
>> * These devices are always present and don't need any board-specific
>> diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
>> index 817f59d..e34d41a 100644
>> --- a/arch/arm/mach-at91/board-sam9g20ek.c
>> +++ b/arch/arm/mach-at91/board-sam9g20ek.c
>> @@ -314,6 +314,15 @@ static void __init ek_add_device_buttons(void)
>> static void __init ek_add_device_buttons(void) {}
>> #endif
>>
>> +/*
>> + * ADCs
>> + */
>> +
>> +static struct at91_adc_data ek_adc_data = {
>> + .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3),
>> + .vref = 3300,
>> +};
>> +
>> #if defined(CONFIG_REGULATOR_FIXED_VOLTAGE) || defined(CONFIG_REGULATOR_FIXED_VOLTAGE_MODULE)
>> static struct regulator_consumer_supply ek_audio_consumer_supplies[] = {
>> REGULATOR_SUPPLY("AVDD", "0-001b"),
>> @@ -389,6 +398,8 @@ static void __init ek_board_init(void)
>> ek_add_device_gpio_leds();
>> /* Push Buttons */
>> ek_add_device_buttons();
>> + /* ADCs */
>> + at91_add_device_adc(&ek_adc_data);
>> /* PCK0 provides MCLK to the WM8731 */
>> at91_set_B_periph(AT91_PIN_PC1, 0);
>> /* SSC (for WM8731) */
>
>
--
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2011-11-14 15:17 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-14 10:06 [PATCHv5] AT91: Add a driver for the ADC Maxime Ripard
2011-11-14 10:06 ` [PATCH 1/3] ARM: AT91: Add platform data for the ADCs Maxime Ripard
2011-11-14 11:29 ` Nicolas Ferre
2011-11-14 10:06 ` [PATCH 2/3] ARM: AT91: IIO: Add AT91 ADC driver Maxime Ripard
2011-11-14 11:30 ` Nicolas Ferre
2011-11-14 11:37 ` Marek Vasut
2011-11-14 14:23 ` Maxime Ripard
2011-11-14 10:06 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-14 11:29 ` Nicolas Ferre
2011-11-14 15:17 ` Maxime Ripard [this message]
2011-11-14 15:23 ` Nicolas Ferre
-- strict thread matches above, loose matches on Subject: below --
2012-01-16 21:36 [PATCH RESEND v13] AT91: Add a driver for the ADC Maxime Ripard
2012-01-16 21:36 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2012-01-18 10:28 ` Nicolas Ferre
2011-12-14 10:01 [PATCH v13] AT91: Add a driver for the ADC Maxime Ripard
2011-12-14 10:01 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-12-02 13:17 [PATCH v12] AT91: Add a driver for the ADC Maxime Ripard
2011-12-02 13:17 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-30 9:14 [PATCH v11] AT91: Add a driver for the ADC Maxime Ripard
2011-11-30 9:15 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-24 11:27 [PATCH v9] AT91: Add a driver for the ADC Maxime Ripard
2011-11-24 11:27 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-24 14:19 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-24 15:20 ` Fabio Estevam
2011-11-24 15:26 ` Maxime Ripard
2011-11-18 10:12 [PATCH v8] AT91: Add a driver for the ADC Maxime Ripard
2011-11-18 10:12 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-15 10:54 [PATCH v7] AT91: Add a driver for the ADC Maxime Ripard
2011-11-15 10:54 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-14 17:30 [PATCH v6] AT91: Add a driver for the ADC Maxime Ripard
2011-11-14 17:30 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-14 20:34 ` Jonathan Cameron
2011-11-15 10:27 ` Maxime Ripard
2011-10-19 16:18 [PATCH] AT91: Add a driver for the ADC Maxime Ripard
2011-10-19 16:18 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-10-20 6:28 ` Alexander Stein
2011-10-21 17:47 ` Maxime Ripard
2011-10-20 7:14 ` Thomas Petazzoni
2011-11-03 10:11 ` [PATCHv2] AT91: Add a driver for the ADC Maxime Ripard
2011-11-03 10:11 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-04 10:33 ` Jonathan Cameron
2011-11-04 11:25 ` Maxime Ripard
2011-11-04 15:52 ` Linus Walleij
2011-11-04 16:32 ` Jonathan Cameron
2011-11-07 16:08 ` [PATCHv3] AT91: Add a driver for the ADC Maxime Ripard
2011-11-07 16:08 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-09 10:19 ` [PATCHv4] AT91: Add a driver for the ADC Maxime Ripard
2011-11-09 10:19 ` [PATCH 3/3] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2011-11-10 17:37 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4EC1310F.7010901@free-electrons.com \
--to=maxime.ripard@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox