From: Hiroshi Doyu <hdoyu@nvidia.com>
To: <linux-tegra@vger.kernel.org>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>,
Grant Likely <grant.likely@secretlab.ca>,
Rob Herring <rob.herring@calxeda.com>,
Rob Landley <rob@landley.net>,
Russell King <linux@arm.linux.org.uk>,
Stephen Warren <swarren@wwwdotorg.org>,
John Stultz <johnstul@us.ibm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Olof Johansson <olof@lixom.net>,
Jason Cooper <jason@lakedaemon.net>,
Shawn Guo <shawn.guo@linaro.org>, Andrew Lunn <andrew@lunn.ch>,
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>,
<devicetree-discuss@lists.ozlabs.org>,
<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH 5/9] clocksource: tegra: Enable ARM arch_timer with TSC
Date: Thu, 20 Dec 2012 11:44:03 +0200 [thread overview]
Message-ID: <1355996654-6579-6-git-send-email-hdoyu@nvidia.com> (raw)
In-Reply-To: <1355996654-6579-1-git-send-email-hdoyu@nvidia.com>
Add platform enabler for ARM arch_timer(TSC). TSC is more fine grained
timer than TMR0. If it's available, it will be used for clock source
and sched_clock. Otherwise, TMR0 is used. In any case TMR0 is
necessary for clock event.
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
---
.../bindings/arm/tegra/nvidia,tegra114-tsc.txt | 11 ++++
drivers/clocksource/tegra20_timer.c | 64 +++++++++++++++++++-
2 files changed, 74 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra114-tsc.txt
diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra114-tsc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra114-tsc.txt
new file mode 100644
index 0000000..9de936a
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra114-tsc.txt
@@ -0,0 +1,11 @@
+NVIDIA Tegra Timer Stamp Counter(TSC)
+
+Required properties:
+- compatible : "nvidia,tegra114-tsc
+- reg : Should contain 1 register ranges(address and length)
+
+Example:
+ tsc {
+ compatible = "nvidia,tegra114-tsc";
+ reg = <0x700f0000 0x20000>;
+ };
diff --git a/drivers/clocksource/tegra20_timer.c b/drivers/clocksource/tegra20_timer.c
index 1d25de8..285a6f1 100644
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@ -30,6 +30,7 @@
#include <asm/mach/time.h>
#include <asm/smp_twd.h>
#include <asm/sched_clock.h>
+#include <asm/arch_timer.h>
#define RTC_SECONDS 0x08
#define RTC_SHADOW_SECONDS 0x0c
@@ -271,10 +272,71 @@ static void __init tegra20_init_tmr(void)
clockevents_register_device(&tegra_clockevent);
}
+#define TSC_CNTCR 0 /* TSC control registers */
+#define TSC_CNTCR_ENABLE (1 << 0) /* Enable */
+#define TSC_CNTCR_HDBG (1 << 1) /* Halt on debug */
+
+#define TSC_CNTCV0 0x8 /* TSC counter (LSW) */
+#define TSC_CNTCV1 0xc /* TSC counter (MSW) */
+#define TSC_CNTFID0 0x20 /* TSC freq id 0 */
+
+static const struct of_device_id tegra_tsc_match[] __initconst = {
+ { .compatible = "nvidia,tegra114-tsc" },
+ {}
+};
+
+static int tegra_arch_timer_init(void)
+{
+ int err;
+ struct device_node *np;
+ struct clk *clk;
+ void __iomem *tsc_base;
+ u32 freq, val;
+
+ np = of_find_matching_node(NULL, tegra_tsc_match);
+ if (!np)
+ return -ENODEV;
+
+ tsc_base = of_iomap(np, 0);
+ if (!tsc_base)
+ return -ENODEV;
+
+ clk = clk_get_sys("clk_m", NULL);
+ if (IS_ERR(clk)) {
+ freq = 12000000;
+ pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
+ } else {
+ freq = clk_get_rate(clk);
+ clk_put(clk);
+ }
+ writel_relaxed(freq, tsc_base + TSC_CNTFID0);
+
+ /* CNTFRQ */
+ asm("mcr p15, 0, %0, c14, c0, 0\n" : : "r" (freq));
+ asm("mrc p15, 0, %0, c14, c0, 0\n" : "=r" (val));
+ BUG_ON(val != freq);
+
+ val = readl_relaxed(tsc_base + TSC_CNTCR);
+ val |= TSC_CNTCR_ENABLE | TSC_CNTCR_HDBG;
+ writel_relaxed(val, tsc_base + TSC_CNTCR);
+
+ err = arch_timer_of_register();
+ if (!err)
+ err = arch_timer_sched_clock_init();
+ if (err)
+ pr_err("Failed to register ARM arch_timer(TSC)\n");
+ return err;
+}
+
static void __init tegra20_init_timer(void)
{
+ int err = -ENODEV;
+
tegra20_init_tmr();
- setup_sched_clock(tegra_read_sched_clock, 32, 1000000);
+ if (IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
+ err = tegra_arch_timer_init();
+ if (err)
+ setup_sched_clock(tegra_read_sched_clock, 32, 1000000);
tegra20_init_rtc();
#ifdef CONFIG_HAVE_ARM_TWD
twd_local_timer_of_register();
--
1.7.9.5
next prev parent reply other threads:[~2012-12-20 9:46 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-20 9:43 [PATCH 0/9] ARM: Initial support for Tegra 114 SoC Hiroshi Doyu
2012-12-20 9:43 ` [PATCH 1/9] ARM: tegra: fuse: Add chipid TEGRA114 0x35 Hiroshi Doyu
2012-12-20 9:44 ` [PATCH 2/9] HACK: ARM: tegra: Use CLK_IGNORE_UNUSED for Tegra 114 SoC Hiroshi Doyu
2012-12-20 9:44 ` [PATCH 3/9] ARM: tegra: # of CPU cores detection w/ & w/o HAVE_ARM_SCU Hiroshi Doyu
2012-12-20 10:06 ` Felipe Balbi
2012-12-20 11:21 ` Hiroshi Doyu
2012-12-20 18:18 ` Felipe Balbi
2012-12-20 11:17 ` Marc Zyngier
2012-12-20 11:26 ` Hiroshi Doyu
2012-12-20 11:32 ` Marc Zyngier
2012-12-20 9:44 ` [PATCH 4/9] clocksource: tegra: Reorganize funcs by clock functionarities Hiroshi Doyu
2012-12-20 9:44 ` Hiroshi Doyu [this message]
2012-12-20 11:01 ` [PATCH 5/9] clocksource: tegra: Enable ARM arch_timer with TSC Marc Zyngier
2012-12-20 11:57 ` Hiroshi Doyu
2012-12-20 12:05 ` Marc Zyngier
2012-12-20 12:22 ` Peter De Schrijver
2012-12-20 12:33 ` Marc Zyngier
2012-12-20 12:55 ` Peter De Schrijver
2012-12-20 13:32 ` Marc Zyngier
2012-12-20 14:42 ` Hiroshi Doyu
2012-12-20 17:09 ` Marc Zyngier
2012-12-20 22:13 ` Peter De Schrijver
2012-12-20 13:25 ` Hiroshi Doyu
2012-12-20 13:33 ` Marc Zyngier
2012-12-20 9:44 ` [PATCH 6/9] ARM: dt: tegra114: Add new SoC base, Tegra 114 SoC Hiroshi Doyu
2012-12-20 11:27 ` Marc Zyngier
2012-12-29 6:39 ` Olof Johansson
2012-12-31 7:12 ` Hiroshi Doyu
2012-12-20 9:44 ` [PATCH 7/9] ARM: dt: tegra114: Add new board, Dalmore Hiroshi Doyu
2012-12-20 9:44 ` [PATCH 8/9] ARM: dt: tegra114: Add new board, Pluto Hiroshi Doyu
2012-12-20 9:44 ` [PATCH 9/9] ARM: tegra: Add initial support for Tegra 114 SoC Hiroshi Doyu
2013-01-03 16:28 ` Arnd Bergmann
2013-01-04 7:16 ` Hiroshi Doyu
2012-12-24 9:58 ` [PATCH 0/9] ARM: Initial " Mark Zhang
2013-01-03 14:06 ` Hiroshi Doyu
2013-01-03 21:00 ` Thierry Reding
2013-01-03 21:16 ` Stephen Warren
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=1355996654-6579-6-git-send-email-hdoyu@nvidia.com \
--to=hdoyu@nvidia.com \
--cc=andrew@lunn.ch \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jason@lakedaemon.net \
--cc=johnstul@us.ibm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=plagnioj@jcrosoft.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=shawn.guo@linaro.org \
--cc=swarren@wwwdotorg.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
all inboxes | Powered by JetHome®