From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: linux-iio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Patrice Vilchez <patrice.vilchez@atmel.com>,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Nicolas Ferre <nicolas.ferre@atmel.com>
Subject: Re: [PATCH 4/5] IIO: AT91: ADC: Add support for the AT91SAM9M10G45-EK board
Date: Sat, 7 Apr 2012 05:31:24 +0200 [thread overview]
Message-ID: <20120407033124.GF16641@game.jcrosoft.org> (raw)
In-Reply-To: <1333641684-20325-5-git-send-email-maxime.ripard@free-electrons.com>
> diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
> index e1bea73..dca46c8 100644
> --- a/arch/arm/mach-at91/board-sam9m10g45ek.c
> +++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
> @@ -27,6 +27,8 @@
> #include <linux/atmel-mci.h>
> #include <linux/delay.h>
>
> +#include <linux/platform_data/at91_adc.h>
> +
> #include <mach/hardware.h>
> #include <video/atmel_lcdc.h>
> #include <media/soc_camera.h>
> @@ -314,6 +316,13 @@ static struct at91_tsadcc_data ek_tsadcc_data = {
> .ts_sample_hold_time = 0x0a,
> };
>
> +/*
> + * ADCs
> + */
> +static struct at91_adc_data ek_adc_data = {
> + .channels_used = BIT(0) | BIT(1) | BIT(2) | BIT(3) | BIT(4) | BIT(5) | BIT(6) | BIT(7),
> + .vref = 3300,
> +};
>
> /*
> * GPIO Buttons
> @@ -479,6 +488,8 @@ static void __init ek_board_init(void)
> at91_add_device_lcdc(&ek_lcdc_data);
> /* Touch Screen */
> at91_add_device_tsadcc(&ek_tsadcc_data);
> + /* ADC */
> + at91_add_device_adc(&ek_adc_data);
> /* Push Buttons */
> ek_add_device_buttons();
> /* AC97 */
> diff --git a/drivers/staging/iio/adc/at91_adc.c b/drivers/staging/iio/adc/at91_adc.c
> index c76516a..04bac43 100644
> --- a/drivers/staging/iio/adc/at91_adc.c
> +++ b/drivers/staging/iio/adc/at91_adc.c
> @@ -56,6 +56,13 @@ struct at91_adc_state {
> wait_queue_head_t wq_data_avail;
> };
>
> +static struct at91_adc_desc at91_adc_desc_sam9g45 = {
> + .clock = 13200000,
> + .clock_name = "tsc_clk",
> + .num_channels = 8,
> + .startup_time = 40,
> +};
> +
> static struct at91_adc_desc at91_adc_desc_sam9g20 = {
> .clock = 5000000,
> .clock_name = "adc_clk",
> @@ -70,6 +77,11 @@ static int at91_adc_select_soc(struct at91_adc_state *st)
> return 0;
> }
>
> + if (cpu_is_at91sam9g45()) {
> + st->desc = &at91_adc_desc_sam9g45;
> + return 0;
> + }
> +
> return -ENODEV;
> }
>
soc specific
Best Regards,
J.
next prev parent reply other threads:[~2012-04-07 4:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-05 16:01 [PATCH] Add ADC driver for G20 and G45 evaluation boards Maxime Ripard
2012-04-05 16:01 ` [PATCH 1/5] ARM: AT91: Add platform data for the AT91 ADCs Maxime Ripard
2012-04-13 8:00 ` Jonathan Cameron
2012-04-05 16:01 ` [PATCH 2/5] ARM: AT91: IIO: Add AT91 ADC driver Maxime Ripard
2012-04-07 3:27 ` Jean-Christophe PLAGNIOL-VILLARD
2012-04-09 15:39 ` Maxime Ripard
2012-04-05 16:01 ` [PATCH 3/5] ARM: AT91: Add the ADC to the sam9g20ek board Maxime Ripard
2012-04-07 3:29 ` Jean-Christophe PLAGNIOL-VILLARD
2012-04-09 15:40 ` Maxime Ripard
2012-04-05 16:01 ` [PATCH 4/5] IIO: AT91: ADC: Add support for the AT91SAM9M10G45-EK board Maxime Ripard
2012-04-07 3:31 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
2012-04-05 16:01 ` [PATCH 5/5] IIO: AT91: Add support for hardware triggers for the ADC Maxime Ripard
2012-04-07 3:34 ` Jean-Christophe PLAGNIOL-VILLARD
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=20120407033124.GF16641@game.jcrosoft.org \
--to=plagnioj@jcrosoft.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=nicolas.ferre@atmel.com \
--cc=patrice.vilchez@atmel.com \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).