From patchwork Wed Dec 9 06:17:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishanth Menon X-Patchwork-Id: 65887 X-Patchwork-Delegate: paul@pwsan.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 nB96Hon2003474 for ; Wed, 9 Dec 2009 06:17:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895AbZLIGRe (ORCPT ); Wed, 9 Dec 2009 01:17:34 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755197AbZLIGRd (ORCPT ); Wed, 9 Dec 2009 01:17:33 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:56207 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755493AbZLIGR0 (ORCPT ); Wed, 9 Dec 2009 01:17:26 -0500 Received: from dlep34.itg.ti.com ([157.170.170.115]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id nB96HR66008735 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 9 Dec 2009 00:17:27 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id nB96HQBe006748; Wed, 9 Dec 2009 00:17:26 -0600 (CST) Received: from senorita (senorita.am.dhcp.ti.com [128.247.75.1]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id nB96HQZ06363; Wed, 9 Dec 2009 00:17:26 -0600 (CST) Received: by senorita (Postfix, from userid 1000) id DC904C1F3; Wed, 9 Dec 2009 00:17:23 -0600 (CST) From: Nishanth Menon To: Kevin Hilman Cc: linux-omap , Nishanth Menon , Benoit Cousson , Eduardo Valentin , Kevin Hilman , Madhusudhan Chikkature Rajashekar , Paul Walmsley , Romit Dasgupta , Sanjeev Premi , Santosh Shilimkar , Sergio Alberto Aguirre Rodriguez , Tero Kristo , Thara Gopinath , Vishwanath Sripathy Subject: [PATCH 09/10 V4] omap3: pm: introduce 3630 opps Date: Wed, 9 Dec 2009 00:17:14 -0600 Message-Id: <1260339435-20294-10-git-send-email-nm@ti.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1260339435-20294-9-git-send-email-nm@ti.com> References: <1260339435-20294-1-git-send-email-nm@ti.com> <1260339435-20294-2-git-send-email-nm@ti.com> <1260339435-20294-3-git-send-email-nm@ti.com> <1260339435-20294-4-git-send-email-nm@ti.com> <1260339435-20294-5-git-send-email-nm@ti.com> <1260339435-20294-6-git-send-email-nm@ti.com> <1260339435-20294-7-git-send-email-nm@ti.com> <1260339435-20294-8-git-send-email-nm@ti.com> <1260339435-20294-9-git-send-email-nm@ti.com> 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/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e40a036..e5fa5bf 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -140,6 +140,38 @@ static struct omap_opp_def __initdata omap34xx_dsp_rate_table[] = { OMAP_OPP_DEF_TERMINATOR }; +static struct omap_opp_def __initdata omap36xx_mpu_rate_table[] = { + /* OPP1 - OPP50 */ + OMAP_OPP_DEF(true, 300000000, 930000), + /* OPP2 - OPP100 */ + OMAP_OPP_DEF(true, 600000000, 1100000), + /* OPP3 - OPP-Turbo */ + OMAP_OPP_DEF(false, 800000000, 1260000), + /* OPP4 - OPP-SB */ + OMAP_OPP_DEF(false, 1000000000, 1310000), + OMAP_OPP_DEF_TERMINATOR +}; + +static struct omap_opp_def __initdata omap36xx_l3_rate_table[] = { + /* OPP1 - OPP50 */ + OMAP_OPP_DEF(true, 100000000, 930000), + /* OPP2 - OPP100, OPP-Turbo, OPP-SB */ + OMAP_OPP_DEF(true, 200000000, 1137500), + OMAP_OPP_DEF_TERMINATOR +}; + +static struct omap_opp_def __initdata omap36xx_dsp_rate_table[] = { + /* OPP1 - OPP50 */ + OMAP_OPP_DEF(true, 260000000, 930000), + /* OPP2 - OPP100 */ + OMAP_OPP_DEF(true, 520000000, 1100000), + /* OPP3 - OPP-Turbo */ + OMAP_OPP_DEF(false, 660000000, 1260000), + /* OPP4 - OPP-SB */ + OMAP_OPP_DEF(false, 875000000, 1310000), + OMAP_OPP_DEF_TERMINATOR +}; + /* OMAP3 Rate Table */ struct omap_opp *omap3_mpu_rate_table; struct omap_opp *omap3_dsp_rate_table; @@ -1296,18 +1328,27 @@ static void __init configure_vc(void) void __init omap3_pm_init_opp_table(void) { int i; + struct omap_opp_def **omap3_opp_def_list; struct omap_opp_def *omap34xx_opp_def_list[] = { omap34xx_mpu_rate_table, omap34xx_l3_rate_table, omap34xx_dsp_rate_table }; + struct omap_opp_def *omap36xx_opp_def_list[] = { + omap36xx_mpu_rate_table, + omap36xx_l3_rate_table, + omap36xx_dsp_rate_table + }; struct omap_opp **omap3_rate_tables[] = { &omap3_mpu_rate_table, &omap3_l3_rate_table, &omap3_dsp_rate_table }; + + omap3_opp_def_list = cpu_is_omap3630() ? omap36xx_opp_def_list : + omap34xx_opp_def_list; for (i = 0; i < ARRAY_SIZE(omap3_rate_tables); i++) { - *omap3_rate_tables[i] = opp_init_list(omap34xx_opp_def_list[i]); + *omap3_rate_tables[i] = opp_init_list(omap3_opp_def_list[i]); /* We dont want half configured system at the moment */ BUG_ON(IS_ERR(omap3_rate_tables[i])); }