From: "tip-bot2 for Alexandre Belloni" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] clocksource/drivers/timer-atmel-tcb: Rework 32khz clock selection
Date: Thu, 23 Jul 2020 19:09:44 -0000 [thread overview]
Message-ID: <159553138460.4006.12847358392559063922.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200710230813.1005150-6-alexandre.belloni@bootlin.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 228e21848623e0ce54a1a3d7857b444813e49b2e
Gitweb: https://git.kernel.org/tip/228e21848623e0ce54a1a3d7857b444813e49b2e
Author: Alexandre Belloni <alexandre.belloni@bootlin.com>
AuthorDate: Sat, 11 Jul 2020 01:08:09 +02:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Sat, 11 Jul 2020 18:57:58 +02:00
clocksource/drivers/timer-atmel-tcb: Rework 32khz clock selection
On all the supported SoCs, the slow clock is always ATMEL_TC_TIMER_CLOCK5,
avoid looking it up and pass it directly to setup_clkevents.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200710230813.1005150-6-alexandre.belloni@bootlin.com
---
drivers/clocksource/timer-atmel-tcb.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/drivers/clocksource/timer-atmel-tcb.c b/drivers/clocksource/timer-atmel-tcb.c
index 7427b07..b255a4a 100644
--- a/drivers/clocksource/timer-atmel-tcb.c
+++ b/drivers/clocksource/timer-atmel-tcb.c
@@ -346,7 +346,7 @@ static void __init tcb_setup_single_chan(struct atmel_tc *tc, int mck_divisor_id
writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR);
}
-static const u8 atmel_tcb_divisors[5] = { 2, 8, 32, 128, 0, };
+static const u8 atmel_tcb_divisors[] = { 2, 8, 32, 128 };
static const struct of_device_id atmel_tcb_of_match[] = {
{ .compatible = "atmel,at91rm9200-tcb", .data = (void *)16, },
@@ -362,7 +362,6 @@ static int __init tcb_clksrc_init(struct device_node *node)
u64 (*tc_sched_clock)(void);
u32 rate, divided_rate = 0;
int best_divisor_idx = -1;
- int clk32k_divisor_idx = -1;
int bits;
int i;
int ret;
@@ -416,12 +415,6 @@ static int __init tcb_clksrc_init(struct device_node *node)
unsigned divisor = atmel_tcb_divisors[i];
unsigned tmp;
- /* remember 32 KiHz clock for later */
- if (!divisor) {
- clk32k_divisor_idx = i;
- continue;
- }
-
tmp = rate / divisor;
pr_debug("TC: %u / %-3u [%d] --> %u\n", rate, divisor, i, tmp);
if (best_divisor_idx > 0) {
@@ -467,7 +460,7 @@ static int __init tcb_clksrc_init(struct device_node *node)
goto err_disable_t1;
/* channel 2: periodic and oneshot timer support */
- ret = setup_clkevents(&tc, clk32k_divisor_idx);
+ ret = setup_clkevents(&tc, ATMEL_TC_TIMER_CLOCK5);
if (ret)
goto err_unregister_clksrc;
next prev parent reply other threads:[~2020-07-23 19:09 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-10 23:08 [PATCH v6 0/9] clocksource/drivers/timer-atmel-tcb: add sama5d2 support Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 1/9] dt-bindings: atmel-tcb: convert bindings to json-schema Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] " tip-bot2 for Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 2/9] dt-bindings: microchip: atmel,at91rm9200-tcb: add sama5d2 compatible Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] " tip-bot2 for Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 3/9] ARM: dts: at91: sama5d2: add TCB GCLK Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] " tip-bot2 for Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 4/9] ARM: at91: add atmel tcb capabilities Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] " tip-bot2 for Kamel Bouhara
2020-07-10 23:08 ` [PATCH v6 5/9] clocksource/drivers/timer-atmel-tcb: rework 32khz clock selection Alexandre Belloni
2020-07-23 19:09 ` tip-bot2 for Alexandre Belloni [this message]
2020-07-10 23:08 ` [PATCH v6 6/9] clocksource/drivers/timer-atmel-tcb: fill tcb_config Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] clocksource/drivers/timer-atmel-tcb: Fill tcb_config tip-bot2 for Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 7/9] clocksource/drivers/timer-atmel-tcb: stop using the 32kHz for clockevents Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] clocksource/drivers/timer-atmel-tcb: Stop " tip-bot2 for Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 8/9] clocksource/drivers/timer-atmel-tcb: allow selecting first divider Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] clocksource/drivers/timer-atmel-tcb: Allow " tip-bot2 for Alexandre Belloni
2020-07-10 23:08 ` [PATCH v6 9/9] clocksource/drivers/timer-atmel-tcb: add sama5d2 support Alexandre Belloni
2020-07-23 19:09 ` [tip: timers/core] clocksource/drivers/timer-atmel-tcb: Add " tip-bot2 for Alexandre Belloni
2020-07-17 4:11 ` [PATCH v6 0/9] clocksource/drivers/timer-atmel-tcb: add " 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=159553138460.4006.12847358392559063922.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=alexandre.belloni@bootlin.com \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).