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

Merge branch 'pm-cpuidle' 

* pm-cpuidle: (25 commits)
  cpuidle: Change struct menu_device field types
  cpuidle: Add a comment warning about possible overflow
  cpuidle: Fix variable domains in get_typical_interval()
  cpuidle: Fix menu_device->intervals type
  cpuidle: CodingStyle: Break up multiple assignments on single line
  cpuidle: Check called function parameter in get_typical_interval()
  cpuidle: Rearrange code and comments in get_typical_interval()
  cpuidle: Ignore interval prediction result when timer is shorter
  cpuidle-kirkwood.c: simplify use of devm_ioremap_resource()
  cpuidle: kirkwood: Make kirkwood_cpuidle_remove function static
  cpuidle: calxeda: Add missing __iomem annotation
  SH: cpuidle: Add missing parameter for cpuidle_register()
  ARM: ux500: cpuidle: Move ux500 cpuidle driver to drivers/cpuidle
  ARM: ux500: cpuidle: Remove pointless include
  ARM: ux500: cpuidle: Instantiate the driver from platform device
  ARM: davinci: cpuidle: Fix target residency
  cpuidle: Add Kconfig.arm and move calxeda, kirkwood and zynq
  cpuidle: Check if device is already registered
  cpuidle: Introduce __cpuidle_device_init()
  cpuidle: Introduce __cpuidle_unregister_device()
  ...
parents 95b6fcb0 51f245b8

arch/arm/mach-davinci/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static struct cpuidle_driver davinci_idle_driver = { 
	.states[1]		= {

		.enter			= davinci_enter_idle,

		.exit_latency		= 10,

		.target_residency	= 100000,

		.target_residency	= 10000,

		.flags			= CPUIDLE_FLAG_TIME_VALID,

		.name			= "DDR SR",

		.desc			= "WFI and DDR Self Refresh",

arch/arm/mach-ux500/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


obj-y				:= cpu.o devices.o devices-common.o \

				   id.o usb.o timer.o pm.o

obj-$(CONFIG_CPU_IDLE)          += cpuidle.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o

obj-$(CONFIG_MACH_MOP500)	+= board-mop500.o board-mop500-sdi.o \

arch/sh/kernel/cpu/shmobile/cpuidle.c

+1 −3
Original line number Diff line number Diff line
@@ -91,13 +91,11 @@ static struct cpuidle_driver cpuidle_driver = { 


int __init sh_mobile_setup_cpuidle(void)

{

	int ret;



	if (sh_mobile_sleep_supported & SUSP_SH_SF)

		cpuidle_driver.states[1].disabled = false;



	if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)

		cpuidle_driver.states[2].disabled = false;



	return cpuidle_register(&cpuidle_driver);

	return cpuidle_register(&cpuidle_driver, NULL);

}

drivers/cpuidle/Kconfig

+7 −13
Original line number Diff line number Diff line 
menu "CPU Idle"



menuconfig CPU_IDLE

config CPU_IDLE

	bool "CPU idle PM support"

	default y if ACPI || PPC_PSERIES

	select CPU_IDLE_GOV_LADDER if (!NO_HZ && !NO_HZ_IDLE)
@@ -29,20 +30,13 @@ config CPU_IDLE_GOV_MENU 
	bool "Menu governor (for tickless system)"

	default y



config CPU_IDLE_CALXEDA

	bool "CPU Idle Driver for Calxeda processors"

	depends on ARCH_HIGHBANK

	select ARM_CPU_SUSPEND

	help

	  Select this to enable cpuidle on Calxeda processors.



config CPU_IDLE_ZYNQ

	bool "CPU Idle Driver for Xilinx Zynq processors"

	depends on ARCH_ZYNQ

	help

	  Select this to enable cpuidle on Xilinx Zynq processors.

menu "ARM CPU Idle Drivers"

depends on ARM

source "drivers/cpuidle/Kconfig.arm"

endmenu



endif



config ARCH_NEEDS_CPU_IDLE_COUPLED

	def_bool n

endmenu

drivers/cpuidle/Kconfig.arm

0 → 100644
+29 −0
Original line number Diff line number Diff line 
#

# ARM CPU Idle drivers

#



config ARM_HIGHBANK_CPUIDLE

	bool "CPU Idle Driver for Calxeda processors"

	depends on ARCH_HIGHBANK

	select ARM_CPU_SUSPEND

	help

	  Select this to enable cpuidle on Calxeda processors.



config ARM_KIRKWOOD_CPUIDLE

	bool "CPU Idle Driver for Marvell Kirkwood SoCs"

	depends on ARCH_KIRKWOOD

	help

	  This adds the CPU Idle driver for Marvell Kirkwood SoCs.



config ARM_ZYNQ_CPUIDLE

	bool "CPU Idle Driver for Xilinx Zynq processors"

	depends on ARCH_ZYNQ

	help

	  Select this to enable cpuidle on Xilinx Zynq processors.



config ARM_U8500_CPUIDLE

	bool "Cpu Idle Driver for the ST-E u8500 processors"

	depends on ARCH_U8500

	help

	  Select this to enable cpuidle for ST-E u8500 processors

CRA Git | Maintained and supported by SUSTech CRA and CCSE