Commit 756abc8d authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes

Second 3.15 fixes for AT91
- two fixes concerning iio ADC triggers for at91sam9260 and at91sam9g20
  one for the "device" file, the other for the DT.

* tag 'at91-fixes2' of git://github.com/at91linux/linux-at91:
  ARM: at91: sam9260: fix compilation issues
  ARM: at91/dt: sam9260: correct external trigger value
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 85aea469 13984e9b
...@@ -641,7 +641,7 @@ trigger@2 { ...@@ -641,7 +641,7 @@ trigger@2 {
trigger@3 { trigger@3 {
reg = <3>; reg = <3>;
trigger-name = "external"; trigger-name = "external";
trigger-value = <0x13>; trigger-value = <0xd>;
trigger-external; trigger-external;
}; };
}; };
......
...@@ -1308,19 +1308,19 @@ static struct platform_device at91_adc_device = { ...@@ -1308,19 +1308,19 @@ static struct platform_device at91_adc_device = {
static struct at91_adc_trigger at91_adc_triggers[] = { static struct at91_adc_trigger at91_adc_triggers[] = {
[0] = { [0] = {
.name = "timer-counter-0", .name = "timer-counter-0",
.value = AT91_ADC_TRGSEL_TC0 | AT91_ADC_TRGEN, .value = 0x1,
}, },
[1] = { [1] = {
.name = "timer-counter-1", .name = "timer-counter-1",
.value = AT91_ADC_TRGSEL_TC1 | AT91_ADC_TRGEN, .value = 0x3,
}, },
[2] = { [2] = {
.name = "timer-counter-2", .name = "timer-counter-2",
.value = AT91_ADC_TRGSEL_TC2 | AT91_ADC_TRGEN, .value = 0x5,
}, },
[3] = { [3] = {
.name = "external", .name = "external",
.value = AT91_ADC_TRGSEL_EXTERNAL | AT91_ADC_TRGEN, .value = 0xd,
.is_external = true, .is_external = true,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment