From: joshc@ni.com (Josh Cartwright)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: zynq: drop use of slcr_unlock in zynq_slcr_system_restart
Date: Thu, 19 Mar 2015 08:33:53 -0500 [thread overview]
Message-ID: <1426772033-29277-2-git-send-email-joshc@ni.com> (raw)
In-Reply-To: <1426772033-29277-1-git-send-email-joshc@ni.com>
The SLCR is unconditionally unlocked early on boot in zynq_slcr_init()
and not unlocked. As such, it is not necessary to explicitly unlock in
the restart codepath.
Signed-off-by: Josh Cartwright <joshc@ni.com>
---
arch/arm/mach-zynq/slcr.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index fa4c796..698dc3b 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -102,13 +102,6 @@ int zynq_slcr_system_restart(struct notifier_block *nb,
u32 reboot;
/*
- * Unlock the SLCR then reset the system.
- * Note that this seems to require raw i/o
- * functions or there's a lockup?
- */
- zynq_slcr_unlock();
-
- /*
* Clear 0x0F000000 bits of reboot status register to workaround
* the FSBL not loading the bitstream after soft-reboot
* This is a temporary solution until we know more.
--
2.3.3
next prev parent reply other threads:[~2015-03-19 13:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-27 15:09 [PATCH v2] ARM: zynq: use restart_handler mechanism for slcr reset Josh Cartwright
2015-03-11 15:41 ` Josh Cartwright
2015-03-19 10:44 ` Michal Simek
2015-03-19 12:44 ` Josh Cartwright
2015-03-19 13:19 ` Michal Simek
2015-03-19 13:33 ` [PATCH v3 1/2] " Josh Cartwright
2015-03-19 13:33 ` Josh Cartwright [this message]
2015-03-19 13:49 ` [PATCH 2/2] ARM: zynq: drop use of slcr_unlock in zynq_slcr_system_restart Josh Cartwright
2015-03-19 14:01 ` [PATCH v3 1/2] ARM: zynq: use restart_handler mechanism for slcr reset Michal Simek
2015-03-19 14:22 ` Josh Cartwright
2015-03-19 14:24 ` [PATCH v4] " Josh Cartwright
2015-03-20 7:48 ` Michal Simek
2015-03-19 13:37 ` [PATCH v2] " Josh Cartwright
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=1426772033-29277-2-git-send-email-joshc@ni.com \
--to=joshc@ni.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).