From patchwork Thu Jun 23 19:10:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 912962 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5NJAJis008877 for ; Thu, 23 Jun 2011 19:10:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932726Ab1FWTKS (ORCPT ); Thu, 23 Jun 2011 15:10:18 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:35995 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932375Ab1FWTKR (ORCPT ); Thu, 23 Jun 2011 15:10:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Content-Type:MIME-Version:Subject:To:From:References:In-Reply-To; bh=896IrxRrtSSqLakSsOpQGD+w9TEkFCV/ZfsWCA7a4CI=; b=KLE8O6Wi2vvK4x6cqDRDFYph8jHfOKA+hWhxT9ul/qvX4zTh9a7Zb0yq5akvWNQktHRF+D0+f6+dH8lXyYoy2AtQ3Cf3UhELTwzQ7olKNL91nzQHHUf/EAzLmVPsiyh4GQUhJUU3K4T2iB6662U7hs/jQO7EWIG9J+aLhSBikQY=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd] helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QZpHw-0005Tg-62; Thu, 23 Jun 2011 20:10:04 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1QZpHv-0005lo-6u; Thu, 23 Jun 2011 20:10:03 +0100 In-Reply-To: <20110623190900.GH9449@n2100.arm.linux.org.uk> References: <20110623190900.GH9449@n2100.arm.linux.org.uk> From: Russell King - ARM Linux To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 03/25] ARM: pm: sa1100: no need to re-enable clock switching MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Thu, 23 Jun 2011 20:10:03 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 23 Jun 2011 19:10:19 +0000 (UTC) This is now taken care of by calling cpu_proc_init() in the resume path, so eliminate this unnecessary call. Signed-off-by: Russell King --- arch/arm/mach-sa1100/sleep.S | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S index 04f2a61..122ab3c 100644 --- a/arch/arm/mach-sa1100/sleep.S +++ b/arch/arm/mach-sa1100/sleep.S @@ -147,5 +147,4 @@ sa1110_sdram_controller_fix: */ .align 5 sa1100_cpu_resume: - mcr p15, 0, r1, c15, c1, 2 @ enable clock switching ldmfd sp!, {r4 - r12, pc} @ return to caller