1 From 06a5d31199ba4b992bcd46651850f3b82284388f Mon Sep 17 00:00:00 2001
2 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
3 Date: Wed, 13 Jan 2016 17:54:36 +0100
4 Subject: [PATCH 261/366] clocksource: atmel: compile fixes
6 Reported-by: kernel test robot <ying.huang@linux.intel.com>
7 Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
9 drivers/clocksource/timer-atmel-pit.c | 4 ++--
10 drivers/clocksource/timer-atmel-st.c | 6 +++---
11 2 files changed, 5 insertions(+), 5 deletions(-)
13 diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
14 index 80d74c4..a7abdb6 100644
15 --- a/drivers/clocksource/timer-atmel-pit.c
16 +++ b/drivers/clocksource/timer-atmel-pit.c
17 @@ -96,10 +96,11 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
19 /* disable irq, leaving the clocksource active */
20 pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
21 - free_irq(atmel_pit_irq, data);
22 + free_irq(data->irq, data);
26 +static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id);
28 * Clockevent device: interrupts every 1/HZ (== pit_cycles * MCK/16)
30 @@ -189,7 +190,6 @@ static void __init at91sam926x_pit_common_init(struct pit_data *data)
32 unsigned long pit_rate;
37 * Use our actual MCK to figure out how many MCK/16 ticks per
38 diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
39 index ea37afc..103d0fd 100644
40 --- a/drivers/clocksource/timer-atmel-st.c
41 +++ b/drivers/clocksource/timer-atmel-st.c
42 @@ -150,7 +150,7 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
44 static int clkevt32k_set_periodic(struct clock_event_device *dev)
49 clkdev32k_disable_and_flush_irq();
51 @@ -229,8 +229,8 @@ static void __init atmel_st_timer_init(struct device_node *node)
52 regmap_read(regmap_st, AT91_ST_SR, &val);
54 /* Get the interrupts property */
55 - irq = irq_of_parse_and_map(node, 0);
57 + atmel_st_irq = irq_of_parse_and_map(node, 0);
59 panic(pr_fmt("Unable to get IRQ from DT\n"));
61 sclk = of_clk_get(node, 0);