Commit e4f5a3ad authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpuidle' 

* pm-cpuidle: (51 commits)
  cpuidle: add maintainer entry
  ARM: s3c64xx: cpuidle: use init/exit common routine
  SH: cpuidle: use init/exit common routine
  cpuidle: fix comment format
  ARM: imx: cpuidle: use init/exit common routine
  ARM: davinci: cpuidle: use init/exit common routine
  ARM: kirkwood: cpuidle: use init/exit common routine
  ARM: calxeda: cpuidle: use init/exit common routine
  ARM: tegra: cpuidle: use init/exit common routine for tegra3
  ARM: tegra: cpuidle: use init/exit common routine for tegra2
  ARM: OMAP4: cpuidle: use init/exit common routine
  ARM: shmobile: cpuidle: use init/exit common routine
  ARM: tegra: cpuidle: use init/exit common routine
  ARM: OMAP3: cpuidle: use init/exit common routine
  ARM: at91: cpuidle: use init/exit common routine
  ARM: ux500: cpuidle: use init/exit common routine
  cpuidle: make a single register function for all
  ARM: ux500: cpuidle: replace for_each_online_cpu by for_each_possible_cpu
  cpuidle: remove en_core_tk_irqen flag
  ARM: OMAP3: remove cpuidle_wrap_enter
  ...
parents ae620830 a8e39c35

Documentation/cpuidle/driver.txt

+6 −0
Original line number Diff line number Diff line
@@ -15,11 +15,17 @@ has mechanisms in place to support actual entry-exit into CPU idle states. 
cpuidle driver initializes the cpuidle_device structure for each CPU device

and registers with cpuidle using cpuidle_register_device.



If all the idle states are the same, the wrapper function cpuidle_register

could be used instead.



It can also support the dynamic changes (like battery <-> AC), by using

cpuidle_pause_and_lock, cpuidle_disable_device and cpuidle_enable_device,

cpuidle_resume_and_unlock.



Interfaces:

extern int cpuidle_register(struct cpuidle_driver *drv,

                            const struct cpumask *const coupled_cpus);

extern int cpuidle_unregister(struct cpuidle_driver *drv);

extern int cpuidle_register_driver(struct cpuidle_driver *drv);

extern void cpuidle_unregister_driver(struct cpuidle_driver *drv);

extern int cpuidle_register_device(struct cpuidle_device *dev);

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2206,6 +2206,15 @@ S: Maintained 
F:	drivers/cpufreq/

F:	include/linux/cpufreq.h



CPUIDLE DRIVERS

M:	Rafael J. Wysocki <rjw@sisk.pl>

M:	Daniel Lezcano <daniel.lezcano@linaro.org>

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git

F:	drivers/cpuidle/*

F:	include/linux/cpuidle.h



CPUID/MSR DRIVER

M:	"H. Peter Anvin" <hpa@zytor.com>

S:	Maintained

arch/arm/configs/kirkwood_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ CONFIG_AEABI=y 
CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE_KIRKWOOD=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

arch/arm/mach-at91/cpuidle.c

+2 −16
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 


#define AT91_MAX_STATES	2



static DEFINE_PER_CPU(struct cpuidle_device, at91_cpuidle_device);



/* Actual code that puts the SoC in different idle states */

static int at91_enter_idle(struct cpuidle_device *dev,

			struct cpuidle_driver *drv,
@@ -47,7 +45,6 @@ static int at91_enter_idle(struct cpuidle_device *dev, 
static struct cpuidle_driver at91_idle_driver = {

	.name			= "at91_idle",

	.owner			= THIS_MODULE,

	.en_core_tk_irqen	= 1,

	.states[0]		= ARM_CPUIDLE_WFI_STATE,

	.states[1]		= {

		.enter			= at91_enter_idle,
@@ -61,20 +58,9 @@ static struct cpuidle_driver at91_idle_driver = { 
};



/* Initialize CPU idle by registering the idle states */

static int at91_init_cpuidle(void)

static int __init at91_init_cpuidle(void)

{

	struct cpuidle_device *device;



	device = &per_cpu(at91_cpuidle_device, smp_processor_id());

	device->state_count = AT91_MAX_STATES;



	cpuidle_register_driver(&at91_idle_driver);



	if (cpuidle_register_device(device)) {

		printk(KERN_ERR "at91_init_cpuidle: Failed registering\n");

		return -EIO;

	}

	return 0;

	return cpuidle_register(&at91_idle_driver, NULL);

}



device_initcall(at91_init_cpuidle);

arch/arm/mach-davinci/cpuidle.c

+3 −26
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 


#define DAVINCI_CPUIDLE_MAX_STATES	2



static DEFINE_PER_CPU(struct cpuidle_device, davinci_cpuidle_device);

static void __iomem *ddr2_reg_base;

static bool ddr2_pdown;
@@ -50,14 +49,10 @@ static void davinci_save_ddr_power(int enter, bool pdown) 


/* Actual code that puts the SoC in different idle states */

static int davinci_enter_idle(struct cpuidle_device *dev,

				struct cpuidle_driver *drv,

						int index)

			      struct cpuidle_driver *drv, int index)

{

	davinci_save_ddr_power(1, ddr2_pdown);



	index = cpuidle_wrap_enter(dev,	drv, index,

				arm_cpuidle_simple_enter);



	cpu_do_idle();

	davinci_save_ddr_power(0, ddr2_pdown);



	return index;
@@ -66,7 +61,6 @@ static int davinci_enter_idle(struct cpuidle_device *dev, 
static struct cpuidle_driver davinci_idle_driver = {

	.name			= "cpuidle-davinci",

	.owner			= THIS_MODULE,

	.en_core_tk_irqen	= 1,

	.states[0]		= ARM_CPUIDLE_WFI_STATE,

	.states[1]		= {

		.enter			= davinci_enter_idle,
@@ -81,12 +75,8 @@ static struct cpuidle_driver davinci_idle_driver = { 


static int __init davinci_cpuidle_probe(struct platform_device *pdev)

{

	int ret;

	struct cpuidle_device *device;

	struct davinci_cpuidle_config *pdata = pdev->dev.platform_data;



	device = &per_cpu(davinci_cpuidle_device, smp_processor_id());



	if (!pdata) {

		dev_err(&pdev->dev, "cannot get platform data\n");

		return -ENOENT;
@@ -96,20 +86,7 @@ static int __init davinci_cpuidle_probe(struct platform_device *pdev) 


	ddr2_pdown = pdata->ddr2_pdown;



	ret = cpuidle_register_driver(&davinci_idle_driver);

	if (ret) {

		dev_err(&pdev->dev, "failed to register driver\n");

		return ret;

	}



	ret = cpuidle_register_device(device);

	if (ret) {

		dev_err(&pdev->dev, "failed to register device\n");

		cpuidle_unregister_driver(&davinci_idle_driver);

		return ret;

	}



	return 0;

	return cpuidle_register(&davinci_idle_driver, NULL);

}



static struct platform_driver davinci_cpuidle_driver = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE