OMAP clockdomain/powerdomain: remove runtime register/unregister

[cascardo/linux.git] / arch / arm / plat-omap / include / plat / powerdomain.h

diff --git a/arch/arm/plat-omap/include/plat/powerdomain.h b/arch/arm/plat-omap/include/plat/powerdomain.h
index 0b96005..c590e2f 100644 (file)
--- a/arch/arm/plat-omap/include/plat/powerdomain.h
+++ b/arch/arm/plat-omap/include/plat/powerdomain.h
@@ -1,8 +1,8 @@
 /*
  * OMAP2/3 powerdomain control
  *
- * Copyright (C) 2007-8 Texas Instruments, Inc.
- * Copyright (C) 2007-8 Nokia Corporation
+ * Copyright (C) 2007-2008 Texas Instruments, Inc.
+ * Copyright (C) 2007-2009 Nokia Corporation
  *
  * Written by Paul Walmsley
  *
@@ -37,6 +37,9 @@
 #define PWRSTS_OFF_RET         ((1 << PWRDM_POWER_OFF) | \
                                 (1 << PWRDM_POWER_RET))
 
+#define PWRSTS_RET_ON          ((1 << PWRDM_POWER_RET) | \
+                                (1 << PWRDM_POWER_ON))
+
 #define PWRSTS_OFF_RET_ON      (PWRSTS_OFF_RET | (1 << PWRDM_POWER_ON))
 
 
@@ -48,16 +51,16 @@
                                          */
 
 /*
- * Number of memory banks that are power-controllable. On OMAP3430, the
- * maximum is 4.
+ * Number of memory banks that are power-controllable. On OMAP4430, the
+ * maximum is 5.
  */
-#define PWRDM_MAX_MEM_BANKS    4
+#define PWRDM_MAX_MEM_BANKS    5
 
 /*
  * Maximum number of clockdomains that can be associated with a powerdomain.
- * CORE powerdomain on OMAP3 is the worst case
+ * CORE powerdomain on OMAP4 is the worst case
  */
-#define PWRDM_MAX_CLKDMS       4
+#define PWRDM_MAX_CLKDMS       9
 
 /* XXX A completely arbitrary number. What is reasonable here? */
 #define PWRDM_TRANSITION_BAILOUT 100000
@@ -65,20 +68,6 @@
 struct clockdomain;
 struct powerdomain;
 
-/* Encodes dependencies between powerdomains - statically defined */
-struct pwrdm_dep {
-
-       /* Powerdomain name */
-       const char *pwrdm_name;
-
-       /* Powerdomain pointer - resolved by the powerdomain code */
-       struct powerdomain *pwrdm;
-
-       /* Flags to mark OMAP chip restrictions, etc. */
-       const struct omap_chip_id omap_chip;
-
-};
-
 struct powerdomain {
 
        /* Powerdomain name */
@@ -90,15 +79,6 @@ struct powerdomain {
        /* Used to represent the OMAP chip types containing this pwrdm */
        const struct omap_chip_id omap_chip;
 
-       /* Powerdomains that can be told to wake this powerdomain up */
-       struct pwrdm_dep *wkdep_srcs;
-
-       /* Powerdomains that can be told to keep this pwrdm from inactivity */
-       struct pwrdm_dep *sleepdep_srcs;
-
-       /* Bit shift of this powerdomain's PM_WKDEP/CM_SLEEPDEP bit */
-       const u8 dep_bit;
-
        /* Possible powerdomain power states */
        const u8 pwrsts;
 
@@ -134,8 +114,6 @@ struct powerdomain {
 
 void pwrdm_init(struct powerdomain **pwrdm_list);
 
-int pwrdm_register(struct powerdomain *pwrdm);
-int pwrdm_unregister(struct powerdomain *pwrdm);
 struct powerdomain *pwrdm_lookup(const char *name);
 
 int pwrdm_for_each(int (*fn)(struct powerdomain *pwrdm, void *user),
@@ -149,13 +127,6 @@ int pwrdm_for_each_clkdm(struct powerdomain *pwrdm,
                         int (*fn)(struct powerdomain *pwrdm,
                                   struct clockdomain *clkdm));
 
-int pwrdm_add_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);
-int pwrdm_del_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);
-int pwrdm_read_wkdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);
-int pwrdm_add_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);
-int pwrdm_del_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);
-int pwrdm_read_sleepdep(struct powerdomain *pwrdm1, struct powerdomain *pwrdm2);
-
 int pwrdm_get_mem_bank_count(struct powerdomain *pwrdm);
 
 int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst);