ARM: EXYNOS: Move the driver to drivers/cpuidle directory

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>

diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 01bc9b94a032de5a62e572f7b4848dbeb6a9149b..3705048f744a834aa6d255e48d374747c0a2e10d 100644 (file)
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -16,7 +16,6 @@ obj-$(CONFIG_ARCH_EXYNOS)     += exynos.o
 
 obj-$(CONFIG_PM_SLEEP)         += pm.o sleep.o
 obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
-obj-$(CONFIG_CPU_IDLE)         += cpuidle.o
 
 obj-$(CONFIG_ARCH_EXYNOS)      += pmu.o
 

diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
deleted file mode 100644 (file)
index 7c01512..0000000
--- a/arch/arm/mach-exynos/cpuidle.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/* linux/arch/arm/mach-exynos/cpuidle.c
- *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *             http://www.samsung.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/cpuidle.h>
-#include <linux/cpu_pm.h>
-#include <linux/export.h>
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <asm/proc-fns.h>
-#include <asm/suspend.h>
-#include <asm/cpuidle.h>
-
-static void (*exynos_enter_aftr)(void);
-
-static int idle_finisher(unsigned long flags)
-{
-       exynos_enter_aftr();
-       cpu_do_idle();
-
-       return 1;
-}
-
-static int exynos_enter_core0_aftr(struct cpuidle_device *dev,
-                               struct cpuidle_driver *drv,
-                               int index)
-{
-       cpu_pm_enter();
-       cpu_suspend(0, idle_finisher);
-       cpu_pm_exit();
-
-       return index;
-}
-
-static int exynos_enter_lowpower(struct cpuidle_device *dev,
-                               struct cpuidle_driver *drv,
-                               int index)
-{
-       int new_index = index;
-
-       /* AFTR can only be entered when cores other than CPU0 are offline */
-       if (num_online_cpus() > 1 || dev->cpu != 0)
-               new_index = drv->safe_state_index;
-
-       if (new_index == 0)
-               return arm_cpuidle_simple_enter(dev, drv, new_index);
-       else
-               return exynos_enter_core0_aftr(dev, drv, new_index);
-}
-
-static struct cpuidle_driver exynos_idle_driver = {
-       .name                   = "exynos_idle",
-       .owner                  = THIS_MODULE,
-       .states = {
-               [0] = ARM_CPUIDLE_WFI_STATE,
-               [1] = {
-                       .enter                  = exynos_enter_lowpower,
-                       .exit_latency           = 300,
-                       .target_residency       = 100000,
-                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
-                       .name                   = "C1",
-                       .desc                   = "ARM power down",
-               },
-       },
-       .state_count = 2,
-       .safe_state_index = 0,
-};
-
-static int exynos_cpuidle_probe(struct platform_device *pdev)
-{
-       int ret;
-
-       exynos_enter_aftr = (void *)(pdev->dev.platform_data);
-
-       ret = cpuidle_register(&exynos_idle_driver, NULL);
-       if (ret) {
-               dev_err(&pdev->dev, "failed to register cpuidle driver\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static struct platform_driver exynos_cpuidle_driver = {
-       .probe  = exynos_cpuidle_probe,
-       .driver = {
-               .name = "exynos_cpuidle",
-               .owner = THIS_MODULE,
-       },
-};
-
-module_platform_driver(exynos_cpuidle_driver);

diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index 97ccc31dbdd8fb8c48510cc00f5472ea6aefa191..695507ae345ae420af3eea020bc7811686dd0064 100644 (file)
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -44,3 +44,9 @@ config ARM_AT91_CPUIDLE
        depends on ARCH_AT91
        help
          Select this to enable cpuidle for AT91 processors
+
+config ARM_EXYNOS_CPUIDLE
+       bool "Cpu Idle Driver for the Exynos processors"
+       depends on ARCH_EXYNOS
+       help
+         Select this to enable cpuidle for Exynos processors

diff --git a/drivers/cpuidle/Makefile b/drivers/cpuidle/Makefile
index f71ae1b373c5e85fc1075622e144832b5d7a0d1e..0d1540adaf789f956eb4762a6fdf4afc70705c42 100644 (file)
--- a/drivers/cpuidle/Makefile
+++ b/drivers/cpuidle/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_ARM_KIRKWOOD_CPUIDLE)    += cpuidle-kirkwood.o
 obj-$(CONFIG_ARM_ZYNQ_CPUIDLE)         += cpuidle-zynq.o
 obj-$(CONFIG_ARM_U8500_CPUIDLE)         += cpuidle-ux500.o
 obj-$(CONFIG_ARM_AT91_CPUIDLE)          += cpuidle-at91.o
+obj-$(CONFIG_ARM_EXYNOS_CPUIDLE)        += cpuidle-exynos.o
 
 ###############################################################################
 # POWERPC drivers

diff --git a/drivers/cpuidle/cpuidle-exynos.c b/drivers/cpuidle/cpuidle-exynos.c
new file mode 100644 (file)
index 0000000..7c01512
--- /dev/null
+++ b/drivers/cpuidle/cpuidle-exynos.c
@@ -0,0 +1,99 @@
+/* linux/arch/arm/mach-exynos/cpuidle.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ *             http://www.samsung.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/cpuidle.h>
+#include <linux/cpu_pm.h>
+#include <linux/export.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+
+#include <asm/proc-fns.h>
+#include <asm/suspend.h>
+#include <asm/cpuidle.h>
+
+static void (*exynos_enter_aftr)(void);
+
+static int idle_finisher(unsigned long flags)
+{
+       exynos_enter_aftr();
+       cpu_do_idle();
+
+       return 1;
+}
+
+static int exynos_enter_core0_aftr(struct cpuidle_device *dev,
+                               struct cpuidle_driver *drv,
+                               int index)
+{
+       cpu_pm_enter();
+       cpu_suspend(0, idle_finisher);
+       cpu_pm_exit();
+
+       return index;
+}
+
+static int exynos_enter_lowpower(struct cpuidle_device *dev,
+                               struct cpuidle_driver *drv,
+                               int index)
+{
+       int new_index = index;
+
+       /* AFTR can only be entered when cores other than CPU0 are offline */
+       if (num_online_cpus() > 1 || dev->cpu != 0)
+               new_index = drv->safe_state_index;
+
+       if (new_index == 0)
+               return arm_cpuidle_simple_enter(dev, drv, new_index);
+       else
+               return exynos_enter_core0_aftr(dev, drv, new_index);
+}
+
+static struct cpuidle_driver exynos_idle_driver = {
+       .name                   = "exynos_idle",
+       .owner                  = THIS_MODULE,
+       .states = {
+               [0] = ARM_CPUIDLE_WFI_STATE,
+               [1] = {
+                       .enter                  = exynos_enter_lowpower,
+                       .exit_latency           = 300,
+                       .target_residency       = 100000,
+                       .flags                  = CPUIDLE_FLAG_TIME_VALID,
+                       .name                   = "C1",
+                       .desc                   = "ARM power down",
+               },
+       },
+       .state_count = 2,
+       .safe_state_index = 0,
+};
+
+static int exynos_cpuidle_probe(struct platform_device *pdev)
+{
+       int ret;
+
+       exynos_enter_aftr = (void *)(pdev->dev.platform_data);
+
+       ret = cpuidle_register(&exynos_idle_driver, NULL);
+       if (ret) {
+               dev_err(&pdev->dev, "failed to register cpuidle driver\n");
+               return ret;
+       }
+
+       return 0;
+}
+
+static struct platform_driver exynos_cpuidle_driver = {
+       .probe  = exynos_cpuidle_probe,
+       .driver = {
+               .name = "exynos_cpuidle",
+               .owner = THIS_MODULE,
+       },
+};
+
+module_platform_driver(exynos_cpuidle_driver);