Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/boot/dts/at91sam9260.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -641,7 +641,7 @@ 
				trigger@3 {

					reg = <3>;

					trigger-name = "external";

					trigger-value = <0x13>;

					trigger-value = <0xd>;

					trigger-external;

				};

			};

arch/arm/mach-at91/at91sam9260_devices.c

+4 −4
Original line number Diff line number Diff line
@@ -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,

	},

};