diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 15:35:16 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-20 15:35:16 (GMT) |
| commit | aee9a50c5b9e424994a58b2aefaa499623e6786a (patch) | |
| tree | bb4b4b1664fa45d4823778efa57bf677b378837c /arch/arm/mach-omap2/powerdomain.h | |
| parent | 58eb042889ddc8035ddb68a9c9cbd2251d1b7feb (diff) | |
| parent | 8bfdfc87dc3d00eb2f33e972b4177c36ca0e3d54 (diff) | |
| download | linux-fsl-qoriq-aee9a50c5b9e424994a58b2aefaa499623e6786a.tar.xz | |
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/powerdomain.h')
| -rw-r--r-- | arch/arm/mach-omap2/powerdomain.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h index 3d82f50..e4d7bd6 100644 --- a/arch/arm/mach-omap2/powerdomain.h +++ b/arch/arm/mach-omap2/powerdomain.h @@ -166,6 +166,7 @@ struct powerdomain { * @pwrdm_disable_hdwr_sar: Disable Hardware Save-Restore feature for a pd * @pwrdm_set_lowpwrstchange: Enable pd transitions from a shallow to deep sleep * @pwrdm_wait_transition: Wait for a pd state transition to complete + * @pwrdm_has_voltdm: Check if a voltdm association is needed * * Regarding @pwrdm_set_lowpwrstchange: On the OMAP2 and 3-family * chips, a powerdomain's power state is not allowed to directly @@ -196,6 +197,7 @@ struct pwrdm_ops { int (*pwrdm_disable_hdwr_sar)(struct powerdomain *pwrdm); int (*pwrdm_set_lowpwrstchange)(struct powerdomain *pwrdm); int (*pwrdm_wait_transition)(struct powerdomain *pwrdm); + int (*pwrdm_has_voltdm)(void); }; int pwrdm_register_platform_funcs(struct pwrdm_ops *custom_funcs); |