From patchwork Thu Jan 17 23:24:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 1998631 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id EB5413FC85 for ; Thu, 17 Jan 2013 23:24:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751405Ab3AQXYs (ORCPT ); Thu, 17 Jan 2013 18:24:48 -0500 Received: from utopia.booyaka.com ([74.50.51.50]:43651 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750963Ab3AQXYr (ORCPT ); Thu, 17 Jan 2013 18:24:47 -0500 Received: (qmail 11791 invoked by uid 1019); 17 Jan 2013 23:24:47 -0000 Date: Thu, 17 Jan 2013 23:24:47 +0000 (UTC) From: Paul Walmsley To: Jon Hunter cc: linux-omap , linux-arm Subject: Re: [PATCH] ARM: OMAP2: Fix missing omap2xxx_clkt_vps_xxx function calls In-Reply-To: Message-ID: References: <1357851209-5332-1-git-send-email-jon-hunter@ti.com> <50F85087.3060507@ti.com> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Here's the updated version (at the bottom of this message). Seems to work based on a quick test on 2430SDP. # shutdown -r -n now shutdown: sending all processes the TERM signal... shutdown: sending all processes the KILL signal. shutdown: turning off swap shutdown: unmounting all file systems umount: /debug: not mounted umount: /run/shm: not mounted umount: /dev: not mounted umount: /tmp: not mounted umount: /run/lock: not mounted umount: /run: not mounted umount: /lib/init/rw: not found Please stand by while rebooting the system. [ 79.635925] Disabling non-boot CPUs ... [ 79.640197] Restarting system. U-Boot 1.1.4 (Mar 18 2007 - 12:22:00) OMAP2430C-GP revision 3, PRCM #5A TI 2430SDP 1.1 Version + mDDR (Boot NOR) DRAM: 128 MB Flash: 192 MB NAND:64 MB In: serial Out: serial Err: serial Hit any key to stop autoboot: 0 ... etc. ... - Paul From: Jon Hunter Date: Thu, 10 Jan 2013 14:53:29 -0600 Subject: [PATCH] ARM: OMAP2: Fix missing omap2xxx_clkt_vps_late_init function calls During the migration to the common clock framework, calls to the functions omap2xxx_clkt_vps_late_init() were not preserved for OMAP2420 and OMAP2430. This causes the variables "sys_ck_rate" and "curr_prcm_set" to be uninitialised on boot. On reboot, this causes the following error message to be displayed because the appropriate MPU clock frequency (derived from sys_ck_rate) cannot be found. "Could not set MPU rate to 4294MHz" Fix this by adding back calls to omap2xxx_clkt_vps_late_init() in the OMAP2420 and OMAP2430 clock initialisation code. Signed-off-by: Jon Hunter [paul@pwsan.com: dropped the duplicated call to omap2xxx_clkt_vps_check_bootloader_rates() after consultation with Jon; updated patch description] Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/cclock2420_data.c | 2 ++ arch/arm/mach-omap2/cclock2430_data.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/mach-omap2/cclock2420_data.c b/arch/arm/mach-omap2/cclock2420_data.c index 7e5febe..ab7e952 100644 --- a/arch/arm/mach-omap2/cclock2420_data.c +++ b/arch/arm/mach-omap2/cclock2420_data.c @@ -1935,6 +1935,8 @@ int __init omap2420_clk_init(void) omap2_init_clk_hw_omap_clocks(c->lk.clk); } + omap2xxx_clkt_vps_late_init(); + omap2_clk_disable_autoidle_all(); omap2_clk_enable_init_clocks(enable_init_clks, diff --git a/arch/arm/mach-omap2/cclock2430_data.c b/arch/arm/mach-omap2/cclock2430_data.c index eda079b..eb3dab6 100644 --- a/arch/arm/mach-omap2/cclock2430_data.c +++ b/arch/arm/mach-omap2/cclock2430_data.c @@ -2050,6 +2050,8 @@ int __init omap2430_clk_init(void) omap2_init_clk_hw_omap_clocks(c->lk.clk); } + omap2xxx_clkt_vps_late_init(); + omap2_clk_disable_autoidle_all(); omap2_clk_enable_init_clocks(enable_init_clks,