diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-04-15 06:27:57 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-07 12:28:39 -0400 |
commit | acc8b8e10754edf2cfd81b8ce1fe8e1438ec3f00 (patch) | |
tree | 9a73fdbfe044ddf1392517d5d2fd1629e9ea229a | |
parent | 616a28eda7fe5e41ff71f2aad115fb9d36f62457 (diff) |
ARM: at91: sam9260: remove unused platform_data
num_channels and registers are not used anymore since they are defined inside
the at91_adc driver and assigned by matching the id_table.
Also, remove the mach/at91_adc.h include that is not necessary anymore.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
-rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index df5a7d83d37d..14a6e35801ff 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c | |||
@@ -24,7 +24,6 @@ | |||
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" |
@@ -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 | ||