Merge branch 'cpuidle-arm' into pm-cpuidle
* cpuidle-arm: 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
This commit is contained in:
commit
9aadfa8fd9
|
@ -65,7 +65,7 @@ static struct cpuidle_driver davinci_idle_driver = {
|
||||||
.states[1] = {
|
.states[1] = {
|
||||||
.enter = davinci_enter_idle,
|
.enter = davinci_enter_idle,
|
||||||
.exit_latency = 10,
|
.exit_latency = 10,
|
||||||
.target_residency = 100000,
|
.target_residency = 10000,
|
||||||
.flags = CPUIDLE_FLAG_TIME_VALID,
|
.flags = CPUIDLE_FLAG_TIME_VALID,
|
||||||
.name = "DDR SR",
|
.name = "DDR SR",
|
||||||
.desc = "WFI and DDR Self Refresh",
|
.desc = "WFI and DDR Self Refresh",
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
obj-y := cpu.o devices.o devices-common.o \
|
obj-y := cpu.o devices.o devices-common.o \
|
||||||
id.o usb.o timer.o pm.o
|
id.o usb.o timer.o pm.o
|
||||||
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
|
||||||
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
|
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
|
||||||
obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o
|
obj-$(CONFIG_UX500_SOC_DB8500) += cpu-db8500.o devices-db8500.o
|
||||||
obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \
|
obj-$(CONFIG_MACH_MOP500) += board-mop500.o board-mop500-sdi.o \
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
|
menu "CPU Idle"
|
||||||
|
|
||||||
menuconfig CPU_IDLE
|
config CPU_IDLE
|
||||||
bool "CPU idle PM support"
|
bool "CPU idle PM support"
|
||||||
default y if ACPI || PPC_PSERIES
|
default y if ACPI || PPC_PSERIES
|
||||||
select CPU_IDLE_GOV_LADDER if (!NO_HZ && !NO_HZ_IDLE)
|
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)"
|
bool "Menu governor (for tickless system)"
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config CPU_IDLE_CALXEDA
|
menu "ARM CPU Idle Drivers"
|
||||||
bool "CPU Idle Driver for Calxeda processors"
|
depends on ARM
|
||||||
depends on ARCH_HIGHBANK
|
source "drivers/cpuidle/Kconfig.arm"
|
||||||
select ARM_CPU_SUSPEND
|
endmenu
|
||||||
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.
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
config ARCH_NEEDS_CPU_IDLE_COUPLED
|
config ARCH_NEEDS_CPU_IDLE_COUPLED
|
||||||
def_bool n
|
def_bool n
|
||||||
|
endmenu
|
||||||
|
|
|
@ -0,0 +1,29 @@
|
||||||
|
#
|
||||||
|
# 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
|
||||||
|
|
|
@ -5,6 +5,9 @@
|
||||||
obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
|
obj-y += cpuidle.o driver.o governor.o sysfs.o governors/
|
||||||
obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
|
obj-$(CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED) += coupled.o
|
||||||
|
|
||||||
obj-$(CONFIG_CPU_IDLE_CALXEDA) += cpuidle-calxeda.o
|
##################################################################################
|
||||||
obj-$(CONFIG_ARCH_KIRKWOOD) += cpuidle-kirkwood.o
|
# ARM SoC drivers
|
||||||
obj-$(CONFIG_CPU_IDLE_ZYNQ) += cpuidle-zynq.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
|
||||||
|
|
|
@ -16,13 +16,11 @@
|
||||||
#include <linux/smp.h>
|
#include <linux/smp.h>
|
||||||
#include <linux/mfd/dbx500-prcmu.h>
|
#include <linux/mfd/dbx500-prcmu.h>
|
||||||
#include <linux/platform_data/arm-ux500-pm.h>
|
#include <linux/platform_data/arm-ux500-pm.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
|
||||||
#include <asm/cpuidle.h>
|
#include <asm/cpuidle.h>
|
||||||
#include <asm/proc-fns.h>
|
#include <asm/proc-fns.h>
|
||||||
|
|
||||||
#include "db8500-regs.h"
|
|
||||||
#include "id.h"
|
|
||||||
|
|
||||||
static atomic_t master = ATOMIC_INIT(0);
|
static atomic_t master = ATOMIC_INIT(0);
|
||||||
static DEFINE_SPINLOCK(master_lock);
|
static DEFINE_SPINLOCK(master_lock);
|
||||||
|
|
||||||
|
@ -113,11 +111,8 @@ static struct cpuidle_driver ux500_idle_driver = {
|
||||||
.state_count = 2,
|
.state_count = 2,
|
||||||
};
|
};
|
||||||
|
|
||||||
int __init ux500_idle_init(void)
|
static int __init dbx500_cpuidle_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
if (!(cpu_is_u8500_family() || cpu_is_ux540_family()))
|
|
||||||
return -ENODEV;
|
|
||||||
|
|
||||||
/* Configure wake up reasons */
|
/* Configure wake up reasons */
|
||||||
prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
|
prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
|
||||||
PRCMU_WAKEUP(ABB));
|
PRCMU_WAKEUP(ABB));
|
||||||
|
@ -125,4 +120,12 @@ int __init ux500_idle_init(void)
|
||||||
return cpuidle_register(&ux500_idle_driver, NULL);
|
return cpuidle_register(&ux500_idle_driver, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
device_initcall(ux500_idle_init);
|
static struct platform_driver dbx500_cpuidle_plat_driver = {
|
||||||
|
.driver = {
|
||||||
|
.name = "cpuidle-dbx500",
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
},
|
||||||
|
.probe = dbx500_cpuidle_probe,
|
||||||
|
};
|
||||||
|
|
||||||
|
module_platform_driver(dbx500_cpuidle_plat_driver);
|
|
@ -3093,6 +3093,10 @@ static struct mfd_cell db8500_prcmu_devs[] = {
|
||||||
.platform_data = &db8500_cpufreq_table,
|
.platform_data = &db8500_cpufreq_table,
|
||||||
.pdata_size = sizeof(db8500_cpufreq_table),
|
.pdata_size = sizeof(db8500_cpufreq_table),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.name = "cpuidle-dbx500",
|
||||||
|
.of_compatible = "stericsson,cpuidle-dbx500",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.name = "db8500-thermal",
|
.name = "db8500-thermal",
|
||||||
.num_resources = ARRAY_SIZE(db8500_thsens_resources),
|
.num_resources = ARRAY_SIZE(db8500_thsens_resources),
|
||||||
|
|
Loading…
Reference in New Issue