From patchwork Thu Nov 29 17:17:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 1824261 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id B1B3B3FC23 for ; Fri, 30 Nov 2012 09:44:47 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TeN5X-0004H8-6W; Fri, 30 Nov 2012 09:40:51 +0000 Received: from utopia.booyaka.com ([74.50.51.50]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Te7jw-0004o5-Eb for linux-arm-kernel@lists.infradead.org; Thu, 29 Nov 2012 17:17:33 +0000 Received: (qmail 19500 invoked by uid 1019); 29 Nov 2012 17:17:30 -0000 Date: Thu, 29 Nov 2012 17:17:30 +0000 (UTC) From: Paul Walmsley To: tony@atomide.com Subject: Re: [PATCH 1/3] ARM: OMAP4: Update timer clock aliases (fwd) Message-ID: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 X-Bad-Reply: 'Re:' in Subject but no References or In-Reply-To headers X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121129_121732_783389_85F31CCD X-CRM114-Status: GOOD ( 24.34 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Mailman-Approved-At: Fri, 30 Nov 2012 04:37:59 -0500 Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi Tony, well it seems that I did miss at least one important clock patch for v3.8. This appears to be needed to avoid failures when attempting to set parent clocks for GPTIMER5-7 on OMAP4. Could you consider this one for late v3.8? If you prefer, I can send a pull request for it. Otherwise, will send it as part of the v3.8-rc1 integration fixes. thanks, - Paul ---------- Forwarded message ---------- Date: Thu, 29 Nov 2012 11:02:17 -0600 From: Jon Hunter To: Paul Walmsley Cc: linux-omap , linux-arm Subject: Re: [PATCH 1/3] ARM: OMAP4: Update timer clock aliases On 11/29/2012 04:53 AM, Paul Walmsley wrote: > Hi Jon, > > On Wed, 7 Nov 2012, Jon Hunter wrote: > >> Commit "ARM: dts: OMAP4: Update timer addresses" updated the device-tree >> names of the OMAP4 timers 5-7 because the default address for the timers >> was changed from the L3 address to the MPU private address. When booting >> with device-tree, this introduces a regression when attempting to set >> the parent clock of timers 5-7 to the sys_clk_div_ck. Therefore, update >> the clock aliases for timer 5-7 to reflect the updated device-tree name >> for the timers. > > Reviewing my E-mail inbox, just saw that this one is marked as being > needed for v3.8. Is that still the case? If so, we should ask Tony to > take an updated version of this patch, given the recent CCF conversion. Yes this is still needed for v3.8. > Following is the updated patch. Thanks, looks good to me. Cheers Jon From: Jon Hunter Date: Thu, 29 Nov 2012 03:47:46 -0700 Subject: [PATCH] ARM: OMAP4: Update timer clock aliases Commit "ARM: dts: OMAP4: Update timer addresses" updated the device-tree names of the OMAP4 timers 5-7 because the default address for the timers was changed from the L3 address to the MPU private address. When booting with device-tree, this introduces a regression when attempting to set the parent clock of timers 5-7 to the sys_clk_div_ck. Therefore, update the clock aliases for timer 5-7 to reflect the updated device-tree name for the timers. Signed-off-by: Jon Hunter [paul@pwsan.com: updated to apply after the CCF conversion] Signed-off-by: Paul Walmsley --- arch/arm/mach-omap2/cclock44xx_data.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c index aa56c3e..a1f0b55 100644 --- a/arch/arm/mach-omap2/cclock44xx_data.c +++ b/arch/arm/mach-omap2/cclock44xx_data.c @@ -1935,10 +1935,10 @@ static struct omap_clk omap44xx_clks[] = { CLK("4803e000.timer", "timer_sys_ck", &sys_clkin_ck, CK_443X), CLK("48086000.timer", "timer_sys_ck", &sys_clkin_ck, CK_443X), CLK("48088000.timer", "timer_sys_ck", &sys_clkin_ck, CK_443X), - CLK("49038000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), - CLK("4903a000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), - CLK("4903c000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), - CLK("4903e000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), + CLK("40138000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), + CLK("4013a000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), + CLK("4013c000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), + CLK("4013e000.timer", "timer_sys_ck", &syc_clk_div_ck, CK_443X), CLK(NULL, "cpufreq_ck", &dpll_mpu_ck, CK_443X), };