7 files changed, 48 insertions, 145 deletions

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index c4ce0906d76a..cb70961b6239 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
 obj-$(CONFIG_CPU_FREQ_IMX)    += cpufreq.o
 
 ifeq ($(CONFIG_CPU_IDLE),y)
-obj-y += cpuidle.o
+obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
 obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
 endif
 
diff --git a/arch/arm/mach-imx/cpufreq.c b/arch/arm/mach-imx/cpufreq.c
index d8c75c3c925d..387dc4cceca2 100644
--- a/arch/arm/mach-imx/cpufreq.c
+++ b/arch/arm/mach-imx/cpufreq.c
@@ -87,13 +87,12 @@ static int mxc_set_target(struct cpufreq_policy *policy,
 
         freqs.old = clk_get_rate(cpu_clk) / 1000;
         freqs.new = freq_Hz / 1000;
-        freqs.cpu = 0;
         freqs.flags = 0;
-        cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE);
 
         ret = set_cpu_freq(freq_Hz);
 
-        cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+        cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE);
 
         return ret;
 }
@@ -145,14 +144,11 @@ static int mxc_cpufreq_init(struct cpufreq_policy *policy)
         imx_freq_table[i].frequency = CPUFREQ_TABLE_END;
 
         policy->cur = clk_get_rate(cpu_clk) / 1000;
-        policy->min = policy->cpuinfo.min_freq = cpu_freq_khz_min;
-        policy->max = policy->cpuinfo.max_freq = cpu_freq_khz_max;
 
         /* Manual states, that PLL stabilizes in two CLK32 periods */
         policy->cpuinfo.transition_latency = 2 * NANOSECOND / CLK32_FREQ;
 
         ret = cpufreq_frequency_table_cpuinfo(policy, imx_freq_table);
-
         if (ret < 0) {
                 printk(KERN_ERR "%s: failed to register i.MXC CPUfreq with error code %d\n",
                        __func__, ret);
diff --git a/arch/arm/mach-imx/cpuidle-imx5.c b/arch/arm/mach-imx/cpuidle-imx5.c
new file mode 100644
index 000000000000..5a47e3c6172f
--- /dev/null
+++ b/arch/arm/mach-imx/cpuidle-imx5.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ *
+ * 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/cpuidle.h>
+#include <linux/module.h>
+#include <asm/system_misc.h>
+
+static int imx5_cpuidle_enter(struct cpuidle_device *dev,
+                              struct cpuidle_driver *drv, int index)
+{
+        arm_pm_idle();
+        return index;
+}
+
+static struct cpuidle_driver imx5_cpuidle_driver = {
+        .name             = "imx5_cpuidle",
+        .owner            = THIS_MODULE,
+        .states[0] = {
+                .enter            = imx5_cpuidle_enter,
+                .exit_latency     = 2,
+                .target_residency = 1,
+                .flags            = CPUIDLE_FLAG_TIME_VALID,
+                .name             = "IMX5 SRPG",
+                .desc             = "CPU state retained,powered off",
+        },
+        .state_count = 1,
+};
+
+int __init imx5_cpuidle_init(void)
+{
+        return cpuidle_register(&imx5_cpuidle_driver, NULL);
+}
diff --git a/arch/arm/mach-imx/cpuidle-imx6q.c b/arch/arm/mach-imx/cpuidle-imx6q.c
index d533e2695f0e..23ddfb693b2d 100644
--- a/arch/arm/mach-imx/cpuidle-imx6q.c
+++ b/arch/arm/mach-imx/cpuidle-imx6q.c
@@ -6,7 +6,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <linux/clockchips.h>
 #include <linux/cpuidle.h>
 #include <linux/module.h>
 #include <asm/cpuidle.h>
@@ -21,10 +20,6 @@ static DEFINE_SPINLOCK(master_lock);
 static int imx6q_enter_wait(struct cpuidle_device *dev,
                             struct cpuidle_driver *drv, int index)
 {
-        int cpu = dev->cpu;
-
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
-
         if (atomic_inc_return(&master) == num_online_cpus()) {
                 /*
                  * With this lock, we prevent other cpu to exit and enter
@@ -43,26 +38,13 @@ idle:
         cpu_do_idle();
 done:
         atomic_dec(&master);
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &cpu);
 
         return index;
 }
 
-/*
- * For each cpu, setup the broadcast timer because local timer
- * stops for the states other than WFI.
- */
-static void imx6q_setup_broadcast_timer(void *arg)
-{
-        int cpu = smp_processor_id();
-
-        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ON, &cpu);
-}
-
 static struct cpuidle_driver imx6q_cpuidle_driver = {
         .name = "imx6q_cpuidle",
         .owner = THIS_MODULE,
-        .en_core_tk_irqen = 1,
         .states = {
                 /* WFI */
                 ARM_CPUIDLE_WFI_STATE,
@@ -70,7 +52,8 @@ static struct cpuidle_driver imx6q_cpuidle_driver = {
                 {
                         .exit_latency = 50,
                         .target_residency = 75,
-                        .flags = CPUIDLE_FLAG_TIME_VALID,
+                        .flags = CPUIDLE_FLAG_TIME_VALID |
+                                 CPUIDLE_FLAG_TIMER_STOP,
                         .enter = imx6q_enter_wait,
                         .name = "WAIT",
                         .desc = "Clock off",
@@ -88,8 +71,5 @@ int __init imx6q_cpuidle_init(void)
         /* Set chicken bit to get a reliable WAIT mode support */
         imx6q_set_chicken_bit();
 
-        /* Configure the broadcast timer on each cpu */
-        on_each_cpu(imx6q_setup_broadcast_timer, NULL, 1);
-
-        return imx_cpuidle_init(&imx6q_cpuidle_driver);
+        return cpuidle_register(&imx6q_cpuidle_driver, NULL);
 }
diff --git a/arch/arm/mach-imx/cpuidle.c b/arch/arm/mach-imx/cpuidle.c
deleted file mode 100644
index d4cb511a44a8..000000000000
--- a/arch/arm/mach-imx/cpuidle.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2012 Freescale Semiconductor, Inc.
- * Copyright 2012 Linaro Ltd.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/cpuidle.h>
-#include <linux/err.h>
-#include <linux/hrtimer.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/slab.h>
-
-static struct cpuidle_device __percpu * imx_cpuidle_devices;
-
-static void __init imx_cpuidle_devices_uninit(void)
-{
-        int cpu_id;
-        struct cpuidle_device *dev;
-
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(imx_cpuidle_devices, cpu_id);
-                cpuidle_unregister_device(dev);
-        }
-
-        free_percpu(imx_cpuidle_devices);
-}
-
-int __init imx_cpuidle_init(struct cpuidle_driver *drv)
-{
-        struct cpuidle_device *dev;
-        int cpu_id, ret;
-
-        if (drv->state_count > CPUIDLE_STATE_MAX) {
-                pr_err("%s: state_count exceeds maximum\n", __func__);
-                return -EINVAL;
-        }
-
-        ret = cpuidle_register_driver(drv);
-        if (ret) {
-                pr_err("%s: Failed to register cpuidle driver with error: %d\n",
-                         __func__, ret);
-                return ret;
-        }
-
-        imx_cpuidle_devices = alloc_percpu(struct cpuidle_device);
-        if (imx_cpuidle_devices == NULL) {
-                ret = -ENOMEM;
-                goto unregister_drv;
-        }
-
-        /* initialize state data for each cpuidle_device */
-        for_each_possible_cpu(cpu_id) {
-                dev = per_cpu_ptr(imx_cpuidle_devices, cpu_id);
-                dev->cpu = cpu_id;
-                dev->state_count = drv->state_count;
-
-                ret = cpuidle_register_device(dev);
-                if (ret) {
-                        pr_err("%s: Failed to register cpu %u, error: %d\n",
-                                __func__, cpu_id, ret);
-                        goto uninit;
-                }
-        }
-
-        return 0;
-
-uninit:
-        imx_cpuidle_devices_uninit();
-
-unregister_drv:
-        cpuidle_unregister_driver(drv);
-        return ret;
-}
diff --git a/arch/arm/mach-imx/cpuidle.h b/arch/arm/mach-imx/cpuidle.h
index e092d1359d94..786f98ecc145 100644
--- a/arch/arm/mach-imx/cpuidle.h
+++ b/arch/arm/mach-imx/cpuidle.h
@@ -10,18 +10,16 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
-#include <linux/cpuidle.h>
-
 #ifdef CONFIG_CPU_IDLE
-extern int imx_cpuidle_init(struct cpuidle_driver *drv);
+extern int imx5_cpuidle_init(void);
 extern int imx6q_cpuidle_init(void);
 #else
-static inline int imx_cpuidle_init(struct cpuidle_driver *drv)
+static inline int imx5_cpuidle_init(void)
 {
-        return -ENODEV;
+        return 0;
 }
 static inline int imx6q_cpuidle_init(void)
 {
-        return -ENODEV;
+        return 0;
 }
 #endif
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index f67fd7ee8127..82e79c658eb2 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -149,33 +149,6 @@ static void imx5_pm_idle(void)
         imx5_cpu_do_idle();
 }
 
-static int imx5_cpuidle_enter(struct cpuidle_device *dev,
-                                struct cpuidle_driver *drv, int idx)
-{
-        int ret;
-
-        ret = imx5_cpu_do_idle();
-        if (ret < 0)
-                return ret;
-
-        return idx;
-}
-
-static struct cpuidle_driver imx5_cpuidle_driver = {
-        .name                   = "imx5_cpuidle",
-        .owner                  = THIS_MODULE,
-        .en_core_tk_irqen       = 1,
-        .states[0]      = {
-                .enter                  = imx5_cpuidle_enter,
-                .exit_latency           = 2,
-                .target_residency       = 1,
-                .flags                  = CPUIDLE_FLAG_TIME_VALID,
-                .name                   = "IMX5 SRPG",
-                .desc                   = "CPU state retained,powered off",
-        },
-        .state_count            = 1,
-};
-
 static int __init imx5_pm_common_init(void)
 {
         int ret;
@@ -193,8 +166,7 @@ static int __init imx5_pm_common_init(void)
         /* Set the registers to the default cpu idle state. */
         mx5_cpu_lp_set(IMX5_DEFAULT_CPU_IDLE_STATE);
 
-        imx_cpuidle_init(&imx5_cpuidle_driver);
-        return 0;
+        return imx5_cpuidle_init();
 }
 
 void __init imx51_pm_init(void)