From patchwork Wed Aug 18 11:16:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thara Gopinath X-Patchwork-Id: 120128 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7IBGp7q018946 for ; Wed, 18 Aug 2010 11:16:53 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752780Ab0HRLQw (ORCPT ); Wed, 18 Aug 2010 07:16:52 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:51684 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752765Ab0HRLQp (ORCPT ); Wed, 18 Aug 2010 07:16:45 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7IBGfwK016123 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 18 Aug 2010 06:16:43 -0500 Received: from localhost.localdomain (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o7IBGXeD021899; Wed, 18 Aug 2010 16:46:39 +0530 (IST) From: Thara Gopinath To: linux-omap@vger.kernel.org Cc: khilman@deeprootsystems.com, paul@pwsan.com, vishwanath.bs@ti.com, sawant@ti.com, b-cousson@ti.com, Thara Gopinath Subject: [PATCH 10/10] OMAP4: Add opp tables. Date: Wed, 18 Aug 2010 16:46:31 +0530 Message-Id: <1282130191-9062-11-git-send-email-thara@ti.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1282130191-9062-1-git-send-email-thara@ti.com> References: <1282130191-9062-1-git-send-email-thara@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 18 Aug 2010 11:16:53 +0000 (UTC) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index d46fbec..ebe3f36 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -51,7 +51,7 @@ obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o obj-$(CONFIG_ARCH_OMAP2) += sleep24xx.o obj-$(CONFIG_ARCH_OMAP3) += pm34xx.o sleep34xx.o voltage.o \ cpuidle34xx.o -obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o voltage.o +obj-$(CONFIG_ARCH_OMAP4) += pm44xx.o voltage.o opp44xx_data.o obj-$(CONFIG_PM_DEBUG) += pm-debug.o obj-$(CONFIG_OMAP_SMARTREFLEX) += sr_device.o smartreflex.o obj-$(CONFIG_OMAP_SMARTREFLEX_CLASS3) += smartreflex-class3.o diff --git a/arch/arm/mach-omap2/opp44xx.h b/arch/arm/mach-omap2/opp44xx.h new file mode 100644 index 0000000..2cae9f3 --- /dev/null +++ b/arch/arm/mach-omap2/opp44xx.h @@ -0,0 +1,26 @@ +/* + * OMAP4 OPP API's. + * + * Copyright (C) 2010 Texas Instruments Incorporated. + * Thara Gopinath + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * History: + */ + +#ifndef __ARCH_ARM_MACH_OMAP2_OPP44XX_H +#define __ARCH_ARM_MACH_OMAP2_OPP44XX_H + +#ifdef CONFIG_PM +extern int omap4_pm_init_opp_table(void); +#else +static inline int omap4_pm_init_opp_table(void) { return -EINVAL; } +#endif + +#endif diff --git a/arch/arm/mach-omap2/opp44xx_data.c b/arch/arm/mach-omap2/opp44xx_data.c new file mode 100644 index 0000000..b5c9680 --- /dev/null +++ b/arch/arm/mach-omap2/opp44xx_data.c @@ -0,0 +1,80 @@ +/* + * OMAP4 OPP table definitions. + * + * Copyright (C) 2009 - 2010 Texas Instruments Incorporated. + * Nishanth Menon + * Copyright (C) 2009 - 2010 Deep Root Systems, LLC. + * Kevin Hilman + * Copyright (C) 2010 Nokia Corporation. + * Eduardo Valentin + * Copyright (C) 2010 Texas Instruments Incorporated. + * Thara Gopinath + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED + * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + * History: + */ + +#include +#include + +#include +#include + +#include "opp44xx.h" + +static struct omap_opp_def __initdata omap44xx_opp_def_list[] = { + /* MPU OPP1 - OPP50 */ + OMAP_OPP_DEF("mpu", true, 300000000, 930000), + /* MPU OPP2 - OPP100 */ + OMAP_OPP_DEF("mpu", true, 600000000, 1100000), + /* MPU OPP3 - OPP-Turbo */ + OMAP_OPP_DEF("mpu", true, 800000000, 1260000), + /* MPU OPP4 - OPP-SB */ + OMAP_OPP_DEF("mpu", true, 1008000000, 1350000), + /* IVA OPP1 - OPP50 */ + OMAP_OPP_DEF("iva", true, 133000000, 930000), + /* IVA OPP2 - OPP100 */ + OMAP_OPP_DEF("iva", true, 266000000, 1100000), + /* IVA OPP3 - OPP-Turbo */ + OMAP_OPP_DEF("iva", false, 332000000, 1260000), + /* L3 OPP1 - OPP50 */ + OMAP_OPP_DEF("l3_main_1", true, 100000000, 930000), + /* L3 OPP2 - OPP100, OPP-Turbo, OPP-SB */ + OMAP_OPP_DEF("l3_main_1", true, 200000000, 1100000), +}; + +static u32 omap44xx_opp_def_size = ARRAY_SIZE(omap44xx_opp_def_list); + +/* Temp variable to allow multiple calls */ +static u8 __initdata omap4_table_init; + + +int __init omap4_pm_init_opp_table(void) +{ + struct omap_opp_def *opp_def; + int i, r; + + /* + * Allow multiple calls, but initialize only if not already initalized + * even if the previous call failed, coz, no reason we'd succeed again + */ + if (omap4_table_init) + return 0; + omap4_table_init = 1; + + opp_def = omap44xx_opp_def_list; + + for (i = 0; i < omap44xx_opp_def_size; i++) { + r = opp_add(opp_def++); + if (r) + pr_err("unable to add OPP %ld Hz for %s\n", + opp_def->freq, opp_def->hwmod_name); + } + return 0; +} diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 740e506..6707a2e 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -19,6 +19,7 @@ #include #include "omap3-opp.h" +#include "opp44xx.h" static struct omap_device_pm_latency *pm_lats; @@ -90,7 +91,10 @@ static void omap2_init_processor_devices(void) static int __init omap2_common_pm_init(void) { omap2_init_processor_devices(); - omap3_pm_init_opp_table(); + if (cpu_is_omap34xx()) + omap3_pm_init_opp_table(); + else if (cpu_is_omap44xx()) + omap4_pm_init_opp_table(); omap_pm_if_init();