| Message ID | 1372241747-21083-6-git-send-email-b.zolnierkie@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Kukjin Kim wrote: > Re-sending due to e-mail client problem :-( > Bartlomiej Zolnierkiewicz wrote: > > > > While at it: > > - remove file path from comment > > > > Compile tested only. > > > > Cc: Ben Dooks <ben-linux@fluff.org> > > Cc: Kukjin Kim <kgene.kim@samsung.com> > > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > > Cc: "Rafael J. Wysocki" <rjw@sisk.pl> > > Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> > > Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> > > --- > > arch/arm/mach-s3c64xx/Makefile | 1 - > > arch/arm/mach-s3c64xx/cpuidle.c | 63 --------------------------------- > -- > > ---- > > drivers/cpuidle/Makefile | 3 ++ > > drivers/cpuidle/cpuidle-s3c64xx.c | 62 > > ++++++++++++++++++++++++++++++++++++++ > > 4 files changed, 65 insertions(+), 64 deletions(-) > > delete mode 100644 arch/arm/mach-s3c64xx/cpuidle.c > > create mode 100644 drivers/cpuidle/cpuidle-s3c64xx.c > > > Please see below with using '-M'. > > --------8<-------------------------------8<-------- > obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o > -obj-$(CONFIG_CPU_IDLE) += cpuidle.o > > # DMA support > > diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/drivers/cpuidle/cpuidle- > s3c64xx.c > similarity index 92% > rename from arch/arm/mach-s3c64xx/cpuidle.c > rename to drivers/cpuidle/cpuidle-s3c64xx.c > index 3c8ab07..c18d075 100644 > --- a/arch/arm/mach-s3c64xx/cpuidle.c > +++ b/drivers/cpuidle/cpuidle-s3c64xx.c > @@ -1,5 +1,4 @@ > -/* linux/arch/arm/mach-s3c64xx/cpuidle.c > - * > +/* > * Copyright (c) 2011 Wolfson Microelectronics, plc > * Copyright (c) 2011 Samsung Electronics Co., Ltd. > * http://www.samsung.com > @@ -20,8 +19,8 @@ > > #include <mach/map.h> > > -#include "regs-sys.h" > -#include "regs-syscon-power.h" > +#include "../../arch/arm/mach-s3c64xx/regs-sys.h" > +#include "../../arch/arm/mach-s3c64xx/regs-syscon-power.h" > > static int s3c64xx_enter_idle(struct cpuidle_device *dev, > struct cpuidle_driver *drv, > --------8<-------------------------------8<-------- > > Would be helpful to check which codes have been changed... > > Need to sort out above inclusions... > > > diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach- > > s3c64xx/Makefile > > index 31d0c91..e7a3ee7 100644 > > --- a/arch/arm/mach-s3c64xx/Makefile > > +++ b/arch/arm/mach-s3c64xx/Makefile > > @@ -22,7 +22,6 @@ obj-$(CONFIG_CPU_S3C6410) += s3c6410.o > > # PM > > > > obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o > > -obj-$(CONFIG_CPU_IDLE) += cpuidle.o > > > > # DMA support > > > > diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach- > > s3c64xx/cpuidle.c > > deleted file mode 100644 > > index 3c8ab07..0000000 > > --- a/arch/arm/mach-s3c64xx/cpuidle.c > > +++ /dev/null > > [...] > > > diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile > > index 6436c67..eed221e 100644 > > --- a/drivers/cpuidle/Makefile > > +++ b/drivers/cpuidle/Makefile > > @@ -31,4 +31,7 @@ ifeq ($(CONFIG_ARCH_OMAP4),y) > > ccflags-y += -I$(srctree)/arch/arm/mach-omap2/include > > obj-y += cpuidle-omap44xx.o > > endif > > +ifeq ($(CONFIG_ARCH_S3C64XX),y) > > + obj-y += cpuidle-s3c64xx.o > > +endif > > I think, adding CONFIG_CPU_IDLE_S3C64XX like others, Calexeda, Zynq is > better...? > > > obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o > > diff --git a/drivers/cpuidle/cpuidle-s3c64xx.c > b/drivers/cpuidle/cpuidle- > > s3c64xx.c > > new file mode 100644 > > index 0000000..c18d075 > > --- /dev/null > > +++ b/drivers/cpuidle/cpuidle-s3c64xx.c > > [...] > > > -- > > 1.8.2.3 > > Thanks, > Kukjin
diff --git a/arch/arm/mach-s3c64xx/Makefile b/arch/arm/mach-s3c64xx/Makefile index 31d0c91..e7a3ee7 100644 --- a/arch/arm/mach-s3c64xx/Makefile +++ b/arch/arm/mach-s3c64xx/Makefile @@ -22,7 +22,6 @@ obj-$(CONFIG_CPU_S3C6410) += s3c6410.o # PM obj-$(CONFIG_PM) += pm.o irq-pm.o sleep.o -obj-$(CONFIG_CPU_IDLE) += cpuidle.o # DMA support diff --git a/arch/arm/mach-s3c64xx/cpuidle.c b/arch/arm/mach-s3c64xx/cpuidle.c deleted file mode 100644 index 3c8ab07..0000000 --- a/arch/arm/mach-s3c64xx/cpuidle.c +++ /dev/null @@ -1,63 +0,0 @@ -/* linux/arch/arm/mach-s3c64xx/cpuidle.c - * - * Copyright (c) 2011 Wolfson Microelectronics, plc - * Copyright (c) 2011 Samsung Electronics Co., Ltd. - * http://www.samsung.com - * - * 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. -*/ - -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/cpuidle.h> -#include <linux/io.h> -#include <linux/export.h> -#include <linux/time.h> - -#include <asm/proc-fns.h> - -#include <mach/map.h> - -#include "regs-sys.h" -#include "regs-syscon-power.h" - -static int s3c64xx_enter_idle(struct cpuidle_device *dev, - struct cpuidle_driver *drv, - int index) -{ - unsigned long tmp; - - /* Setup PWRCFG to enter idle mode */ - tmp = __raw_readl(S3C64XX_PWR_CFG); - tmp &= ~S3C64XX_PWRCFG_CFG_WFI_MASK; - tmp |= S3C64XX_PWRCFG_CFG_WFI_IDLE; - __raw_writel(tmp, S3C64XX_PWR_CFG); - - cpu_do_idle(); - - return index; -} - -static struct cpuidle_driver s3c64xx_cpuidle_driver = { - .name = "s3c64xx_cpuidle", - .owner = THIS_MODULE, - .states = { - { - .enter = s3c64xx_enter_idle, - .exit_latency = 1, - .target_residency = 1, - .flags = CPUIDLE_FLAG_TIME_VALID, - .name = "IDLE", - .desc = "System active, ARM gated", - }, - }, - .state_count = 1, -}; - -static int __init s3c64xx_init_cpuidle(void) -{ - return cpuidle_register(&s3c64xx_cpuidle_driver, NULL); -} -device_initcall(s3c64xx_init_cpuidle); diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile index 6436c67..eed221e 100644 --- a/drivers/cpuidle/Makefile +++ b/drivers/cpuidle/Makefile @@ -31,4 +31,7 @@ ifeq ($(CONFIG_ARCH_OMAP4),y) ccflags-y += -I$(srctree)/arch/arm/mach-omap2/include obj-y += cpuidle-omap44xx.o endif +ifeq ($(CONFIG_ARCH_S3C64XX),y) + obj-y += cpuidle-s3c64xx.o +endif obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.o diff --git a/drivers/cpuidle/cpuidle-s3c64xx.c b/drivers/cpuidle/cpuidle-s3c64xx.c new file mode 100644 index 0000000..c18d075 --- /dev/null +++ b/drivers/cpuidle/cpuidle-s3c64xx.c @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2011 Wolfson Microelectronics, plc + * Copyright (c) 2011 Samsung Electronics Co., Ltd. + * http://www.samsung.com + * + * 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. +*/ + +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/cpuidle.h> +#include <linux/io.h> +#include <linux/export.h> +#include <linux/time.h> + +#include <asm/proc-fns.h> + +#include <mach/map.h> + +#include "../../arch/arm/mach-s3c64xx/regs-sys.h" +#include "../../arch/arm/mach-s3c64xx/regs-syscon-power.h" + +static int s3c64xx_enter_idle(struct cpuidle_device *dev, + struct cpuidle_driver *drv, + int index) +{ + unsigned long tmp; + + /* Setup PWRCFG to enter idle mode */ + tmp = __raw_readl(S3C64XX_PWR_CFG); + tmp &= ~S3C64XX_PWRCFG_CFG_WFI_MASK; + tmp |= S3C64XX_PWRCFG_CFG_WFI_IDLE; + __raw_writel(tmp, S3C64XX_PWR_CFG); + + cpu_do_idle(); + + return index; +} + +static struct cpuidle_driver s3c64xx_cpuidle_driver = { + .name = "s3c64xx_cpuidle", + .owner = THIS_MODULE, + .states = { + { + .enter = s3c64xx_enter_idle, + .exit_latency = 1, + .target_residency = 1, + .flags = CPUIDLE_FLAG_TIME_VALID, + .name = "IDLE", + .desc = "System active, ARM gated", + }, + }, + .state_count = 1, +}; + +static int __init s3c64xx_init_cpuidle(void) +{ + return cpuidle_register(&s3c64xx_cpuidle_driver, NULL); +} +device_initcall(s3c64xx_init_cpuidle);