[PATCH v2 5/7] OMAP: PM CONSTRAINTS: add a power domains state update function in hwmod
From: Kevin Hilman <hidden>
Date: 2011-03-17 20:42:08
Also in:
linux-omap
Jean Pihet [off-list ref] writes:
Hwmod is queried from the omap device layer to change the power domains next power state. Hwmod retrieves the correct power domain and if it exists it calls the corresponding power domain function. Tested on OMAP3 Beagleboard in RET/OFF using wake-up latency constraints on MPU, CORE and PER. Signed-off-by: Jean Pihet <redacted>
Subject prefix should be: OMAP2+: omap_hwmod: ...
quoted hunk
--- arch/arm/mach-omap2/omap_hwmod.c | 29 +++++++++++++++++++++++++- arch/arm/plat-omap/include/plat/omap_hwmod.h | 1 + 2 files changed, 29 insertions(+), 1 deletions(-)diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index cf8cc9b..8caf2c5 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c@@ -142,6 +142,7 @@ #include "powerdomain.h" #include <plat/clock.h> #include <plat/omap_hwmod.h> +#include <plat/omap_device.h> #include <plat/prcm.h> #include "cm2xxx_3xxx.h"@@ -2277,11 +2278,37 @@ ohsps_unlock: return ret; } +/* + * omap_hwmod_update_power_state - Update the power domain power state of
I think 'set_next_power_state' is a better name for this function.
+ * @oh + * + * @oh: struct omap_hwmod* to which the requesting device belongs to. + * @min_latency: the allowed wake-up latency for the power domain of @oh. + * + * Finds the power domain next power state that fulfills the constraint. + * Applies the constraint to the power domain by calling + * pwrdm_wakeuplat_update_pwrst.
This needs to be updated as this function doesn't know anything about constraints.
+ * Returns 0 upon success.
+ */
+int omap_hwmod_update_power_state(struct omap_hwmod *oh, long min_latency)
+{
+ struct powerdomain *pwrdm = omap_hwmod_get_pwrdm(oh);
+
+ if (!PTR_ERR(pwrdm)) {
+ pr_err("omap_hwmod: Error: could not find parent "s/parent// instead of "omap_hwmod:", use "%s" with __func__ so the function name is printed on error.
+ "powerdomain for %s\n", oh->name); + return -EINVAL; + } + + return pwrdm_wakeuplat_update_pwrst(pwrdm, min_latency);
Again, this function doesn't exist yet in the series.
quoted hunk
+} + /** * omap_hwmod_get_context_loss_count - get lost context count * @oh: struct omap_hwmod * * - * Query the powerdomain of of @oh to get the context loss + * Query the powerdomain of @oh to get the context loss * count for this device. * * Returns the context loss count of the powerdomain assocated with @ohdiff --git a/arch/arm/plat-omap/include/plat/omap_hwmod.h b/arch/arm/plat-omap/include/plat/omap_hwmod.h index 65bcad4..f27110e 100644 --- a/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/arch/arm/plat-omap/include/plat/omap_hwmod.h@@ -597,6 +597,7 @@ int omap_hwmod_for_each_by_class(const char *classname, void *user); int omap_hwmod_set_postsetup_state(struct omap_hwmod *oh, u8 state); +int omap_hwmod_update_power_state(struct omap_hwmod *oh, long min_latency); u32 omap_hwmod_get_context_loss_count(struct omap_hwmod *oh); /*
Kevin