From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752389AbbCSNeT (ORCPT ); Thu, 19 Mar 2015 09:34:19 -0400 Received: from skprod2.natinst.com ([130.164.80.23]:36471 "EHLO ni.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750756AbbCSNeQ (ORCPT ); Thu, 19 Mar 2015 09:34:16 -0400 From: Josh Cartwright To: Michal Simek Cc: =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-kernel@vger.kernel.org, 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 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -- 2.3.3