diff options
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260_devices.c')
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index 7cd6f19945ed..adcfb88a5d7d 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
@@ -24,12 +24,11 @@ | |||
24 | #include <mach/at91sam9260_matrix.h> | 24 | #include <mach/at91sam9260_matrix.h> |
25 | #include <mach/at91_matrix.h> | 25 | #include <mach/at91_matrix.h> |
26 | #include <mach/at91sam9_smc.h> | 26 | #include <mach/at91sam9_smc.h> |
27 | #include <mach/at91_adc.h> | ||
28 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
29 | 28 | ||
30 | #include "board.h" | 29 | #include "board.h" |
31 | #include "generic.h" | 30 | #include "generic.h" |
32 | 31 | #include "gpio.h" | |
33 | 32 | ||
34 | /* -------------------------------------------------------------------- | 33 | /* -------------------------------------------------------------------- |
35 | * USB Host | 34 | * USB Host |
@@ -1325,13 +1324,6 @@ static struct at91_adc_trigger at91_adc_triggers[] = { | |||
1325 | }, | 1324 | }, |
1326 | }; | 1325 | }; |
1327 | 1326 | ||
1328 | static struct at91_adc_reg_desc at91_adc_register_g20 = { | ||
1329 | .channel_base = AT91_ADC_CHR(0), | ||
1330 | .drdy_mask = AT91_ADC_DRDY, | ||
1331 | .status_register = AT91_ADC_SR, | ||
1332 | .trigger_register = AT91_ADC_MR, | ||
1333 | }; | ||
1334 | |||
1335 | void __init at91_add_device_adc(struct at91_adc_data *data) | 1327 | void __init at91_add_device_adc(struct at91_adc_data *data) |
1336 | { | 1328 | { |
1337 | if (!data) | 1329 | if (!data) |
@@ -1349,9 +1341,7 @@ void __init at91_add_device_adc(struct at91_adc_data *data) | |||
1349 | if (data->use_external_triggers) | 1341 | if (data->use_external_triggers) |
1350 | at91_set_A_periph(AT91_PIN_PA22, 0); | 1342 | at91_set_A_periph(AT91_PIN_PA22, 0); |
1351 | 1343 | ||
1352 | data->num_channels = 4; | ||
1353 | data->startup_time = 10; | 1344 | data->startup_time = 10; |
1354 | data->registers = &at91_adc_register_g20; | ||
1355 | data->trigger_number = 4; | 1345 | data->trigger_number = 4; |
1356 | data->trigger_list = at91_adc_triggers; | 1346 | data->trigger_list = at91_adc_triggers; |
1357 | 1347 | ||