From: Hanjun Guo <hanjun.guo@linaro.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will.deacon@arm.com>,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Grant Likely <grant.likely@linaro.org>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Olof Johansson <olof@lixom.net>,
Linus Walleij <linus.walleij@linaro.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Rob Herring <rob.herring@calxeda.com>,
Mark Rutland <mark.rutland@arm.com>,
Jon Masters <jonathan@jonmasters.org>,
patches@linaro.org, linux-kernel@vger.kernel.org,
linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org,
Hanjun Guo <hanjun.guo@linaro.org>
Subject: [RFC part3 PATCH 2/2] ARM64 / clocksource: Use arch_timer_acpi_init()
Date: Wed, 4 Dec 2013 00:41:31 +0800 [thread overview]
Message-ID: <1386088891-2917-3-git-send-email-hanjun.guo@linaro.org> (raw)
In-Reply-To: <1386088891-2917-1-git-send-email-hanjun.guo@linaro.org>
Use arch_timer_acpi_init() on ARM64 to initialise arch timer
in ACPI way when DT is not available.
Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
---
arch/arm64/kernel/time.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/kernel/time.c b/arch/arm64/kernel/time.c
index 29c39d5..fb009da 100644
--- a/arch/arm64/kernel/time.c
+++ b/arch/arm64/kernel/time.c
@@ -67,6 +67,10 @@ void __init time_init(void)
clocksource_of_init();
+ /* if can't be initialised from DT, try ACPI way */
+ if (!arch_timer_get_rate())
+ arch_timer_acpi_init();
+
arch_timer_rate = arch_timer_get_rate();
if (!arch_timer_rate)
panic("Unable to initialise architected timer.\n");
--
1.7.9.5
next prev parent reply other threads:[~2013-12-03 16:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-03 16:41 [RFC part3 PATCH 0/2] Using ACPI GTDT table to initialize arch timer Hanjun Guo
2013-12-03 16:41 ` [RFC part3 PATCH 1/2] clocksource / arch_timer: Use " Hanjun Guo
2013-12-03 17:04 ` Mark Rutland
2013-12-04 14:25 ` Hanjun Guo
2013-12-05 3:43 ` Arnd Bergmann
2013-12-05 13:52 ` Hanjun Guo
2013-12-03 16:41 ` Hanjun Guo [this message]
2013-12-03 17:08 ` [RFC part3 PATCH 2/2] ARM64 / clocksource: Use arch_timer_acpi_init() Mark Rutland
2013-12-04 14:27 ` Hanjun Guo
2013-12-04 15:07 ` Mark Rutland
2013-12-05 13:09 ` Hanjun Guo
[not found] <1386069328-22502-1-git-send-email-hanjun.guo@linaro.org>
[not found] ` <1386069328-22502-3-git-send-email-hanjun.guo@linaro.org>
2013-12-03 12:27 ` Linus Walleij
2013-12-03 13:52 ` Hanjun Guo
2013-12-03 14:13 ` Linus Walleij
2013-12-03 14:43 ` Mark Rutland
2013-12-03 16:30 ` Hanjun Guo
2013-12-09 18:37 ` Olof Johansson
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=1386088891-2917-3-git-send-email-hanjun.guo@linaro.org \
--to=hanjun.guo@linaro.org \
--cc=bhelgaas@google.com \
--cc=catalin.marinas@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=grant.likely@linaro.org \
--cc=jonathan@jonmasters.org \
--cc=linaro-acpi@lists.linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linus.walleij@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=mark.rutland@arm.com \
--cc=mjg59@srcf.ucam.org \
--cc=olof@lixom.net \
--cc=patches@linaro.org \
--cc=rjw@rjwysocki.net \
--cc=rob.herring@calxeda.com \
--cc=will.deacon@arm.com \
/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
all inboxes | Powered by JetHome®