From patchwork Mon Nov 16 13:36:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 60368 X-Patchwork-Delegate: tony@atomide.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 nAGDc6qe030949 for ; Mon, 16 Nov 2009 13:38:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753102AbZKPNh6 (ORCPT ); Mon, 16 Nov 2009 08:37:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753161AbZKPNh5 (ORCPT ); Mon, 16 Nov 2009 08:37:57 -0500 Received: from utopia.booyaka.com ([72.9.107.138]:49340 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753093AbZKPNh4 (ORCPT ); Mon, 16 Nov 2009 08:37:56 -0500 Received: (qmail 32309 invoked by uid 526); 16 Nov 2009 13:38:01 -0000 MBOX-Line: From nobody Mon Nov 16 06:36:54 2009 Subject: [PATCH 2/3] OMAP3: Clock: Fixed dpll3_m2x2 rate calculation To: linux-arm-kernel@lists.infradead.org From: Paul Walmsley Cc: Tero Kristo , linux-omap@vger.kernel.org Date: Mon, 16 Nov 2009 06:36:54 -0700 Message-ID: <20091116133653.14128.48304.stgit@localhost.localdomain> In-Reply-To: <20091116133237.14128.39687.stgit@localhost.localdomain> References: <20091116133237.14128.39687.stgit@localhost.localdomain> User-Agent: StGit/0.15-rc1-9-gd8846-dirty MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index a1b3de7..8fe1bcb 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h @@ -489,9 +489,9 @@ static struct clk core_ck = { static struct clk dpll3_m2x2_ck = { .name = "dpll3_m2x2_ck", .ops = &clkops_null, - .parent = &dpll3_x2_ck, + .parent = &dpll3_m2_ck, .clkdm_name = "dpll3_clkdm", - .recalc = &followparent_recalc, + .recalc = &omap3_clkoutx2_recalc, }; /* The PWRDN bit is apparently only available on 3430ES2 and above */