diff options
| author | John Stultz <john.stultz@linaro.org> | 2014-06-11 15:11:53 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2014-06-11 15:11:53 -0700 |
| commit | 3bc0578e2680de1970e8ea491db6cfeb473e96c3 (patch) | |
| tree | 7a80317196a5876a57f4a26c55eff908697a522e /arch/arm/mach-at91/at91sam9260_devices.c | |
| parent | cd9f5bed776f2ed378b13df34c17c8c227c30fcd (diff) | |
| parent | 1860e379875dfe7271c649058aeddffe5afd9d0d (diff) | |
Merge tag 'v3.15' into linaro-android-3.15-experimentaltracking-linaro-android-3.15-llct-20140612.0
Linux 3.15
Diffstat (limited to 'arch/arm/mach-at91/at91sam9260_devices.c')
| -rw-r--r-- | arch/arm/mach-at91/at91sam9260_devices.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c index a0282928e9c1..7cd6f19945ed 100644 --- a/arch/arm/mach-at91/at91sam9260_devices.c +++ b/arch/arm/mach-at91/at91sam9260_devices.c @@ -1308,19 +1308,19 @@ static struct platform_device at91_adc_device = { static struct at91_adc_trigger at91_adc_triggers[] = { [0] = { .name = "timer-counter-0", - .value = AT91_ADC_TRGSEL_TC0 | AT91_ADC_TRGEN, + .value = 0x1, }, [1] = { .name = "timer-counter-1", - .value = AT91_ADC_TRGSEL_TC1 | AT91_ADC_TRGEN, + .value = 0x3, }, [2] = { .name = "timer-counter-2", - .value = AT91_ADC_TRGSEL_TC2 | AT91_ADC_TRGEN, + .value = 0x5, }, [3] = { .name = "external", - .value = AT91_ADC_TRGSEL_EXTERNAL | AT91_ADC_TRGEN, + .value = 0xd, .is_external = true, }, }; |