Merge branch 'cow_readahead' of git://oss.oracle.com/git/tma/linux-2.6 into merge-2

[deliverable/linux.git] / arch / arm / mach-omap2 / pm.c

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index ea8ceaed09cbe1a0a5fb8f91bb4e21c566aa0483..68f9f2e958917290f5814b7b186c33135d2ec2c4 100644 (file)
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -1,111 +1,84 @@
 /*
- * linux/arch/arm/mach-omap2/pm.c
+ * pm.c - Common OMAP2+ power management-related code
  *
- * OMAP2 Power Management Routines
- *
- * Copyright (C) 2006 Nokia Corporation
- * Tony Lindgren <tony@atomide.com>
- *
- * Copyright (C) 2005 Texas Instruments, Inc.
- * Richard Woodruff <r-woodruff2@ti.com>
- *
- * Based on pm.c for omap1
+ * Copyright (C) 2010 Texas Instruments, Inc.
+ * Copyright (C) 2010 Nokia Corporation
  *
  * 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/suspend.h>
-#include <linux/sched.h>
-#include <linux/proc_fs.h>
-#include <linux/interrupt.h>
-#include <linux/sysfs.h>
-#include <linux/module.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
 #include <linux/io.h>
+#include <linux/err.h>
 
-#include <asm/irq.h>
-#include <asm/atomic.h>
-#include <asm/mach/time.h>
-#include <asm/mach/irq.h>
-
-#include <mach/irqs.h>
-#include <mach/clock.h>
-#include <mach/sram.h>
-#include <mach/pm.h>
+#include <plat/omap-pm.h>
+#include <plat/omap_device.h>
+#include <plat/common.h>
 
-static struct clk *vclk;
-static void (*omap2_sram_idle)(void);
-static void (*omap2_sram_suspend)(int dllctrl, int cpu_rev);
-static void (*saved_idle)(void);
+static struct omap_device_pm_latency *pm_lats;
 
-extern void __init pmdomain_init(void);
-extern void pmdomain_set_autoidle(void);
+static struct device *mpu_dev;
+static struct device *dsp_dev;
+static struct device *l3_dev;
 
-static unsigned int omap24xx_sleep_save[OMAP24XX_SLEEP_SAVE_SIZE];
-
-void omap2_pm_idle(void)
+struct device *omap2_get_mpuss_device(void)
 {
-       local_irq_disable();
-       local_fiq_disable();
-       if (need_resched()) {
-               local_fiq_enable();
-               local_irq_enable();
-               return;
-       }
-
-       omap2_sram_idle();
-       local_fiq_enable();
-       local_irq_enable();
+       WARN_ON_ONCE(!mpu_dev);
+       return mpu_dev;
 }
 
-static int omap2_pm_prepare(void)
+struct device *omap2_get_dsp_device(void)
 {
-       /* We cannot sleep in idle until we have resumed */
-       saved_idle = pm_idle;
-       pm_idle = NULL;
-       return 0;
+       WARN_ON_ONCE(!dsp_dev);
+       return dsp_dev;
 }
 
-static int omap2_pm_suspend(void)
+struct device *omap2_get_l3_device(void)
 {
-       return 0;
+       WARN_ON_ONCE(!l3_dev);
+       return l3_dev;
 }
 
-static int omap2_pm_enter(suspend_state_t state)
+/* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
+static int _init_omap_device(char *name, struct device **new_dev)
 {
-       int ret = 0;
-
-       switch (state)
-       {
-       case PM_SUSPEND_STANDBY:
-       case PM_SUSPEND_MEM:
-               ret = omap2_pm_suspend();
-               break;
-       default:
-               ret = -EINVAL;
-       }
-
-       return ret;
+       struct omap_hwmod *oh;
+       struct omap_device *od;
+
+       oh = omap_hwmod_lookup(name);
+       if (WARN(!oh, "%s: could not find omap_hwmod for %s\n",
+                __func__, name))
+               return -ENODEV;
+
+       od = omap_device_build(oh->name, 0, oh, NULL, 0, pm_lats, 0, false);
+       if (WARN(IS_ERR(od), "%s: could not build omap_device for %s\n",
+                __func__, name))
+               return -ENODEV;
+
+       *new_dev = &od->pdev.dev;
+
+       return 0;
 }
 
-static void omap2_pm_finish(void)
+/*
+ * Build omap_devices for processors and bus.
+ */
+static void omap2_init_processor_devices(void)
 {
-       pm_idle = saved_idle;
+       _init_omap_device("mpu", &mpu_dev);
+       _init_omap_device("iva", &dsp_dev);
+       _init_omap_device("l3_main", &l3_dev);
 }
 
-static struct platform_suspend_ops omap_pm_ops = {
-       .prepare        = omap2_pm_prepare,
-       .enter          = omap2_pm_enter,
-       .finish         = omap2_pm_finish,
-       .valid          = suspend_valid_only_mem,
-};
-
-static int __init omap2_pm_init(void)
+static int __init omap2_common_pm_init(void)
 {
+       omap2_init_processor_devices();
+       omap_pm_if_init();
+
        return 0;
 }
+device_initcall(omap2_common_pm_init);
 
-__initcall(omap2_pm_init);