From: Joel Stanley <joel@jms.id.au>
To: Daniel Lezcano <daniel.lezcano@linaro.org>,
Rob Herring <robh+dt@kernel.org>
Cc: "Cédric Le Goater" <clg@kaod.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
"Linus Walleij" <linus.walleij@linaro.org>,
"Andrew Jeffery" <andrew@aj.id.au>
Subject: [PATCH v2 2/4] clocksource: fttmr010: Set interrupt and shutdown
Date: Thu, 7 Nov 2019 20:12:16 +1030 [thread overview]
Message-ID: <20191107094218.13210-3-joel@jms.id.au> (raw)
In-Reply-To: <20191107094218.13210-1-joel@jms.id.au>
In preparation for supporting the ast2600, pass the shutdown and
interrupt functions to the common init callback.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Joel Stanley <joel@jms.id.au>
--
v2: call parameter 'irq_handler' instead of 'handler'
---
drivers/clocksource/timer-fttmr010.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c
index c2d30eb9dc72..7c20a3debd96 100644
--- a/drivers/clocksource/timer-fttmr010.c
+++ b/drivers/clocksource/timer-fttmr010.c
@@ -244,7 +244,10 @@ static irqreturn_t fttmr010_timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)
+static int __init fttmr010_common_init(struct device_node *np,
+ bool is_aspeed,
+ int (*timer_shutdown)(struct clock_event_device *),
+ irq_handler_t irq_handler)
{
struct fttmr010 *fttmr010;
int irq;
@@ -345,7 +348,7 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)
fttmr010->tick_rate);
}
- fttmr010->timer_shutdown = fttmr010_timer_shutdown;
+ fttmr010->timer_shutdown = timer_shutdown;
/*
* Setup clockevent timer (interrupt-driven) on timer 1.
@@ -354,7 +357,7 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)
writel(0, fttmr010->base + TIMER1_LOAD);
writel(0, fttmr010->base + TIMER1_MATCH1);
writel(0, fttmr010->base + TIMER1_MATCH2);
- ret = request_irq(irq, fttmr010_timer_interrupt, IRQF_TIMER,
+ ret = request_irq(irq, irq_handler, IRQF_TIMER,
"FTTMR010-TIMER1", &fttmr010->clkevt);
if (ret) {
pr_err("FTTMR010-TIMER1 no IRQ\n");
@@ -403,12 +406,16 @@ static int __init fttmr010_common_init(struct device_node *np, bool is_aspeed)
static __init int aspeed_timer_init(struct device_node *np)
{
- return fttmr010_common_init(np, true);
+ return fttmr010_common_init(np, true,
+ fttmr010_timer_shutdown,
+ fttmr010_timer_interrupt);
}
static __init int fttmr010_timer_init(struct device_node *np)
{
- return fttmr010_common_init(np, false);
+ return fttmr010_common_init(np, false,
+ fttmr010_timer_shutdown,
+ fttmr010_timer_interrupt);
}
TIMER_OF_DECLARE(fttmr010, "faraday,fttmr010", fttmr010_timer_init);
--
2.24.0.rc1
next prev parent reply other threads:[~2019-11-07 9:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 9:42 [PATCH v2 0/4] clocksource: Add ast2600 support to fttmr010 Joel Stanley
2019-11-07 9:42 ` [PATCH v2 1/4] clocksource: fttmr010: Parametrise shutdown Joel Stanley
2020-01-29 11:25 ` Daniel Lezcano
2020-01-29 11:41 ` Joel Stanley
2020-01-29 11:53 ` Daniel Lezcano
2020-01-29 12:05 ` Joel Stanley
2020-03-19 8:47 ` [tip: timers/core] clocksource/drivers/fttmr010: " tip-bot2 for Joel Stanley
2019-11-07 9:42 ` Joel Stanley [this message]
2020-03-19 8:47 ` [tip: timers/core] clocksource/drivers/fttmr010: Set interrupt and shutdown tip-bot2 for Joel Stanley
2019-11-07 9:42 ` [PATCH v2 3/4] clocksource: fttmr010: Add support for ast2600 Joel Stanley
2019-11-07 9:42 ` [PATCH v2 4/4] dt-bindings: fttmr010: Add ast2600 compatible Joel Stanley
2020-03-19 8:47 ` [tip: timers/core] " tip-bot2 for Joel Stanley
2020-01-29 10:30 ` [PATCH v2 0/4] clocksource: Add ast2600 support to fttmr010 Joel Stanley
2020-01-29 11:04 ` Daniel Lezcano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191107094218.13210-3-joel@jms.id.au \
--to=joel@jms.id.au \
--cc=andrew@aj.id.au \
--cc=clg@kaod.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.