From: tip-bot for Hans de Goede <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: daniel.lezcano@linaro.org, hpa@zytor.com,
maxime.ripard@free-electrons.com, mingo@kernel.org,
linux-kernel@vger.kernel.org, hdegoede@redhat.com,
tglx@linutronix.de
Subject: [tip:timers/core] clocksource/drivers/sun4i-timer: Only register a sched_clock on sun4i and sun5i
Date: Tue, 31 Mar 2015 00:22:49 -0700 [thread overview]
Message-ID: <tip-37b8b003c483191a327a740fc32c1993959e7ae9@git.kernel.org> (raw)
In-Reply-To: <1427746633-9137-8-git-send-email-daniel.lezcano@linaro.org>
Commit-ID: 37b8b003c483191a327a740fc32c1993959e7ae9
Gitweb: http://git.kernel.org/tip/37b8b003c483191a327a740fc32c1993959e7ae9
Author: Hans de Goede <hdegoede@redhat.com>
AuthorDate: Mon, 30 Mar 2015 22:17:10 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 31 Mar 2015 09:15:58 +0200
clocksource/drivers/sun4i-timer: Only register a sched_clock on sun4i and sun5i
sun6i and newer have an arm arch timer which is a better
sched_clock source then the sun4i-timer, and sched_clock does
not have priorities, so do not register the sun4i-timer
sched_clock at all on sun6i and newer.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: ben.dooks@codethink.co.uk
Cc: digetx@gmail.com
Cc: laurent.pinchart+renesas@ideasonboard.com
Cc: linux-arm-kernel@lists.infradead.org
Cc: viresh.kumar@linaro.org
Link: http://lkml.kernel.org/r/1427746633-9137-8-git-send-email-daniel.lezcano@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
drivers/clocksource/sun4i_timer.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index f4a9c00..1928a89 100644
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -170,7 +170,15 @@ static void __init sun4i_timer_init(struct device_node *node)
TIMER_CTL_CLK_SRC(TIMER_CTL_CLK_SRC_OSC24M),
timer_base + TIMER_CTL_REG(1));
- sched_clock_register(sun4i_timer_sched_read, 32, rate);
+ /*
+ * sched_clock_register does not have priorities, and on sun6i and
+ * later there is a better sched_clock registered by arm_arch_timer.c
+ */
+ if (of_machine_is_compatible("allwinner,sun4i-a10") ||
+ of_machine_is_compatible("allwinner,sun5i-a13") ||
+ of_machine_is_compatible("allwinner,sun5i-a10s"))
+ sched_clock_register(sun4i_timer_sched_read, 32, rate);
+
clocksource_mmio_init(timer_base + TIMER_CNTVAL_REG(1), node->name,
rate, 350, 32, clocksource_mmio_readl_down);
next prev parent reply other threads:[~2015-03-31 7:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 20:14 [GIT PULL] clockevents for 4.1 Daniel Lezcano
2015-03-30 20:17 ` [PATCH 01/11] clocksource: arm_arch_timer: Rename arch_timer_probed to reflect behaviour Daniel Lezcano
2015-03-30 20:17 ` [PATCH 02/11] clocksource: sun5i: Switch to request_irq Daniel Lezcano
2015-03-30 20:17 ` [PATCH 03/11] clocksource: sun5i: Use of_io_request_and_map Daniel Lezcano
2015-03-30 20:17 ` [PATCH 04/11] clocksource: sun5i: Remove sched_clock Daniel Lezcano
2015-03-30 20:17 ` [PATCH 05/11] clocksource: sun5i: Refactor the current code Daniel Lezcano
2015-03-30 20:17 ` [PATCH 06/11] clocksource: sun5i: Add clock notifiers Daniel Lezcano
2015-03-30 20:17 ` [PATCH 07/11] clocksource: at91: Make IO endian agnostic Daniel Lezcano
2015-03-31 7:23 ` [tip:timers/core] clocksource/drivers/at91: Fix IO endianness tip-bot for Ben Dooks
2015-03-30 20:17 ` [PATCH 08/11] clocksource: sun4i-timer: Only register a sched_clock on sun4i and sun5i Daniel Lezcano
2015-03-31 7:22 ` tip-bot for Hans de Goede [this message]
2015-03-30 20:17 ` [PATCH 09/11] clocksource: tegra: Maintain CPU endianness Daniel Lezcano
2015-03-31 7:22 ` [tip:timers/core] clocksource/drivers/tegra: Fix IO endianness tip-bot for Dmitry Osipenko
2015-03-30 20:17 ` [PATCH 10/11] clocksource: dw_apb_timer_of: Make IO endian agnostic Daniel Lezcano
2015-03-31 7:22 ` [tip:timers/core] clocksource/drivers/dw_apb_timers_of: Fix IO endianness causing time jumps tip-bot for Ben Dooks
2015-03-30 20:17 ` [PATCH 11/11] clocksource: efm32: Use CLOCK_EVT_FEAT_PERIODIC for defining features Daniel Lezcano
2015-03-31 7:21 ` [tip:timers/core] clocksource/drivers/efm32: " tip-bot for Viresh Kumar
2015-03-31 7:14 ` [PATCH 01/11] clocksource: arm_arch_timer: Rename arch_timer_probed to reflect behaviour Ingo Molnar
2015-03-31 14:14 ` Laurent Pinchart
2015-03-31 15:49 ` Ingo Molnar
2015-03-31 7:17 ` [GIT PULL] clockevents for 4.1 Ingo Molnar
2015-03-31 9:37 ` Daniel Lezcano
2015-03-31 9:42 ` Ingo Molnar
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=tip-37b8b003c483191a327a740fc32c1993959e7ae9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=daniel.lezcano@linaro.org \
--cc=hdegoede@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=mingo@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 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).