aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-04-15 06:27:56 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2014-05-07 12:28:39 -0400
commit616a28eda7fe5e41ff71f2aad115fb9d36f62457 (patch)
tree3114f6af05728e95ea5af764563956efcfdabb88 /arch/arm/mach-at91
parent6730fefd8ec75be7f9ac6100767792ab75b6e0de (diff)
ARM: at91: sam9g45: 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>
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/at91sam9g45_devices.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index 7f02a5366a31..eb06348de330 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -25,7 +25,6 @@
25#include <linux/fb.h> 25#include <linux/fb.h>
26#include <video/atmel_lcdc.h> 26#include <video/atmel_lcdc.h>
27 27
28#include <mach/at91_adc.h>
29#include <mach/at91sam9g45.h> 28#include <mach/at91sam9g45.h>
30#include <mach/at91sam9g45_matrix.h> 29#include <mach/at91sam9g45_matrix.h>
31#include <mach/at91_matrix.h> 30#include <mach/at91_matrix.h>
@@ -1237,13 +1236,6 @@ static struct at91_adc_trigger at91_adc_triggers[] = {
1237 }, 1236 },
1238}; 1237};
1239 1238
1240static struct at91_adc_reg_desc at91_adc_register_g45 = {
1241 .channel_base = AT91_ADC_CHR(0),
1242 .drdy_mask = AT91_ADC_DRDY,
1243 .status_register = AT91_ADC_SR,
1244 .trigger_register = 0x08,
1245};
1246
1247void __init at91_add_device_adc(struct at91_adc_data *data) 1239void __init at91_add_device_adc(struct at91_adc_data *data)
1248{ 1240{
1249 if (!data) 1241 if (!data)
@@ -1269,9 +1261,7 @@ void __init at91_add_device_adc(struct at91_adc_data *data)
1269 if (data->use_external_triggers) 1261 if (data->use_external_triggers)
1270 at91_set_A_periph(AT91_PIN_PD28, 0); 1262 at91_set_A_periph(AT91_PIN_PD28, 0);
1271 1263
1272 data->num_channels = 8;
1273 data->startup_time = 40; 1264 data->startup_time = 40;
1274 data->registers = &at91_adc_register_g45;
1275 data->trigger_number = 4; 1265 data->trigger_number = 4;
1276 data->trigger_list = at91_adc_triggers; 1266 data->trigger_list = at91_adc_triggers;
1277 1267