From patchwork Thu Mar 19 13:33:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Cartwright X-Patchwork-Id: 6049481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 75DE79F318 for ; Thu, 19 Mar 2015 13:36:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AD79F20528 for ; Thu, 19 Mar 2015 13:36:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CF6752051A for ; Thu, 19 Mar 2015 13:36:39 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYaac-0004yL-ST; Thu, 19 Mar 2015 13:34:22 +0000 Received: from skprod2.natinst.com ([130.164.80.23] helo=ni.com) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYaaV-0004qf-JK for linux-arm-kernel@lists.infradead.org; Thu, 19 Mar 2015 13:34:16 +0000 Received: from us-aus-mgwout2.amer.corp.natinst.com (nb-snip2-1338.natinst.com [130.164.19.135]) by us-aus-skprod2.natinst.com (8.15.0.59/8.15.0.59) with ESMTP id t2JDXrQv003766; Thu, 19 Mar 2015 08:33:53 -0500 Received: from jcartwri.amer.corp.natinst.com ([130.164.14.198]) by us-aus-mgwout2.amer.corp.natinst.com (Lotus Domino Release 8.5.3FP6) with ESMTP id 2015031908335338-192192 ; Thu, 19 Mar 2015 08:33:53 -0500 Received: by jcartwri.amer.corp.natinst.com (Postfix, from userid 1000) id 5B89C30000D; Thu, 19 Mar 2015 08:33:53 -0500 (CDT) From: Josh Cartwright To: Michal Simek 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 Message-Id: <1426772033-29277-2-git-send-email-joshc@ni.com> X-Mailer: git-send-email 2.3.3 In-Reply-To: <1426772033-29277-1-git-send-email-joshc@ni.com> References: <1426772033-29277-1-git-send-email-joshc@ni.com> X-MIMETrack: Itemize by SMTP Server on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6|November 21, 2013) at 03/19/2015 08:33:53 AM, Serialize by Router on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6|November 21, 2013) at 03/19/2015 08:33:53 AM, Serialize complete at 03/19/2015 08:33:53 AM X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2015-03-19_05:, , signatures=0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150319_063415_836689_AF4A91DD X-CRM114-Status: UNSURE ( 9.08 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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.