summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-05 22:19:03 +0100
committerOlof Johansson <olof@lixom.net>2013-02-05 22:19:03 +0100
commit0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7 (patch)
treea91d4934ac4ffda651804b30554bb6da5af572d4 /arch/arm/mach-kirkwood/common.c
parentARM: nomadik: fix OF compilation regression (diff)
parentARM: tegra: remove empty tegra_smp_init_cpus() (diff)
downloadlinux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.tar.xz
linux-0b6ad80abb1ad1584347e5ec5c5739ebc540a1a7.zip
Merge branch 'next/soc' into next/dt
Diffstat (limited to 'arch/arm/mach-kirkwood/common.c')
-rw-r--r--arch/arm/mach-kirkwood/common.c23
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index b5ad4dff6b12..49792a0cd2d3 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -499,6 +499,28 @@ void __init kirkwood_wdt_init(void)
orion_wdt_init();
}
+/*****************************************************************************
+ * CPU idle
+ ****************************************************************************/
+static struct resource kirkwood_cpuidle_resource[] = {
+ {
+ .flags = IORESOURCE_MEM,
+ .start = DDR_OPERATION_BASE,
+ .end = DDR_OPERATION_BASE + 3,
+ },
+};
+
+static struct platform_device kirkwood_cpuidle = {
+ .name = "kirkwood_cpuidle",
+ .id = -1,
+ .resource = kirkwood_cpuidle_resource,
+ .num_resources = 1,
+};
+
+void __init kirkwood_cpuidle_init(void)
+{
+ platform_device_register(&kirkwood_cpuidle);
+}
/*****************************************************************************
* Time handling
@@ -667,6 +689,7 @@ void __init kirkwood_init(void)
kirkwood_xor1_init();
kirkwood_crypto_init();
+ kirkwood_cpuidle_init();
#ifdef CONFIG_KEXEC
kexec_reinit = kirkwood_enable_pcie;
#endif