From patchwork Tue May 12 11:02:16 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kalle Jokiniemi X-Patchwork-Id: 23226 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4CB2GrI002907 for ; Tue, 12 May 2009 11:02:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754049AbZELLCH (ORCPT ); Tue, 12 May 2009 07:02:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756073AbZELLCG (ORCPT ); Tue, 12 May 2009 07:02:06 -0400 Received: from smtp1.digia.com ([82.118.214.156]:11122 "EHLO smtp1.digia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754049AbZELLCF (ORCPT ); Tue, 12 May 2009 07:02:05 -0400 Received: from smtp1.digia.com (unknown [127.0.0.1]) by IMSA (Postfix) with ESMTP id 5013E47804E; Tue, 12 May 2009 14:02:05 +0300 (EEST) Received: from IT-EXCH02-HKI.it.local (unknown [10.9.52.55]) by smtp1.digia.com (Postfix) with ESMTP id 447E647804B; Tue, 12 May 2009 14:02:05 +0300 (EEST) Received: from localhost.localdomain (10.120.146.225) by IT-EXCH02-HKI.it.local (10.9.52.56) with Microsoft SMTP Server id 8.1.340.0; Tue, 12 May 2009 14:02:04 +0300 From: Kalle Jokiniemi To: CC: , , Kalle Jokiniemi Subject: [PATCH 1/1] ARM:OMAP3: Fix PLL_MOD CLKEN offset in scratchpad Date: Tue, 12 May 2009 14:02:16 +0300 Message-ID: <1242126136-8419-2-git-send-email-kalle.jokiniemi@digia.com> X-Mailer: git-send-email 1.5.4.3 In-Reply-To: <1242126136-8419-1-git-send-email-kalle.jokiniemi@digia.com> References: <> <1242126136-8419-1-git-send-email-kalle.jokiniemi@digia.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The CM_CLKEN_PLL register saved in scratchpad memory was wrongly using offset of 0x0004 instead of 0x0000. The effect of this was that boot ROM code would restore the wrong value when waking up from off mode. This wrong value, however, will be overwritten by prcm context restore. Still, a short period of wrong clock settings in CM_CLKEN_PLL remained between ROM code and prcm context restore. This is fixed by the patch. Problem reported by: Jouni Högander Signed-off-by: Kalle Jokiniemi --- arch/arm/mach-omap2/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index a0429fe..60de860 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -235,7 +235,7 @@ void omap3_save_scratchpad_contents(void) prcm_block_contents.cm_clksel_wkup = cm_read_mod_reg(WKUP_MOD, CM_CLKSEL); prcm_block_contents.cm_clken_pll = - cm_read_mod_reg(PLL_MOD, OMAP3430_CM_CLKEN_PLL); + cm_read_mod_reg(PLL_MOD, CM_CLKEN); prcm_block_contents.cm_autoidle_pll = cm_read_mod_reg(PLL_MOD, OMAP3430_CM_AUTOIDLE_PLL); prcm_block_contents.cm_clksel1_pll =