* [PATCH] ARM: at91: sam9260: fix compilation issues
@ 2014-05-07 17:45 Alexandre Belloni
2014-05-12 14:59 ` Nicolas Ferre
0 siblings, 1 reply; 2+ messages in thread
From: Alexandre Belloni @ 2014-05-07 17:45 UTC (permalink / raw)
To: linux-arm-kernel
Use the hexadecimal values for the triggers to match what is done for the device
tree. This also fixes compilation issues as the defines have been moved
elsewhere.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons•com>
---
I believe that at some point, we may want to reintroduce defines for those
values but we should probably do that in a dt-bindings include and choose better
names as the meaning differ between SoCs.
arch/arm/mach-at91/at91sam9260_devices.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index fffcd09ac878..a8d0d9cb1bca 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -1307,19 +1307,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,
},
};
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: at91: sam9260: fix compilation issues
2014-05-07 17:45 [PATCH] ARM: at91: sam9260: fix compilation issues Alexandre Belloni
@ 2014-05-12 14:59 ` Nicolas Ferre
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Ferre @ 2014-05-12 14:59 UTC (permalink / raw)
To: linux-arm-kernel
On 07/05/2014 19:45, Alexandre Belloni :
> Use the hexadecimal values for the triggers to match what is done for the device
> tree. This also fixes compilation issues as the defines have been moved
> elsewhere.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons•com>
Ok, as anyway these files will disappear at some point...
Acked-by: Nicolas Ferre <nicolas.ferre@atmel•com>
Added to at91-3.16-cleanup2. Thanks,
> ---
> I believe that at some point, we may want to reintroduce defines for those
> values but we should probably do that in a dt-bindings include and choose better
> names as the meaning differ between SoCs.
>
> arch/arm/mach-at91/at91sam9260_devices.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
> index fffcd09ac878..a8d0d9cb1bca 100644
> --- a/arch/arm/mach-at91/at91sam9260_devices.c
> +++ b/arch/arm/mach-at91/at91sam9260_devices.c
> @@ -1307,19 +1307,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,
> },
> };
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-12 14:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-07 17:45 [PATCH] ARM: at91: sam9260: fix compilation issues Alexandre Belloni
2014-05-12 14:59 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox