Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux 

Pull ARM cpuidle updates for v3.13 from Daniel Lezcano.

* 'cpuidle/arm-next' of git://git.linaro.org/people/dlezcano/linux:
  ARM: ux500: cpuidle: fix section mismatch
  ARM: zynq: cpuidle: convert to platform driver
  ARM: zynq: cpuidle: Remove useless compatibility string
  drivers: cpuidle: rename ARM big.LITTLE driver config and makefile entries
parents d0e639c9 2c2b24d9

arch/arm/mach-zynq/common.c

+6 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ static struct of_device_id zynq_of_bus_ids[] __initdata = { 
	{}

};



static struct platform_device zynq_cpuidle_device = {

	.name = "cpuidle-zynq",

};



/**

 * zynq_init_machine - System specific initialization, intended to be

 *		       called from board specific initialization.
@@ -56,6 +60,8 @@ static void __init zynq_init_machine(void) 
	l2x0_of_init(0x02060000, 0xF0F0FFFF);



	of_platform_bus_probe(NULL, zynq_of_bus_ids, NULL);



	platform_device_register(&zynq_cpuidle_device);

}



static void __init zynq_timer_init(void)

drivers/cpuidle/Kconfig.arm

+11 −11
Original line number Diff line number Diff line
@@ -2,6 +2,17 @@ 
# ARM CPU Idle drivers

#



config ARM_BIG_LITTLE_CPUIDLE

	bool "Support for ARM big.LITTLE processors"

	depends on ARCH_VEXPRESS_TC2_PM

	select ARM_CPU_SUSPEND

	select CPU_IDLE_MULTIPLE_DRIVERS

	help

	  Select this option to enable CPU idle driver for big.LITTLE based

	  ARM systems. Driver manages CPUs coordination through MCPM and

	  define different C-states for little and big cores through the

	  multiple CPU idle drivers infrastructure.



config ARM_HIGHBANK_CPUIDLE

	bool "CPU Idle Driver for Calxeda processors"

	depends on ARCH_HIGHBANK
@@ -26,14 +37,3 @@ config ARM_U8500_CPUIDLE 
	depends on ARCH_U8500

	help

	  Select this to enable cpuidle for ST-E u8500 processors
 


config CPU_IDLE_BIG_LITTLE

	bool "Support for ARM big.LITTLE processors"

	depends on ARCH_VEXPRESS_TC2_PM

	select ARM_CPU_SUSPEND

	select CPU_IDLE_MULTIPLE_DRIVERS

	help

	  Select this option to enable CPU idle driver for big.LITTLE based

	  ARM systems. Driver manages CPUs coordination through MCPM and

	  define different C-states for little and big cores through the

	  multiple CPU idle drivers infrastructure.

drivers/cpuidle/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o 


##################################################################################

# ARM SoC drivers

obj-$(CONFIG_ARM_BIG_LITTLE_CPUIDLE)	+= cpuidle-big_little.o

obj-$(CONFIG_ARM_HIGHBANK_CPUIDLE)	+= cpuidle-calxeda.o

obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)	+= cpuidle-kirkwood.o

obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)		+= cpuidle-zynq.o

obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
 
obj-$(CONFIG_CPU_IDLE_BIG_LITTLE)	+= cpuidle-big_little.o

drivers/cpuidle/cpuidle-ux500.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static struct cpuidle_driver ux500_idle_driver = { 
	.state_count = 2,

};



static int __init dbx500_cpuidle_probe(struct platform_device *pdev)

static int dbx500_cpuidle_probe(struct platform_device *pdev)

{

	/* Configure wake up reasons */

	prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |

drivers/cpuidle/cpuidle-zynq.c

+11 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/init.h>

#include <linux/cpu_pm.h>

#include <linux/cpuidle.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <asm/proc-fns.h>

#include <asm/cpuidle.h>
@@ -70,14 +70,19 @@ static struct cpuidle_driver zynq_idle_driver = { 
};



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

static int __init zynq_cpuidle_init(void)

static int zynq_cpuidle_probe(struct platform_device *pdev)

{

	if (!of_machine_is_compatible("xlnx,zynq-7000"))

		return -ENODEV;



	pr_info("Xilinx Zynq CpuIdle Driver started\n");



	return cpuidle_register(&zynq_idle_driver, NULL);

}



device_initcall(zynq_cpuidle_init);
 
static struct platform_driver zynq_cpuidle_driver = {

	.driver = {

		.name = "cpuidle-zynq",

		.owner = THIS_MODULE,

	},

	.probe = zynq_cpuidle_probe,

};



module_platform_driver(zynq_cpuidle_driver);