From patchwork Wed Dec 14 07:02:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 5673 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DEE5523E33 for ; Wed, 14 Dec 2011 07:02:18 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id D5CACA1802C for ; Wed, 14 Dec 2011 07:02:18 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id k10so153511eaa.11 for ; Tue, 13 Dec 2011 23:02:18 -0800 (PST) Received: by 10.205.127.12 with SMTP id gy12mr289040bkc.108.1323846138688; Tue, 13 Dec 2011 23:02:18 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.205.129.2 with SMTP id hg2cs127bkc; Tue, 13 Dec 2011 23:02:18 -0800 (PST) Received: by 10.224.100.71 with SMTP id x7mr7598717qan.33.1323846136551; Tue, 13 Dec 2011 23:02:16 -0800 (PST) Received: from mail-qw0-f50.google.com (mail-qw0-f50.google.com [209.85.216.50]) by mx.google.com with ESMTPS id ff1si1371397qab.63.2011.12.13.23.02.14 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Dec 2011 23:02:16 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.50 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.216.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.216.50 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) smtp.mail=rob.lee@linaro.org Received: by qaea17 with SMTP id a17so388474qae.16 for ; Tue, 13 Dec 2011 23:02:14 -0800 (PST) Received: by 10.224.197.137 with SMTP id ek9mr7521585qab.52.1323846134765; Tue, 13 Dec 2011 23:02:14 -0800 (PST) Received: from b18647-20 ([23.19.172.78]) by mx.google.com with ESMTPS id j7sm3799785qaq.11.2011.12.13.23.02.12 (version=SSLv3 cipher=OTHER); Tue, 13 Dec 2011 23:02:14 -0800 (PST) From: Robert Lee To: len.brown@intel.com, linux-pm@vger.kernel.org, s.hauer@pengutronix.de, amit.kucheria@linaro.org Cc: shawn.guo@freescale.com, nicolas.ferre@atmel.com, linux@maxim.org.za, kgene.kim@samsung.com, amit.kachhap@linaro.org, magnus.damm@gmail.com, khilman@ti.com, nsekhar@ti.com, daniel.lezcano@linaro.org, mturquette@linaro.org, vincent.guittot@linaro.org, arnd.bergmann@linaro.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org, deepthi@linux.vnet.ibm.com, broonie@opensource.wolfsonmicro.com, nicolas.pitre@linaro.org, linux@arm.linux.org.uk Subject: [RFC PATCH v2 2/2] ARM: imx: Add mx5 cpuidle implmentation Date: Wed, 14 Dec 2011 01:02:06 -0600 Message-Id: <1323846126-7516-3-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1323846126-7516-1-git-send-email-rob.lee@linaro.org> References: <1323846126-7516-1-git-send-email-rob.lee@linaro.org> Add mx5 cpuidle implmentation (based upon the new common cpuidle code). Signed-off-by: Robert Lee --- arch/arm/mach-mx5/Makefile | 3 +- arch/arm/mach-mx5/clock-mx51-mx53.c | 3 ++ arch/arm/mach-mx5/cpuidle.c | 65 +++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletions(-) create mode 100644 arch/arm/mach-mx5/cpuidle.c diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile index 0fc6080..2c348b4 100644 --- a/arch/arm/mach-mx5/Makefile +++ b/arch/arm/mach-mx5/Makefile @@ -3,8 +3,9 @@ # # Object file lists. -obj-y := cpu.o mm.o clock-mx51-mx53.o ehci.o system.o +obj-y := cpu.o mm.o clock-mx51-mx53.o ehci.o system.o +obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_PM) += pm-imx5.o obj-$(CONFIG_CPU_FREQ_IMX) += cpu_op-mx51.o obj-$(CONFIG_MACH_MX51_BABBAGE) += board-mx51_babbage.o diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index 4cb2769..12c8a2b 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c @@ -1533,6 +1533,7 @@ static struct clk_lookup mx53_lookups[] = { _REGISTER_CLOCK("imx53-ahci.0", "ahci", sata_clk) _REGISTER_CLOCK("imx53-ahci.0", "ahci_phy", ahci_phy_clk) _REGISTER_CLOCK("imx53-ahci.0", "ahci_dma", ahci_dma_clk) + _REGISTER_CLOCK(NULL, "gpc_dvfs", gpc_dvfs_clk) }; static void clk_tree_init(void) @@ -1572,6 +1573,7 @@ int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, clk_enable(&cpu_clk); clk_enable(&main_bus_clk); + clk_enable(&gpc_dvfs_clk); clk_enable(&iim_clk); imx_print_silicon_rev("i.MX51", mx51_revision()); @@ -1615,6 +1617,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, clk_set_parent(&uart_root_clk, &pll3_sw_clk); clk_enable(&cpu_clk); clk_enable(&main_bus_clk); + clk_enable(&gpc_dvfs_clk); clk_enable(&iim_clk); imx_print_silicon_rev("i.MX53", mx53_revision()); diff --git a/arch/arm/mach-mx5/cpuidle.c b/arch/arm/mach-mx5/cpuidle.c new file mode 100644 index 0000000..7e8ad0a --- /dev/null +++ b/arch/arm/mach-mx5/cpuidle.c @@ -0,0 +1,65 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * Copyright 2011 Linaro Ltd. + * + * The code contained herein is licensed under the GNU General Public + * License. You may obtain a copy of the GNU General Public License + * Version 2 or later at the following locations: + * + * http://www.opensource.org/licenses/gpl-license.html + * http://www.gnu.org/copyleft/gpl.html + */ + +#include +#include +#include +#include +#include +#include + +int imx5_enter(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + mx5_cpu_lp_set((unsigned int)dev->states_usage[index].driver_data); + cpu_do_idle(); + return index; +} + +static struct cpuidle_driver imx5_cpuidle_driver = { + .name = "imx5_cpuidle", + .owner = THIS_MODULE, + .states[0] = { + .enter = imx5_enter, + .exit_latency = 12, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "WFI", + .desc = "idle cpu powered, unclocked.", + }, + .states[1] = { + .enter = imx5_enter, + .exit_latency = 20, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "WFI SRPG", + .desc = "idle cpu unpowered, unclocked.", + }, + .state_count = 2, +}; + +/* use drive_data field to hold the mx5 idle parameter */ +static void __init imx5_dd_init(struct cpuidle_device * dev) +{ + dev->states_usage[0].driver_data = (void *)WAIT_UNCLOCKED; + dev->states_usage[1].driver_data = (void *)WAIT_UNCLOCKED_POWER_OFF; +} + +static int __init imx5_init_cpuidle(void) +{ + int ret; + + ret = common_cpuidle_init(&imx5_cpuidle_driver, + true, + imx5_dd_init); + return ret; +} +late_initcall(imx5_init_cpuidle);