Merge back earlier 'pm-cpuidle' material.

3 files changed, 1 insertions, 130 deletions

diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 36aef3a7dedb..f1ac1c94ac0f 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -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",
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index bf9b6be5b180..fe1f3e26b88b 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -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 \
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
deleted file mode 100644
index a45dd09daed9..000000000000
--- a/arch/arm/mach-ux500/cpuidle.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2012 Linaro : Daniel Lezcano <daniel.lezcano@linaro.org> (IBM)
- *
- * Based on the work of Rickard Andersson <rickard.andersson@stericsson.com>
- * and Jonas Aaberg <jonas.aberg@stericsson.com>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/cpuidle.h>
-#include <linux/spinlock.h>
-#include <linux/atomic.h>
-#include <linux/smp.h>
-#include <linux/mfd/dbx500-prcmu.h>
-#include <linux/platform_data/arm-ux500-pm.h>
-
-#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
-
-#include "db8500-regs.h"
-#include "id.h"
-
-static atomic_t master = ATOMIC_INIT(0);
-static DEFINE_SPINLOCK(master_lock);
-
-static inline int ux500_enter_idle(struct cpuidle_device *dev,
-                                   struct cpuidle_driver *drv, int index)
-{
-        int this_cpu = smp_processor_id();
-        bool recouple = false;
-
-        if (atomic_inc_return(&master) == num_online_cpus()) {
-
-                /* With this lock, we prevent the other cpu to exit and enter
-                 * this function again and become the master */
-                if (!spin_trylock(&master_lock))
-                        goto wfi;
-
-                /* decouple the gic from the A9 cores */
-                if (prcmu_gic_decouple()) {
-                        spin_unlock(&master_lock);
-                        goto out;
-                }
-
-                /* If an error occur, we will have to recouple the gic
-                 * manually */
-                recouple = true;
-
-                /* At this state, as the gic is decoupled, if the other
-                 * cpu is in WFI, we have the guarantee it won't be wake
-                 * up, so we can safely go to retention */
-                if (!prcmu_is_cpu_in_wfi(this_cpu ? 0 : 1))
-                        goto out;
-
-                /* The prcmu will be in charge of watching the interrupts
-                 * and wake up the cpus */
-                if (prcmu_copy_gic_settings())
-                        goto out;
-
-                /* Check in the meantime an interrupt did
-                 * not occur on the gic ... */
-                if (prcmu_gic_pending_irq())
-                        goto out;
-
-                /* ... and the prcmu */
-                if (prcmu_pending_irq())
-                        goto out;
-
-                /* Go to the retention state, the prcmu will wait for the
-                 * cpu to go WFI and this is what happens after exiting this
-                 * 'master' critical section */
-                if (prcmu_set_power_state(PRCMU_AP_IDLE, true, true))
-                        goto out;
-
-                /* When we switch to retention, the prcmu is in charge
-                 * of recoupling the gic automatically */
-                recouple = false;
-
-                spin_unlock(&master_lock);
-        }
-wfi:
-        cpu_do_idle();
-out:
-        atomic_dec(&master);
-
-        if (recouple) {
-                prcmu_gic_recouple();
-                spin_unlock(&master_lock);
-        }
-
-        return index;
-}
-
-static struct cpuidle_driver ux500_idle_driver = {
-        .name = "ux500_idle",
-        .owner = THIS_MODULE,
-        .states = {
-                ARM_CPUIDLE_WFI_STATE,
-                {
-                        .enter            = ux500_enter_idle,
-                        .exit_latency     = 70,
-                        .target_residency = 260,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID |
-                                            CPUIDLE_FLAG_TIMER_STOP,
-                        .name             = "ApIdle",
-                        .desc             = "ARM Retention",
-                },
-        },
-        .safe_state_index = 0,
-        .state_count = 2,
-};
-
-int __init ux500_idle_init(void)
-{
-        if (!(cpu_is_u8500_family() || cpu_is_ux540_family()))
-                return -ENODEV;
-
-        /* Configure wake up reasons */
-        prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
-                             PRCMU_WAKEUP(ABB));
-
-        return cpuidle_register(&ux500_idle_driver, NULL);
-}
-
-device_initcall(ux500_idle_init);