From mboxrd@z Thu Jan 1 00:00:00 1970 From: daniel.lezcano@linaro.org (Daniel Lezcano) Date: Fri, 13 Mar 2015 11:21:35 +0100 Subject: [PATCH v5 09/10] clocksource: atmel-st: remove mach/hardware dependency In-Reply-To: <1426162054-9987-10-git-send-email-alexandre.belloni@free-electrons.com> References: <1426162054-9987-1-git-send-email-alexandre.belloni@free-electrons.com> <1426162054-9987-10-git-send-email-alexandre.belloni@free-electrons.com> Message-ID: <5502BA2F.4040600@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 03/12/2015 01:07 PM, Alexandre Belloni wrote: > Remove the mach/hardware dependency to prepare the driver for multiplatform > support. > Also switch from setup_irq() to request_irq() > > Signed-off-by: Alexandre Belloni > --- > drivers/clocksource/timer-atmel-st.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c > index 674ef2519d6b..91d6cbb7a56b 100644 > --- a/drivers/clocksource/timer-atmel-st.c > +++ b/drivers/clocksource/timer-atmel-st.c > @@ -31,13 +31,12 @@ > > #include Couldn't the header above be removed ? Other than that: Acked-by: Daniel Lezcano > -#include > - > static unsigned long last_crtr; > static u32 irqmask; > static struct clock_event_device clkevt; > static struct regmap *regmap_st; > > +#define AT91_SLOW_CLOCK 32768 > #define RM9200_TIMER_LATCH ((AT91_SLOW_CLOCK + HZ/2) / HZ) > > /* > @@ -96,13 +95,6 @@ static irqreturn_t at91rm9200_timer_interrupt(int irq, void *dev_id) > return IRQ_NONE; > } > > -static struct irqaction at91rm9200_timer_irq = { > - .name = "at91_tick", > - .flags = IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL, > - .handler = at91rm9200_timer_interrupt, > - .irq = NR_IRQS_LEGACY + AT91_ID_SYS, > -}; > - > static cycle_t read_clk32k(struct clocksource *cs) > { > return read_CRTR(); > @@ -193,6 +185,7 @@ static struct clock_event_device clkevt = { > static void __init atmel_st_timer_init(struct device_node *node) > { > unsigned int val; > + int irq, ret; > > regmap_st = syscon_node_to_regmap(node); > if (IS_ERR(regmap_st)) > @@ -204,12 +197,16 @@ static void __init atmel_st_timer_init(struct device_node *node) > regmap_read(regmap_st, AT91_ST_SR, &val); > > /* Get the interrupts property */ > - at91rm9200_timer_irq.irq = irq_of_parse_and_map(node, 0); > - if (!at91rm9200_timer_irq.irq) > + irq = irq_of_parse_and_map(node, 0); > + if (!irq) > panic(pr_fmt("Unable to get IRQ from DT\n")); > > /* Make IRQs happen for the system timer */ > - setup_irq(at91rm9200_timer_irq.irq, &at91rm9200_timer_irq); > + ret = request_irq(irq, at91rm9200_timer_interrupt, > + IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL, > + "at91_tick", regmap_st); > + if (ret) > + panic(pr_fmt("Unable to setup IRQ\n")); > > /* The 32KiHz "Slow Clock" (tick every 30517.58 nanoseconds) is used > * directly for the clocksource and all clockevents, after adjusting > -- Linaro.org ? Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog