From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [GIT PULL 3/8] ARM: tegra: cleanup
Date: Tue, 9 Apr 2013 15:44:32 +0200 [thread overview]
Message-ID: <201304091544.32377.arnd@arndb.de> (raw)
In-Reply-To: <1365181426-11547-3-git-send-email-swarren@wwwdotorg.org>
On Friday 05 April 2013, Stephen Warren wrote:
> This branch includes various cleanup of the core Tegra support.
>
> * Unification of the separate board-dt-tegra*.c files into a single
> tegra.c, now that everything is DT-driven and basically identical.
> * Use of_clk_get() in the Tegra clocksource driver so that clocks are
> described in DT rather than hard-coding clock names.
> * Some cleanup of the PMC-related code, with the aim that the PMC
> "driver" contains more of the code that touches PMC registers, rather
> than spreading PMC register accesses through other files.
> * Conversion of the "PMC" driver to acquire resources describe in device
> tree rather than hard-coding them.
> * Use of common code for the CPU sleep TLB invalidation.
>
Pulled into next/cleanup branch and resolved the conflict against
an earlier cleanup that was already present there, fixup below.
Arnd
--- a/drivers/clocksource/tegra20_timer.c
+++ b/drivers/clocksource/tegra20_timer.c
@@@ -218,34 -259,12 +218,34 @@@ static void __init tegra20_init_timer(s
tegra_clockevent.irq = tegra_timer_irq.irq;
clockevents_config_and_register(&tegra_clockevent, 1000000,
0x1, 0x1fffffff);
-#ifdef CONFIG_HAVE_ARM_TWD
- twd_local_timer_of_register();
-#endif
+}
+CLOCKSOURCE_OF_DECLARE(tegra20_timer, "nvidia,tegra20-timer", tegra20_init_timer);
+
+static void __init tegra20_init_rtc(struct device_node *np)
+{
+ struct clk *clk;
+
+ rtc_base = of_iomap(np, 0);
+ if (!rtc_base) {
+ pr_err("Can't map RTC registers");
+ BUG();
+ }
+
+ /*
+ * rtc registers are used by read_persistent_clock, keep the rtc clock
+ * enabled
+ */
- clk = clk_get_sys("rtc-tegra", NULL);
++ clk = of_clk_get(np, 0);
+ if (IS_ERR(clk))
+ pr_warn("Unable to get rtc-tegra clock\n");
+ else
+ clk_prepare_enable(clk);
+
+ of_node_put(np);
+
register_persistent_clock(NULL, tegra_read_persistent_clock);
}
-CLOCKSOURCE_OF_DECLARE(tegra20, "nvidia,tegra20-timer", tegra20_init_timer);
+CLOCKSOURCE_OF_DECLARE(tegra20_rtc, "nvidia,tegra20-rtc", tegra20_init_rtc);
#ifdef CONFIG_PM
static u32 usec_config;
next prev parent reply other threads:[~2013-04-09 13:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-05 17:03 [GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree Stephen Warren
2013-04-05 17:03 ` [GIT PULL 2/8] ARM: tegra: minor fixes Stephen Warren
2013-04-09 13:13 ` Arnd Bergmann
2013-04-05 17:03 ` [GIT PULL 3/8] ARM: tegra: cleanup Stephen Warren
2013-04-09 13:44 ` Arnd Bergmann [this message]
2013-04-09 15:36 ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 4/8] ARM: tegra: core SoC support development Stephen Warren
2013-04-09 14:37 ` Arnd Bergmann
2013-04-05 17:03 ` [GIT PULL 5/8] ARM: tegra: clock driver development Stephen Warren
2013-04-09 15:14 ` Arnd Bergmann
2013-04-09 15:38 ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 6/8] ARM: tegra: device tree changes Stephen Warren
2013-04-09 15:04 ` Arnd Bergmann
2013-04-09 15:55 ` Arnd Bergmann
2013-04-05 17:03 ` [GIT PULL 7/8] ARM: tegra: multi-platform conversion Stephen Warren
2013-04-09 14:59 ` Arnd Bergmann
2013-04-09 20:01 ` Arnd Bergmann
2013-04-09 21:49 ` Stephen Warren
2013-04-05 17:03 ` [GIT PULL 8/8] ARM: tegra: defconfig changes Stephen Warren
2013-04-09 15:16 ` Arnd Bergmann
2013-04-11 17:53 ` Olof Johansson
2013-04-09 11:01 ` [GIT PULL 1/8] ARM: tegra: DT-related fixes needed by the MMC tree Arnd Bergmann
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=201304091544.32377.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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