From: michal.simek@xilinx.com (Michal Simek)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/7] ARM: zynq: Move clock_init from slcr to common
Date: Mon, 6 Jan 2014 15:36:37 +0100 [thread overview]
Message-ID: <3374e74f85daade60ec31b3aa05151bbe39759d0.1389018985.git.michal.simek@xilinx.com> (raw)
In-Reply-To: <cover.1389018985.git.michal.simek@xilinx.com>
From: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Preparation step for next changes.
Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
arch/arm/mach-zynq/common.c | 2 ++
arch/arm/mach-zynq/slcr.c | 2 --
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 1db2a5ca..bf6717f 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -64,6 +64,8 @@ static void __init zynq_init_machine(void)
static void __init zynq_timer_init(void)
{
zynq_slcr_init();
+
+ zynq_clock_init(zynq_slcr_base);
clocksource_of_init();
}
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 1836d5a..59ad09f 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -106,8 +106,6 @@ int __init zynq_slcr_init(void)
pr_info("%s mapped to %p\n", np->name, zynq_slcr_base);
- zynq_clock_init(zynq_slcr_base);
-
of_node_put(np);
return 0;
--
1.8.2.3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140106/8d79f305/attachment.sig>
next prev parent reply other threads:[~2014-01-06 14:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-06 14:36 [PATCH 0/7] Xilinx Zynq SLCR changes Michal Simek
2014-01-06 14:36 ` Michal Simek [this message]
2014-01-06 14:36 ` [PATCH 2/7] ARM: zynq: Split slcr in two parts Michal Simek
2014-01-06 14:36 ` [PATCH 3/7] ARM: zynq: Hang iomapped slcr address on device_node Michal Simek
2014-03-11 21:26 ` Olof Johansson
2014-03-12 11:51 ` Michal Simek
2014-01-06 14:36 ` [PATCH 4/7] ARM: zynq: Map I/O memory on clkc init Michal Simek
2014-01-06 14:36 ` [PATCH 5/7] ARM: zynq: Make zynq_slcr_base static Michal Simek
2014-01-06 14:36 ` [PATCH 6/7] ARM: zynq: Add and use zynq_slcr_read/write() helper functions Michal Simek
2014-01-06 14:36 ` [PATCH 7/7] ARM: zynq: Introduce zynq_slcr_unlock() Michal Simek
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=3374e74f85daade60ec31b3aa05151bbe39759d0.1389018985.git.michal.simek@xilinx.com \
--to=michal.simek@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.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).