From patchwork Thu Sep 29 08:59:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [4/6] arm/imx: remove cpu_is_xxx() from arch_idle() X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 116926 Message-Id: <20110929085936.GD31404@pengutronix.de> To: Shawn Guo Cc: linux-arm-kernel@lists.infradead.org, patches@linaro.org Date: Thu, 29 Sep 2011 10:59:36 +0200 From: Sascha Hauer List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org On Wed, Sep 28, 2011 at 05:16:06PM +0800, Shawn Guo wrote: > This patch adds an idle hook imx_idle to be called in arch_idle(). > Any soc that needs a customized idle implementation other than > cpu_do_idle() can set up this hook in soc specific call. > > Signed-off-by: Shawn Guo > --- > arch/arm/mach-imx/mm-imx3.c | 30 ++++++++++++++++++++++++++ > arch/arm/mach-mx5/mm.c | 6 +++++ > arch/arm/mach-mx5/pm-imx5.c | 3 +- > arch/arm/plat-mxc/include/mach/common.h | 2 + > arch/arm/plat-mxc/include/mach/system.h | 35 ++---------------------------- > arch/arm/plat-mxc/system.c | 2 + > 6 files changed, 45 insertions(+), 33 deletions(-) > I had to fold the following into this commit, otherwise we end up with: In file included from arch/arm/mach-mx5/pm-imx5.c:17:0:arch/arm/plat-mxc/include/mach/common.h:77:33: warning: 'enum mxc_cpu_pwr_mode' declared inside parameter list arch/arm/plat-mxc/include/mach/common.h:77:33: warning: its scope is only this definition or declaration, which is probably not what you want Sascha diff --git a/arch/arm/mach-mx5/system.c b/arch/arm/mach-mx5/system.c index 76ae8dc..144ebeb 100644 --- a/arch/arm/mach-mx5/system.c +++ b/arch/arm/mach-mx5/system.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "crm_regs.h" /* set cpu low power mode before WFI instruction. This function is called diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 2b298d8..afaa967 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -72,6 +72,15 @@ extern void mxc_arch_reset_init(void __iomem *); extern void mx51_efikamx_reset(void); extern int mx53_revision(void); extern int mx53_display_revision(void); + +enum mxc_cpu_pwr_mode { + WAIT_CLOCKED, /* wfi only */ + WAIT_UNCLOCKED, /* WAIT */ + WAIT_UNCLOCKED_POWER_OFF, /* WAIT + SRPG */ + STOP_POWER_ON, /* just STOP */ + STOP_POWER_OFF, /* STOP + SRPG */ +}; + extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode); extern void (*imx_idle)(void); #endif diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index 0987923..00a7819 100644 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h @@ -183,13 +183,6 @@ struct cpu_op { }; int tzic_enable_wake(int is_idle); -enum mxc_cpu_pwr_mode { - WAIT_CLOCKED, /* wfi only */ - WAIT_UNCLOCKED, /* WAIT */ - WAIT_UNCLOCKED_POWER_OFF, /* WAIT + SRPG */ - STOP_POWER_ON, /* just STOP */ - STOP_POWER_OFF, /* STOP + SRPG */ -}; extern struct cpu_op *(*get_cpu_op)(int *op); #endif