On 04/18/2012 02:33 PM, Maxime Ripard wrote: > This patch adds platform data for the AT91 ADC driver support for > the AT91SAM9G20-EK board. There is a question of whether config variables from staging can be used outside but hopefully that'll become a moot point soon anyway. This looks fine to me. > > Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx> Acked-by: Jonathan Cameron <jic23@xxxxxxxxxx> > > Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> > Cc: Patrice Vilchez <patrice.vilchez@xxxxxxxxx> > Cc: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxxxxxxxxx> > Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> > --- > arch/arm/mach-at91/at91sam9260_devices.c | 53 ++++++++++++++++++++++++++++++ > arch/arm/mach-at91/board-sam9g20ek.c | 13 +++++++ > drivers/staging/iio/adc/at91_adc.c | 1 - > 3 files changed, 66 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c > index 5652dde..758c629 100644 > --- a/arch/arm/mach-at91/at91sam9260_devices.c > +++ b/arch/arm/mach-at91/at91sam9260_devices.c > @@ -17,6 +17,8 @@ > #include <linux/platform_device.h> > #include <linux/i2c-gpio.h> > > +#include <linux/platform_data/at91_adc.h> > + > #include <mach/board.h> > #include <mach/cpu.h> > #include <mach/at91sam9260.h> > @@ -1369,6 +1371,57 @@ void __init at91_add_device_cf(struct at91_cf_data *data) > void __init at91_add_device_cf(struct at91_cf_data * data) {} > #endif > > +/* -------------------------------------------------------------------- > + * ADCs > + * -------------------------------------------------------------------- */ > + > +#if defined(CONFIG_AT91_ADC) || defined(CONFIG_AT91_ADC_MODULE) > +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 = "at91_adc", > + .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); > + > + adc_data = *data; > + platform_device_register(&at91_adc_device); > +} > +#else > +void __init at91_add_device_adc(struct at91_adc_data *data) {} > +#endif > + > /* -------------------------------------------------------------------- */ > /* > * 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 8923ec9..2ce4e26 100644 > --- a/arch/arm/mach-at91/board-sam9g20ek.c > +++ b/arch/arm/mach-at91/board-sam9g20ek.c > @@ -32,6 +32,8 @@ > #include <linux/regulator/fixed.h> > #include <linux/regulator/consumer.h> > > +#include <linux/platform_data/at91_adc.h> > + > #include <mach/hardware.h> > #include <asm/setup.h> > #include <asm/mach-types.h> > @@ -318,6 +320,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"), > @@ -393,6 +404,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) */ > diff --git a/drivers/staging/iio/adc/at91_adc.c b/drivers/staging/iio/adc/at91_adc.c > index 6d14277..9af036a 100644 > --- a/drivers/staging/iio/adc/at91_adc.c > +++ b/drivers/staging/iio/adc/at91_adc.c > @@ -56,7 +56,6 @@ struct at91_adc_state { > > static struct at91_adc_desc at91_adc_desc_sam9g20 = { > .clock = 5000000, > - .clock_name = "adc_clk", > .num_channels = 4, > .startup_time = 10, > }; -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html